Skip to content

Commit 2dc8849

Browse files
remove duplicate ID's from lang menu
1 parent ab71fb9 commit 2dc8849

3 files changed

Lines changed: 54 additions & 31 deletions

File tree

_includes/language-picker-mobile.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
</div>
77
</div>
88
<div id="language-picker-menu">
9-
<div id="navbar">
10-
<ul id="navmenu">
9+
<div id="langbar">
10+
<ul id="langmenu">
1111
{% assign url_parts = page.url | split: '/' %}
1212

1313
{% assign url_remainder = url_parts | slice: 2, url_parts.size | join: '/' %}
1414

1515
{% for lang in site.data.languages %}
1616
<li class="submenu">
17-
<a class="remove" href="/{{ lang.code }}/{{ url_remainder }}">{% include icons/flags/{{ lang.code }}.svg %}{{ lang.name }}</a>
17+
<a href="/{{ lang.code }}/{{ url_remainder }}">{% include icons/flags/{{ lang.code }}.svg %}{{ lang.name }}</a>
1818
</li>
1919
{% endfor %}
2020
</ul>

css/style.css

Lines changed: 47 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -830,26 +830,32 @@ div.desktop-lang-switcher {
830830
}
831831

832832
/* navigation */
833-
#navbar {
833+
#navbar,
834+
835+
#langbar {
834836
line-height: 30px;
835837
display: flex;
836838
align-items: center;
837839
}
838840

839-
#navbar a {
841+
#navbar a,
842+
#langbar a {
840843
color: var(--card-fg);
841844
text-decoration: none;
842845
}
843846

844-
#navbar a.active {
847+
#navbar a.active,
848+
#langbar a.active {
845849
font-weight: bold;
846850
}
847851

848-
#navbar ul {
852+
#navbar ul,
853+
#langbar ul {
849854
list-style: none;
850855
}
851856

852-
#navmenu {
857+
#navmenu,
858+
#langmenu {
853859
display: flex;
854860
gap: 20px;
855861
}
@@ -897,7 +903,8 @@ div.desktop-lang-switcher {
897903
display: initial;
898904
}
899905

900-
#navmenu {
906+
#navmenu,
907+
#langmenu {
901908
padding: 0;
902909
margin: 0;
903910
right: 0px;
@@ -1265,11 +1272,11 @@ h2 a {
12651272
margin-right: -10px;
12661273
}
12671274

1268-
#language-picker-menu #navmenu>li:first-child {
1275+
#language-picker-menu #langmenu>li:first-child {
12691276
display: flex;
12701277
}
12711278

1272-
#language-picker-menu #navmenu {
1279+
#language-picker-menu #langmenu {
12731280
max-height: 70vh;
12741281
overflow-y: auto;
12751282
scrollbar-width: thin;
@@ -1358,12 +1365,6 @@ h2 a {
13581365
}
13591366

13601367

1361-
@media all and (max-width: 540px) {
1362-
#boxes {
1363-
grid-template-columns: 1fr;
1364-
}
1365-
}
1366-
13671368
@media all and (max-width: 420px) {
13681369
#app-settings-property {
13691370
width: auto;
@@ -1617,17 +1618,15 @@ blockquote {
16171618
display: none !important;
16181619
}
16191620

1620-
#navbar {
1621+
#navbar,
1622+
#langbar {
16211623
padding: 0;
16221624
top: 1px;
16231625
position: static;
16241626
}
16251627

1626-
#navmenu>li:first-child {
1627-
display: none;
1628-
}
1629-
1630-
#navmenu>li {
1628+
#navmenu>li,
1629+
#langmenu>li {
16311630
border-bottom: 1px solid var(--border);
16321631
margin: 0;
16331632
min-height: 47px;
@@ -1637,17 +1636,24 @@ blockquote {
16371636
align-items: center;
16381637
}
16391638

1640-
#navmenu>li.open:hover {
1639+
#langmenu>li {
1640+
padding-inline: 40%;
1641+
}
1642+
1643+
#navmenu>li.open:hover,
1644+
#langmenu>li.open:hover {
16411645
background: var(--card-bg);
16421646
}
1643-
#navmenu>li:hover {
1647+
#navmenu>li:hover,
1648+
#langmenu>li:hover {
16441649
background: var(--hover-bg);
16451650
& ul {
16461651
background-color: var(--card-bg);
16471652
}
16481653
}
16491654

1650-
#navmenu {
1655+
#navmenu,
1656+
#langmenu {
16511657
left: 0;
16521658
padding: 0;
16531659
top: 57px;
@@ -1656,7 +1662,8 @@ blockquote {
16561662
display: none;
16571663
}
16581664

1659-
#navmenu.opens {
1665+
#navmenu.opens,
1666+
#langmenu.opens {
16601667
display: block;
16611668
}
16621669

@@ -1669,10 +1676,14 @@ blockquote {
16691676
}
16701677

16711678
#langbar a {
1672-
1679+
display:flex;
1680+
gap:0.5rem;
1681+
align-items:center;
1682+
justify-content:center;
16731683
}
16741684

1675-
#navbar .submenu.open {
1685+
#navbar .submenu.open,
1686+
#langbar .submenu.open {
16761687
flex-direction: column;
16771688
align-items: initial;
16781689
> a {
@@ -1734,3 +1745,13 @@ blockquote {
17341745
border-bottom: 1px solid var(--border);
17351746
}
17361747
}
1748+
1749+
@media all and (max-width: 540px) {
1750+
#boxes {
1751+
grid-template-columns: 1fr;
1752+
}
1753+
1754+
#langmenu>li {
1755+
padding-inline: 35%;
1756+
}
1757+
}

js/menu.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ for (const el of itemsMenu) {
6464
// Mobile Menu and Language Picker
6565

6666
const linkItemsMenu = document.querySelectorAll(".submenu > a");
67-
const languageItems = document.querySelectorAll("#language-picker-menu > #navbar > #navmenu > .submenu > a");
68-
const languagePickerMenu = document.querySelector("#language-picker-menu > #navbar > #navmenu");
67+
const languageItems = document.querySelectorAll("#language-picker-menu > #langbar > #langmenu > .submenu > a");
68+
const languagePickerMenu = document.querySelector("#language-picker-menu > #langbar > #langmenu");
6969
const menu = document.querySelector("#navmenu");
7070
const overlay = document.querySelector("#overlay");
7171
const navButton = document.querySelector("#nav-button");
@@ -100,6 +100,7 @@ for (const el of languageItems) {
100100
}
101101

102102
navButton?.addEventListener("click", () => {
103+
console.log("Nav button clicked");
103104
const isLanguageMenuOpen = languagePickerMenu?.classList.contains("opens");
104105
if (isLanguageMenuOpen) {
105106
languagePickerMenu?.classList.remove("opens");
@@ -112,6 +113,7 @@ navButton?.addEventListener("click", () => {
112113
});
113114

114115
languagePickerButton?.addEventListener("click", () => {
116+
console.log("Language picker button clicked");
115117
const isMenuOpen = menu?.classList.contains("opens");
116118
if (isMenuOpen) {
117119
menu?.classList.remove("opens");

0 commit comments

Comments
 (0)