Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.

Add site switcher to the header #5983

Merged
merged 3 commits into from
Nov 13, 2019
Merged

Add site switcher to the header #5983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1b862e
Add site switcher to the header
belbiy Nov 12, 2019
ce49637
Change site-nav.html to add the button
belbiy Nov 12, 2019
0b9f405
Merge branch 'master' into yb_app-switcher
belbiy Nov 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/
Expand Down
27 changes: 16 additions & 11 deletions _includes/layout/site-nav.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>

Expand Down