Skip to content

Commit

Permalink
Merge pull request #3157 from kaimmej/footer-redesign
Browse files Browse the repository at this point in the history 
Footer redesign
  • Loading branch information
@krisfreedain
krisfreedain authored Aug 9, 2024
2 parents c56b694 + 9832b12 commit c9550b8
Show file tree
Hide file tree
Showing 17 changed files with 415 additions and 461 deletions.
106 changes: 65 additions & 41 deletions _data/footer.yml
View file
Original file line number Diff line number Diff line change
@@ -1,61 +1,85 @@
columns:
-
title: 'Get Involved'
title: Participate
links:
-
title: Code of Conduct
url: '/codeofconduct.html'
url: /codeofconduct.html
-
title: 'Forum'
url: 'https://forum.opensearch.org/'
title: Forum
url: https://forum.opensearch.org/
-
title: 'Github'
url: 'https://github.com/opensearch-project'
title: Project Repo
url: https://github.com/opensearch-project
-
title: 'Slack'
url: '/slack.html'
title: Community Repo
url: https://github.com/opensearch-project/community
-
title: 'Meetup'
url: 'https://www.meetup.com/pro/opensearchproject/'
-
title: Connect
url: /connect.html

-
title: 'Resources'
title: Partners
links:
-
title: Become a Partner
url: https://github.com/opensearch-project/project-website/issues/new?assignees=&labels=enhancement%2C+untriaged&projects=opensearch-project%2FWebsite+Update+Project%2Copensearch-project%2FPartner+Updates+and+Additions&template=partner_add_new_partner.yml&title=%5BPARTNER%5D+%7B%7B+Company+name+%7D%7D+
-
title: Find a Partner
url: https://opensearch.org/partners/

-
title: Resources
links:
-
title: About
url: '/about.html'
url: /about.html
-
title: FAQ
url: /faq/
-
title: Release Schedule
url: '/releases.html'
url: /releases.html
-
title: Maintenance Policy
url: '/releases.html#maintenance-policy'
url: /releases.html#maintenance-policy
-
title: FAQ
url: '/faq/'
-
title: 'Testimonials'
url: '/testimonials/'
-
title: 'Trademark and Brand Policy'
url: '/trademark-brand-policy.html'
-
title: 'Privacy'
url: 'https://aws.amazon.com/privacy/'
-
title: 'Contact Us'
links:
-
title: 'Connect'
url: '/connect.html'
-
title: 'Twitter'
url: 'https://twitter.com/OpenSearchProj'
-
title: 'LinkedIn'
url: 'https://www.linkedin.com/company/opensearch-project/'
title: Documentation
url: /docs/latest/about/
-
title: Getting Started
url: /docs/latest/getting-started/
-
title: 'YouTube'
url: 'https://www.youtube.com/c/OpenSearchProject'
title: Testimonials
url: /testimonials/
-
title: 'Meetup'
url: 'https://www.meetup.com/pro/opensearchproject/'
title: Trademark & Brand
url: /trademark-brand-policy.html
-
title: 'Facebook'
url: 'https://www.facebook.com/OpenSearchProject/'
title: Privacy
url: https://aws.amazon.com/privacy/

# -
# title: 'Contact Us'
# links:
# -
# title: 'Connect'
# url: '/connect.html'
# -
# title: 'Twitter'
# url: 'https://twitter.com/OpenSearchProj'
# -
# title: 'LinkedIn'
# url: 'https://www.linkedin.com/company/opensearch-project/'
# -
# title: 'YouTube'
# url: 'https://www.youtube.com/c/OpenSearchProject'
# -
# title: 'Meetup'
# url: 'https://www.meetup.com/pro/opensearchproject/'
# -
# title: 'Facebook'
# url: 'https://www.facebook.com/OpenSearchProject/'
33 changes: 33 additions & 0 deletions _data/footer_social_links.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
socialLinks:
-
name: twitter
icon: partner_social_links_twitter_tpl
url: 'https://X.com/OpenSearchProj'
-
name: linkedin
icon: partner_social_links_linkedin_tpl
url: 'https://www.linkedin.com/company/opensearch-project/'
-
name: youtube
icon: partner_social_links_youtube_tpl
url: 'https://www.youtube.com/c/OpenSearchProject'
-
name: meetup
icon: partner_social_links_meetup_tpl
url: 'https://www.meetup.com/pro/opensearchproject/'
-
name: facebook
icon: partner_social_links_facebook_tpl
url: 'https://www.facebook.com/OpenSearchProject/'
-
name: github
icon: partner_social_links_github_tpl
url: 'https://www.github.com/OpenSearchProject/'
-
name: slack
icon: partner_social_links_slack_tpl
url: 'https://www.opensearch.org/slack.html'
-
name: forum
icon: partner_social_links_forum_tpl
url: 'https://forum.opensearch.org/'
16 changes: 9 additions & 7 deletions _includes/base_2col.html
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
<div class="container {{ page.layout_class }}">
<div id="content-main">
{{content}}
<div class="row">
<div id="content-main">
{{content}}
</div>
<!-- END #content-main -->
<div id="content-related" class="sidebar">
{{content_related}}
</div>
<!-- END #content-related -->
</div>
<!-- END #content-main -->
<div id="content-related" class="sidebar">
{{content_related}}
</div>
<!-- END #content-related -->
</div>
36 changes: 19 additions & 17 deletions _includes/base_3col.html
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@

<div class="container {{ page.layout_class | default: layout_class | default: '' }}">
<div id="subwrap">
<div role="main">
<div id="content-main">
{{ content }}
{{ content_secondary}}
<div class="row">
<div id="subwrap">
<div role="main">
<div id="content-main" class="col">
{{ content }}
{{ content_secondary}}
</div>
</div>

<!-- END #content-main -->
<div id="content-related" class="sidebar">
{{ content_related }}
</div>
<!-- END #content-related -->
</div>

<!-- END #content-main -->
<div id="content-related" class="sidebar">
{{ content_related }}
<!-- END #subwrap -->
<div id="content-extra" class="sidebar">
{{ content_extra }}
</div>
<!-- END #content-related -->
<!-- END #content-extra -->
</div>
<!-- END #subwrap -->
<div id="content-extra" class="sidebar">
{{ content_extra }}
</div>
<!-- END #content-extra -->
</div>
</div>

160 changes: 125 additions & 35 deletions _includes/footer.html
View file
Original file line number Diff line number Diff line change
@@ -1,42 +1,132 @@

<div role="contentinfo" class="bottom-contentinfo--wrapper">
<div class="bottom-contentinfo--subfooter">
<div class="bottom-contentinfo--container">
<h1 class="visuallyhidden">OpenSearch Links</h1>
<div class="subfooter--flex-wrapper">
<div class="subfooter--columns-wrapper">
{% for column in site.data.footer.columns %}
<div class="subfooter--columns-wrapper--column">
<h4>{{ column.title }}</h4>
<ul>
{% for link in column.links %}
<li><a href="{{ link.url }}">{{ link.title}}</a></li>
{% endfor %}
</ul>
</div>
{% endfor %}
</div>
</div>
</div>
</div>

<div class="bottom-contentinfo--footer">
<div class="bottom-contentinfo--container">
<div class="footer--flex-wrapper">
<div class="footer--legal-rows-wrapper">
<div class="footer--legal-rows-wrapper--row">
<div class="footer--legal-rows-wrapper--row--logo__mobile">
{% include icons.html type='opensearch-logo-with-tagline-vertical' %}
</div>
<div class="footer--legal-rows-wrapper--row--logo__desktop">
{% include icons.html type='opensearch-logo-with-tagline-horizontal-monochrome' %}
<!-- // LIGHT THEME // -->

<footer class="pt-5 pb-2 mt-5 footer-main-wrapper-light border-top">


<div class="container">
<div class="row">
<!-- LOGO, DESCRIPTION AND COPYRIGHT -->
<div class="col-lg-6 col-sm-12">
<!-- LOGO -->
<div class="row">
<div class="mb-4">
<a href="/" class="d-flex justify-content-start text-decoration-none">
{% include icons.html type='opensearch-default-logo-footer' %}
</a>
</div>
<!-- DESCRIPTION -->
<div class="row">
<p class="mb-5 ms-2 footer-content-light">OpenSearch is a community-driven, Apache 2.0-licensed open source search and analytics suite that makes it easy to ingest, search, visualize, and analyze data.</p>
</div>


<div class="container">
<!-- SOCIAL ICONS-->
<div class ="row">

<div class="container ms-2 mt-5 mb-3">
<div class="row justify-content-start">

<div class="d-flex gap-2">
<a href="https://www.opensearch.org/slack.html" class="text-reset btn btn-icon">
{% include icons.html type='slack-social' %}
</a>
<a href="https://fosstodon.org/@OpenSearchProject" class="text-reset btn btn-icon">
{% include icons.html type='mastodon-social' %}
</a>
<a href="https://X.com/OpenSearchProj" class="text-reset btn btn-icon">
{% include icons.html type='x-social' %}
</a>
<a href="https://www.youtube.com/c/OpenSearchProject" class="text-reset btn btn-icon">
{% include icons.html type='youtube-social' %}
</a>
<a href="https://www.facebook.com/OpenSearchProject/" class="text-reset btn btn-icon">
{% include icons.html type='facebook-social' %}
</a>
<a href="https://www.linkedin.com/company/opensearch-project/" class="text-reset btn btn-icon">
{% include icons.html type='linkedin-social' %}
</a>
</div>
</div>
</div>
</div>

<!-- COPYRIGHT -->
<div class="row">

<div class="col footer-copyright-light ms-2 mb-5 justify-content-start">
<span class="text-center">© OpenSearch contributors, 2024. OpenSearch is a registered trademark of Amazon Web Services.</span>
</div>
</div>
</div>
</div>
</div>
<div class="footer--legal-rows-wrapper--row">
{% include footer_legal.html %}

<!-- CATEGORIES -->
<div class="offset-lg-2 offset-md-0 col-lg-4 ">
<div class="row">
<!-- footer navlinks column -- Participate and Partners -->
<div class="col col-sm-8 col-lg-6">
{% assign participateColumn = site.data.footer.columns | where: "title", "Participate" %}
<div class="mb-2 d-flex justify-content-start">
<h5 class="footer-column-categories-light">{{ participateColumn[0].title }}</h5>
</div>
<div>
<ul class="list-unstyled">
{% for link in participateColumn[0].links %}
<li class="footer-category-navlinks-light mb-2">
<a href="{{ link.url }}" class="text-decoration-none text-reset">{{ link.title}}</a>
</li>
{% endfor %}
</ul>
</div>
{% assign partnersColumn = site.data.footer.columns | where: "title", "Partners" %}
<div class="my-5">
<div class="mb-2 d-flex justify-content-start">
<h5 class="footer-column-categories-light">{{ partnersColumn[0].title }}</h5>
</div>
<div>
<ul class="list-unstyled">
{% for link in partnersColumn[0].links %}
<li class="footer-category-navlinks-light mb-2">
<a href="{{ link.url }}" class="text-decoration-none text-reset">{{ link.title}}</a>
</li>
{% endfor %}
</ul>
</div>
</div>

</div>

<!-- footer navlinks column -- Resources -->
<div class="col col-sm-8 col-lg-6">
{% assign resourcesColumn = site.data.footer.columns | where: "title", "Resources" %}
<div class=" mb-2 d-flex justify-content-start">
<h5 class="footer-column-categories-light">{{ resourcesColumn[0].title }}</h5>
</div>
<div>
<ul class="list-unstyled">
{% for link in resourcesColumn[0].links %}
<li class="footer-category-navlinks-light mb-2">
<a href="{{ link.url }}" class="text-decoration-none text-reset">{{ link.title}}</a>
</li>
{% endfor %}
</ul>
</div>

</div>
</div>



</div>
</div>
</div>
</div>
</div>


</footer>
</div>



Loading

0 comments on commit c9550b8

Please sign in to comment.