Merge branch 'master' into ui-checkbox-comp

magento · Nov 13, 2019 · e924b10 · e924b10
2 parents 44c5abc + 43bd4f9
commit e924b10
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 36 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/magento-devdocs/devdocs-theme.git
-  revision: 5e99a84dd5692d3ee4c1985b9f48824eeede8cfd
+  revision: 7628949ce6d16a6232a0582b32465757a6e446a9
   specs:
-    devdocs (5)
-      jekyll (>= 3.3)
+    devdocs (7)
+      jekyll (>= 4.0)
 
 GEM
   remote: https://rubygems.org/

diff --git a/_includes/layout/site-nav.html b/_includes/layout/site-nav.html
@@ -7,12 +7,12 @@
 
 <nav class="site-nav">
 
-  <div class="menu-btn">
-    <button id="menu-btn" class="menu-trigger menu-icon" aria-haspopup="true" aria-controls="nav-main" aria-label="Menu"></button>
-  </div>
-
   <div class="nav-container">
 
+    <div class="menu-btn">
+      <button id="menu-btn" class="menu-trigger menu-icon" aria-haspopup="true" aria-controls="nav-main" aria-label="Menu"></button>
+    </div>
+
     <a class="logo" href="{% if page.guide_version == site.version or page.guide_version == nil %}{{ site.baseurl }}{% else %}{{ page.baseurl }}{% endif %}/">
       <img src="{{ site.baseurl }}/assets/i/m-logo.svg" alt=""><img src="{{ site.baseurl }}/assets/i/magento-logo.svg" alt="Magento" class="magento-logo" />
       <span class="site-logo">{{ site.logo }}</span>
@@ -23,14 +23,19 @@
       {% include layout/navigation.html %}
     </div>
 
-    <div class="search-btn">
-      <button class="search-trigger search-icon" aria-label="Search"></button>
-    </div>
+    <div class="nav-actions">
+      {% include layout/app-switcher.html %}
+
+      <div class="search-btn">
+        <button class="search-trigger search-icon" aria-label="Search"></button>
+      </div>
 
-    <form class="quick-search" action="{{ page.baseurl }}/search.html" method="get" novalidate="novalidate">
-      <input type="search" name="query" placeholder="Search" />
-      <button class="quick-search-close" aria-label="Close Search">&times;</button>
-    </form>
+      <form class="quick-search" action="{{ page.baseurl }}/search.html" method="get" novalidate="novalidate">
+        <input type="search" name="query" placeholder="Search" />
+        <button class="quick-search-close" aria-label="Close Search">&times;</button>
+      </form>
+
+    </div>
 
   </div>