Skip to content

Commit 1b5f815

Browse files
Merge pull request #444 from jarrodmillman/navbar-merge
Refactor bulma navbar css
2 parents c91d4f5 + 485ec95 commit 1b5f815

2 files changed

Lines changed: 62 additions & 159 deletions

File tree

assets/theme-css/bulma.css

Lines changed: 61 additions & 158 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,11 @@
11
/*! bulma.io v0.9.4 | MIT License | github.com/jgthms/bulma */
2-
.navbar-link:not(.is-arrowless)::after {
3-
border: 3px solid transparent;
4-
border-radius: 2px;
5-
border-right: 0;
6-
border-top: 0;
7-
content: " ";
8-
display: block;
9-
height: 0.625em;
10-
margin-top: -0.4375em;
11-
pointer-events: none;
12-
position: absolute;
13-
top: 50%;
14-
transform: rotate(-45deg);
15-
transform-origin: center;
16-
width: 0.625em;
17-
}
182
.block:not(:last-child),
193
.box:not(:last-child),
204
.content:not(:last-child),
215
.level:not(:last-child),
226
.title:not(:last-child) {
237
margin-bottom: 1.5rem;
248
}
25-
.navbar-burger {
26-
-moz-appearance: none;
27-
-webkit-appearance: none;
28-
font-family: inherit;
29-
font-size: 1em;
30-
margin: 0;
31-
padding: 0;
32-
}
339
/*! minireset.css v0.0.6 | MIT License | github.com/jgthms/minireset.css */
3410
input,
3511
select {
@@ -50,11 +26,6 @@ footer,
5026
header {
5127
display: block;
5228
}
53-
img {
54-
height: auto;
55-
max-width: 100%;
56-
}
57-
5829
input[type="radio"] {
5930
vertical-align: baseline;
6031
}
@@ -172,20 +143,74 @@ a.box:active {
172143
margin-bottom: 0.75rem;
173144
}
174145
}
146+
.column {
147+
display: block;
148+
flex-basis: 0;
149+
flex-grow: 1;
150+
flex-shrink: 1;
151+
padding: 0.75rem 0.75rem 0rem 0.75rem;
152+
}
153+
.columns.is-mobile > .column.is-5 {
154+
flex: none;
155+
width: 41.66667%;
156+
}
157+
@media screen and (min-width: 769px), print {
158+
.column.is-5 {
159+
flex: none;
160+
width: 41.66667%;
161+
}
162+
}
163+
.columns {
164+
margin-left: -0.75rem;
165+
margin-right: -0.75rem;
166+
margin-top: 1rem;
167+
}
168+
.columns:last-child {
169+
margin-bottom: -0.75rem;
170+
}
171+
.columns:not(:last-child) {
172+
margin-bottom: calc(1.5rem - 0.75rem);
173+
}
174+
.columns.is-mobile {
175+
display: flex;
176+
}
177+
@media screen and (min-width: 769px), print {
178+
.columns:not(.is-desktop) {
179+
display: flex;
180+
}
181+
}
182+
@media screen and (max-width: 768px) {
183+
.is-hidden-mobile {
184+
display: none !important;
185+
}
186+
}
187+
.navbar-link:not(.is-arrowless)::after {
188+
border: 3px solid transparent;
189+
border-radius: 2px;
190+
border-right: 0;
191+
border-top: 0;
192+
content: " ";
193+
display: block;
194+
pointer-events: none;
195+
position: absolute;
196+
transform: rotate(-45deg);
197+
transform-origin: center;
198+
margin-top: -0.375em;
199+
right: 1.125em;
200+
}
201+
.navbar-burger {
202+
font-family: inherit;
203+
font-size: 1em;
204+
padding: 0;
205+
}
175206
.navbar > .container {
176207
align-items: stretch;
177208
display: flex;
178-
min-height: 3.25rem;
179209
width: 100%;
180210
}
181211
.navbar-brand {
182212
align-items: stretch;
183213
display: flex;
184-
flex-shrink: 0;
185-
}
186-
.navbar-brand a.navbar-item:focus,
187-
.navbar-brand a.navbar-item:hover {
188-
background-color: transparent;
189214
}
190215
.navbar-burger {
191216
-moz-appearance: none;
@@ -195,7 +220,7 @@ a.box:active {
195220
border: none;
196221
cursor: pointer;
197222
position: relative;
198-
margin-left: auto;
223+
margin: 0 0 0 auto;
199224
}
200225
.navbar-burger span {
201226
background-color: currentColor;
@@ -218,9 +243,6 @@ a.box:active {
218243
.navbar-burger span:nth-child(3) {
219244
top: calc(50% + 4px);
220245
}
221-
.navbar-burger:hover {
222-
background-color: rgba(0, 0, 0, 0.05);
223-
}
224246
.navbar-burger.is-active span:first-child {
225247
transform: translateY(5px) rotate(45deg);
226248
}
@@ -235,7 +257,6 @@ a.box:active {
235257
}
236258
.navbar-item,
237259
.navbar-link {
238-
color: #4a4a4a;
239260
display: block;
240261
line-height: 1.5;
241262
padding: 0.5rem 0.75rem;
@@ -246,21 +267,6 @@ a.box:active {
246267
margin-left: -0.25rem;
247268
margin-right: -0.25rem;
248269
}
249-
.navbar-link,
250-
a.navbar-item {
251-
cursor: pointer;
252-
}
253-
.navbar-link.is-active,
254-
.navbar-link:focus,
255-
.navbar-link:focus-within,
256-
.navbar-link:hover,
257-
a.navbar-item.is-active,
258-
a.navbar-item:focus,
259-
a.navbar-item:focus-within,
260-
a.navbar-item:hover {
261-
background-color: #fafafa;
262-
color: #485fc7;
263-
}
264270
.navbar-item {
265271
flex-grow: 0;
266272
flex-shrink: 0;
@@ -274,11 +280,6 @@ a.navbar-item:hover {
274280
.navbar-link:not(.is-arrowless) {
275281
padding-right: 2.5em;
276282
}
277-
.navbar-link:not(.is-arrowless)::after {
278-
border-color: #485fc7;
279-
margin-top: -0.375em;
280-
right: 1.125em;
281-
}
282283
.navbar-dropdown {
283284
font-size: 0.875rem;
284285
padding-bottom: 0.5rem;
@@ -300,8 +301,6 @@ a.navbar-item:hover {
300301
display: none;
301302
}
302303
.navbar-menu {
303-
background-color: #fff;
304-
box-shadow: 0 8px 16px rgba(10, 10, 10, 0.1);
305304
padding: 0.5rem 0;
306305
}
307306
.navbar-menu.is-active {
@@ -312,41 +311,8 @@ a.navbar-item:hover {
312311
.navbar,
313312
.navbar-end,
314313
.navbar-menu {
315-
align-items: stretch;
316314
display: flex;
317315
}
318-
.navbar {
319-
min-height: 3.25rem;
320-
}
321-
.navbar.is-transparent .navbar-link.is-active,
322-
.navbar.is-transparent .navbar-link:focus,
323-
.navbar.is-transparent .navbar-link:hover,
324-
.navbar.is-transparent a.navbar-item.is-active,
325-
.navbar.is-transparent a.navbar-item:focus,
326-
.navbar.is-transparent a.navbar-item:hover {
327-
background-color: transparent !important;
328-
}
329-
.navbar.is-transparent .navbar-item.has-dropdown.is-active .navbar-link,
330-
.navbar.is-transparent
331-
.navbar-item.has-dropdown.is-hoverable:focus
332-
.navbar-link,
333-
.navbar.is-transparent
334-
.navbar-item.has-dropdown.is-hoverable:focus-within
335-
.navbar-link,
336-
.navbar.is-transparent
337-
.navbar-item.has-dropdown.is-hoverable:hover
338-
.navbar-link {
339-
background-color: transparent !important;
340-
}
341-
.navbar.is-transparent .navbar-dropdown a.navbar-item:focus,
342-
.navbar.is-transparent .navbar-dropdown a.navbar-item:hover {
343-
background-color: #f5f5f5;
344-
color: #0a0a0a;
345-
}
346-
.navbar.is-transparent .navbar-dropdown a.navbar-item.is-active {
347-
background-color: #f5f5f5;
348-
color: #485fc7;
349-
}
350316
.navbar-burger {
351317
display: none;
352318
}
@@ -393,15 +359,6 @@ a.navbar-item:hover {
393359
.navbar-dropdown a.navbar-item {
394360
padding-right: 3rem;
395361
}
396-
.navbar-dropdown a.navbar-item:focus,
397-
.navbar-dropdown a.navbar-item:hover {
398-
background-color: #f5f5f5;
399-
color: #0a0a0a;
400-
}
401-
.navbar-dropdown a.navbar-item.is-active {
402-
background-color: #f5f5f5;
403-
color: #485fc7;
404-
}
405362
.container > .navbar .navbar-brand,
406363
.navbar > .container .navbar-brand {
407364
margin-left: -0.75rem;
@@ -410,58 +367,4 @@ a.navbar-item:hover {
410367
.navbar > .container .navbar-menu {
411368
margin-right: -0.75rem;
412369
}
413-
.navbar-link.is-active,
414-
a.navbar-item.is-active {
415-
color: #0a0a0a;
416-
}
417-
.navbar-link.is-active:not(:focus):not(:hover),
418-
a.navbar-item.is-active:not(:focus):not(:hover) {
419-
background-color: transparent;
420-
}
421-
.navbar-item.has-dropdown.is-active .navbar-link,
422-
.navbar-item.has-dropdown:focus .navbar-link,
423-
.navbar-item.has-dropdown:hover .navbar-link {
424-
background-color: #fafafa;
425-
}
426-
}
427-
.column {
428-
display: block;
429-
flex-basis: 0;
430-
flex-grow: 1;
431-
flex-shrink: 1;
432-
padding: 0.75rem 0.75rem 0rem 0.75rem;
433-
}
434-
.columns.is-mobile > .column.is-5 {
435-
flex: none;
436-
width: 41.66667%;
437-
}
438-
@media screen and (min-width: 769px), print {
439-
.column.is-5 {
440-
flex: none;
441-
width: 41.66667%;
442-
}
443-
}
444-
.columns {
445-
margin-left: -0.75rem;
446-
margin-right: -0.75rem;
447-
margin-top: 1rem;
448-
}
449-
.columns:last-child {
450-
margin-bottom: -0.75rem;
451-
}
452-
.columns:not(:last-child) {
453-
margin-bottom: calc(1.5rem - 0.75rem);
454-
}
455-
.columns.is-mobile {
456-
display: flex;
457-
}
458-
@media screen and (min-width: 769px), print {
459-
.columns:not(.is-desktop) {
460-
display: flex;
461-
}
462-
}
463-
@media screen and (max-width: 768px) {
464-
.is-hidden-mobile {
465-
display: none !important;
466-
}
467370
}

layouts/partials/navbar.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{{- $navbar := .Site.Params.navbar }}
33
{{- $navbarLogo := .Site.Params.navbarlogo }}
44
{{- $navbarLogoShow := .Site.Params.navbarlogoshow }}
5-
<nav id="nav" class="navbar is-fresh is-transparent no-shadow" role="navigation" aria-label="main navigation">
5+
<nav id="nav" class="navbar is-fresh no-shadow" role="navigation" aria-label="main navigation">
66
<div class="container is-max-widescreen">
77
<div class="navbar-brand">
88
{{ if or (not .IsHome) ($navbarLogoShow) }}

0 commit comments

Comments
 (0)