From 0b71f0b2b86cff084029e80d1a7526d916e44181 Mon Sep 17 00:00:00 2001 From: astephanus <124592019+astephanus@users.noreply.github.com> Date: Tue, 12 Dec 2023 17:59:47 -0600 Subject: [PATCH] Resolve merge conflicts Signed-off-by: Fanit Kolchina --- _data/alert.yml | 2 +- _data/footer.yml | 65 +- _data/top_nav.yml | 67 +- _includes/footer.html | 108 +++- _includes/header.html | 290 ++++++++- _layouts/default.html | 27 - _sass/_font-awesome.scss | 17 + _sass/_footer.scss | 355 +++++++++++ _sass/_navigation-header.scss | 775 +++++++++++++++++++++++ _sass/_nested-nav.scss | 137 ---- _sass/custom/custom.scss | 629 +++--------------- _sass/font-awesome/_bordered-pulled.scss | 16 + _sass/font-awesome/_core.scss | 11 + _sass/font-awesome/_fixed-width.scss | 6 + _sass/font-awesome/_icons.scss | 552 ++++++++++++++++ _sass/font-awesome/_larger.scss | 13 + _sass/font-awesome/_list.scss | 19 + _sass/font-awesome/_mixins.scss | 25 + _sass/font-awesome/_path.scss | 14 + _sass/font-awesome/_rotated-flipped.scss | 20 + _sass/font-awesome/_spinning.scss | 29 + _sass/font-awesome/_stacked.scss | 20 + _sass/font-awesome/_variables.scss | 561 ++++++++++++++++ assets/js/header-nav.js | 3 - assets/js/search.js | 459 +++++++------- 25 files changed, 3197 insertions(+), 1023 deletions(-) create mode 100644 _sass/_font-awesome.scss create mode 100644 _sass/_footer.scss create mode 100644 _sass/_navigation-header.scss delete mode 100644 _sass/_nested-nav.scss create mode 100644 _sass/font-awesome/_bordered-pulled.scss create mode 100644 _sass/font-awesome/_core.scss create mode 100644 _sass/font-awesome/_fixed-width.scss create mode 100644 _sass/font-awesome/_icons.scss create mode 100644 _sass/font-awesome/_larger.scss create mode 100644 _sass/font-awesome/_list.scss create mode 100644 _sass/font-awesome/_mixins.scss create mode 100644 _sass/font-awesome/_path.scss create mode 100644 _sass/font-awesome/_rotated-flipped.scss create mode 100644 _sass/font-awesome/_spinning.scss create mode 100644 _sass/font-awesome/_stacked.scss create mode 100644 _sass/font-awesome/_variables.scss delete mode 100644 assets/js/header-nav.js diff --git a/_data/alert.yml b/_data/alert.yml index a360fe2738..2d9db03604 100644 --- a/_data/alert.yml +++ b/_data/alert.yml @@ -1 +1 @@ -message: "[OpenSearch 2.2 is live 🍾!](/downloads.html)" +message: false diff --git a/_data/footer.yml b/_data/footer.yml index 2cce5e0b8b..ac728cfa74 100644 --- a/_data/footer.yml +++ b/_data/footer.yml @@ -6,47 +6,56 @@ columns: title: Code of Conduct url: '/codeofconduct.html' - - title: 'Forums' - url: 'https://discuss.opendistrocommunity.dev/' + title: 'Forum' + url: 'https://forum.opensearch.org/' - title: 'Github' url: 'https://github.com/opensearch-project' - # - - # title: 'Partners' - # url: '/partners/' - - title: 'Community Projects' - url: '/community_projects' + title: 'Slack' + url: '/slack.html' - title: 'Resources' links: - #- - # title: 'Documentation' - # url: 'https://github.com/opensearch/documentation' - - + - + title: About + url: '/about.html' + - + title: Release Schedule + url: '/releases.html' + - + title: Maintenance Policy + url: '/releases.html#maintenance-policy' + - title: FAQ url: '/faq/' - - title: Testimonials - url: '/testimonials.html' - - - title: 'Brand Guidelines' - url: '/brand.html' + title: 'Testimonials' + url: '/testimonials/' - - title: 'Trademark Usage Policy' - url: '/trademark-usage.html' + title: 'Trademark and Brand Policy' + url: '/trademark-brand-policy.html' - - title: OpenSearch Disambiguation - url: '/disambiguation.html' + title: 'Privacy' + url: 'https://aws.amazon.com/privacy/' - - title: 'Connect' + title: 'Contact Us' links: - # - - # title: 'Twitter' - # url: 'https://twitter.com/opensearch_project' - #- - # title: 'Facebook' - # url: 'http://www.facebook.com/opensearch' - title: 'Connect' - url: 'https://opensearch.org/connect.html' + 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/' diff --git a/_data/top_nav.yml b/_data/top_nav.yml index 61c76586b1..73e9db7d2a 100644 --- a/_data/top_nav.yml +++ b/_data/top_nav.yml @@ -1,4 +1,36 @@ items: + - + label: OpenSearchCon + fragments: + - opensearchcon + - sessions + - speakers + - exhibitors + - workshops + - unconference + - opensearchcon2023-cfp + children: + - + label: 2024 - Stay Informed + url: /events/opensearchcon/ + - + label: Sessions + url: /events/opensearchcon/sessions/ + - + label: Speakers + url: /events/opensearchcon/speakers/ + - + label: Exhibitors + url: /events/opensearchcon/exhibitors/ + - + label: Workshops + url: /events/opensearchcon/workshops/ + - + label: Unconference + url: /events/opensearchcon/unconference/ + - + label: CFP is closed + url: /opensearchcon2023-cfp.html - label: Download fragments: @@ -7,17 +39,19 @@ items: url: /downloads.html - label: About + url: /about.html fragments: - about - releases + - roadmap - faq children: - - - label: OpenSearch - url: /about.html - label: Releases url: /releases.html + - + label: Roadmap + url: https://github.com/orgs/opensearch-project/projects/1 - label: FAQ url: /faq @@ -48,3 +82,30 @@ items: label: Documentation fragment: docs url: /docs/ + - + label: Platform + url: /platform/index.html + fragments: + - platform + - search + - observability + - security-analytics + - vector-database + - benchmarks + children: + - label: Search + url: /platform/search/index.html + - label: Observability + url: /platform/observability/index.html + - + label: Security Analytics + url: /platform/security-analytics/index.html + - + label: Vector Database + url: /platform/search/vector-database.html + - + label: Playground Demo + url: https://playground.opensearch.org/ + - + label: Performance Benchmarks + url: /benchmarks diff --git a/_includes/footer.html b/_includes/footer.html index 16995615df..801b8c126e 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,45 +1,83 @@ -
-
-
+