Resolve merge conflicts (#5951) (#5952)

(cherry picked from commit 569e248) Signed-off-by: Fanit Kolchina <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: astephanus <[email protected]>
opensearch-project · Dec 21, 2023 · d10bd7c · d10bd7c
1 parent 831ed90
commit d10bd7c
Show file tree

Hide file tree

Showing 25 changed files with 3,191 additions and 1,048 deletions.
diff --git a/_data/alert.yml b/_data/alert.yml
@@ -1 +1 @@
-message: "[OpenSearch 2.3 is live 🍾!](/downloads.html)"
+message: false
diff --git 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
@@ -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
diff --git a/_includes/header.html b/_includes/header.html
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -98,32 +98,6 @@
         {% endif %}
         </nav>
     </div>
-    <div class="copy-banner">
-      <div class="container">
-        <h1><a href="#">Documentation</a></h1>
-        {% if site.search_enabled != false or site.use_custom_search == true %}
-        <div class="search">
-          <div class="search-input-wrap">
-            {% assign docs_version = site.data.versions.current %}
-            {% if site.baseurl == '/docs/latest' %}
-              {% assign docs_version = "latest" %}
-            {% endif %}
-            <input type="text" id="search-input" class="search-input"
-                   tabindex="0" placeholder="Search..." aria-label="Search {{ site.title }}"
-                   data-docs-version="{{ docs_version }}" autocomplete="off">
-            <div class="search-spinner"><i></i></div>
-            <label for="search-input" class="search-label"><svg viewBox="0 0 24 24" class="search-icon"><use xlink:href="#svg-search"></use></svg></label>
-          </div>
-          {% if site.search_enabled != false %}
-          <div id="search-results" class="search-results"></div>
-          {% elsif site.use_custom_search == true %}
-          <div id="search-results" class="search-results custom-search-results"></div>
-          {% endif %}
-        </div>
-        {% endif %}
-      </div>
-      <div class="search-overlay"></div>
-    </div>
     <div class="main">
       <div id="main-content-wrap" class="main-content-wrap">
         {% unless page.url == "/" %}
@@ -227,7 +201,6 @@ <h2>Related articles</h2>
       anchors.add().remove('.subfooter h1, .subfooter h2');
     </script>
   {% endif %}
-  <script src="{{ '/assets/js/header-nav.js' | relative_url }}"></script>
   {% if site.search_enabled == false and site.use_custom_search == true %}
   <script src="{{ '/assets/js/search.js' | relative_url }}"></script>
   {% endif %}

diff --git a/_sass/_font-awesome.scss b/_sass/_font-awesome.scss
@@ -0,0 +1,17 @@
+/*!
+ *  Font Awesome 4.2.0 by @davegandy - http://fontawesome.io - @fontawesome
+ *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
+ */
+
+@import "font-awesome/variables";
+@import "font-awesome/mixins";
+@import "font-awesome/path";
+@import "font-awesome/core";
+@import "font-awesome/larger";
+@import "font-awesome/fixed-width";
+@import "font-awesome/list";
+@import "font-awesome/bordered-pulled";
+@import "font-awesome/spinning";
+@import "font-awesome/rotated-flipped";
+@import "font-awesome/stacked";
+@import "font-awesome/icons";
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		message: "[OpenSearch 2.3 is live 🍾!](/downloads.html)"
		message: false