Skip to content

Commit 5c566ef

Browse files
committed
simplify navigation css
1 parent 4d497c4 commit 5c566ef

File tree

2 files changed

+53
-65
lines changed

2 files changed

+53
-65
lines changed

_includes/header.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ <h1 class="site-title">
2323
<ul id="menu-header" class="menu">
2424
{% for entry in site.data.navigation %}
2525
{% if entry.items[0] %}
26-
<li class="menu-item menu-item-has-children{% if page.navbar-group == entry.title %} current-menu-ancestor current_page_ancestor{% endif %}">
26+
<li class="menu-item menu-item-has-children{% if page.navbar-group == entry.title %} active{% endif %}">
2727
<a href="{{ entry.items[0].url | relative_url }}">{{ entry.title }}</a>
2828
<div class="sub-menu-wrapper">
2929
<div class="container">
3030
<ul class="sub-menu">
3131
{% for item in entry.items %}
3232
<li>
33-
<a class="menu-item{% if item.url == page.url %} current-menu-item{% endif %}"
33+
<a class="sub-menu-item{% if item.url == page.url %} active{% endif %}"
3434
href="{{ item.url | relative_url }}">{{ item.title }}</a>
3535
</li>
3636
{% endfor %}
@@ -39,7 +39,7 @@ <h1 class="site-title">
3939
</div>
4040
</li>
4141
{% else %}
42-
<li class="menu-item{% if page.navbar-group == entry.title %} current-menu-item current_page_item current_page_parent{% endif %}">
42+
<li class="menu-item{% if page.navbar-group == entry.title %} active{% endif %}">
4343
<a href="{{ entry.url | relative_url }}">{{ entry.title }}</a>
4444
</li>
4545
{% endif %}

_sass/navigation.scss

+50-62
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,13 @@
3030
display: inline-block;
3131
}
3232

33-
#site-navigation .sub-menu {
34-
display: none;
35-
}
36-
37-
#site-navigation .current_page_ancestor {
38-
margin-bottom: 3.5rem;
33+
#site-navigation .menu-item.active .sub-menu {
34+
display: block;
3935
}
4036

41-
#site-navigation .current_page_ancestor .current-menu-item {
42-
font-weight: 700;
43-
color: $light;
37+
#site-navigation .menu-item.active > a {
38+
position: relative;
39+
background: darken($primary, 5%);
4440
}
4541

4642
#site-navigation .menu-item-has-children > a:after {
@@ -50,16 +46,7 @@
5046
transition: transform .2s;
5147
}
5248

53-
#site-navigation .current_page_ancestor .sub-menu, #site-navigation .current_page_parent .sub-menu {
54-
display: block;
55-
}
56-
57-
#site-navigation .current_page_ancestor > a, #site-navigation .current_page_parent > a {
58-
position: relative;
59-
background: darken($primary, 5%);
60-
}
61-
62-
#site-navigation .current_page_ancestor > a:after, #site-navigation .current_page_parent > a:after {
49+
#site-navigation .menu-item-has-children.active > a:after {
6350
transform: rotate(90deg);
6451
}
6552

@@ -79,74 +66,75 @@
7966
display: block;
8067
}
8168

82-
#site-navigation .current-menu-ancestor .sub-menu-wrapper a {
83-
@extend .rounded;
69+
#site-navigation .sub-menu {
70+
display: none;
71+
}
72+
73+
#site-navigation .sub-menu-item.active {
74+
font-weight: 700;
8475
}
8576

86-
#site-navigation .sub-menu-wrapper .sub-menu a:hover {
77+
#site-navigation .sub-menu a:hover {
8778
background: rgba(0, 0, 0, 0.1);
8879
}
8980

81+
#site-navigation .active .sub-menu a {
82+
@extend .rounded;
83+
}
84+
9085
@include media-breakpoint-down(lg) {
9186
#site-navigation .menu {
9287
display: block;
9388
}
9489

95-
#site-navigation .current_page_ancestor {
90+
#site-navigation .active {
9691
margin-bottom: 0;
9792
}
9893

9994
#site-navigation .sub-menu-wrapper {
10095
position: relative;
10196
}
10297

103-
#site-navigation ul {
98+
#site-navigation ul, #site-navigation ul li, #site-navigation ul li a {
10499
position: relative;
105100
display: block;
106101
}
107-
108-
#site-navigation ul li, #site-navigation ul li a {
109-
display: block;
110-
}
111102
}
112103

113104
@include media-breakpoint-up(lg) {
114-
#site-navigation .menu-item-has-children:not(.current-menu-ancestor):hover {
115-
background: $light;
116-
}
117-
118-
#site-navigation .menu-item-has-children:not(.current-menu-ancestor):hover a {
119-
color: $body-color;
120-
}
121-
122-
#site-navigation .menu-item-has-children:not(.current-menu-ancestor):hover a:after {
123-
transform: rotate(90deg);
105+
#site-navigation .menu-item.menu-item-has-children.active {
106+
margin-bottom: 3.5rem;
124107
}
125108

126-
#site-navigation .menu-item-has-children:not(.current-menu-ancestor):hover .sub-menu-wrapper {
127-
display: block;
128-
position: absolute;
129-
z-index: 2;
130-
left: auto;
131-
width: auto;
109+
#site-navigation .menu-item-has-children:not(.active):hover {
132110
background: $light;
133-
box-shadow: 0 3px 3px rgba(0, 0, 0, 0.4);
134-
}
135-
136-
#site-navigation .menu-item-has-children:not(.current-menu-ancestor):hover .sub-menu-wrapper .container {
137-
padding: 0;
138-
}
139-
140-
#site-navigation .menu-item-has-children:not(.current-menu-ancestor):hover .sub-menu-wrapper .sub-menu {
141-
display: block;
142-
padding: 0;
143-
}
144-
145-
#site-navigation .menu-item-has-children:not(.current-menu-ancestor):hover .sub-menu-wrapper .sub-menu li {
146-
display: block;
147-
}
148-
149-
#site-navigation .menu-item-has-children:not(.current-menu-ancestor):hover .sub-menu-wrapper .sub-menu li a {
150-
padding: 1rem 1.5rem;
111+
& a {
112+
color: $body-color;
113+
&:after {
114+
transform: rotate(90deg);
115+
}
116+
}
117+
& .sub-menu-wrapper {
118+
display: block;
119+
position: absolute;
120+
z-index: 2;
121+
left: auto;
122+
width: auto;
123+
background: $light;
124+
box-shadow: 0 3px 3px rgba(0, 0, 0, 0.4);
125+
& .container {
126+
padding: 0;
127+
}
128+
& .sub-menu {
129+
padding: 0;
130+
display: block;
131+
& li {
132+
display: block;
133+
& a {
134+
padding: 1rem 1.5rem;
135+
}
136+
}
137+
}
138+
}
151139
}
152140
}

0 commit comments

Comments
 (0)