Skip to content

Commit cfdc2f1

Browse files
authored
Merge pull request #31 from joestr/patch-2
fix: navbar and navbar examples
2 parents 1b91193 + ea0d354 commit cfdc2f1

File tree

2 files changed

+40
-39
lines changed

2 files changed

+40
-39
lines changed

partials/navbar.html

+16-15
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,30 @@
33

44
<!-- Top Nav -->
55
<div class="navbar-fixed">
6-
<nav class="primary">
7-
<div class="nav-wrapper">
6+
<nav class="nav navbar">
7+
<div class="nav-wrapper primary">
8+
<a class="brand-logo">{{page.name}}</a>
89
<a class="sidenav-trigger" href="#" data-target="nav-mobile"><i class="material-icons">menu</i></a>
9-
<ul>
10-
<li>{{page.name}}</li>
11-
</ul>
1210
<ul class="right">
1311
<li>
1412
<a href="" onclick="paletteSelectorModal.showModal(); return false;">
1513
<i class="material-icons">palette</i>
1614
</a>
1715
</li>
1816
<li>
19-
<a id="theme-switch" href="#"><i class="material-icons">dark_mode</i></a>
17+
<a id="theme-switch" href="#">
18+
<i class="material-icons">dark_mode</i>
19+
</a>
2020
</li>
2121
<li>
22-
<a class="ext-link" href="https://github.com/materializecss/materialize" target="_blank" title="Check out our GitHub"
23-
><img src="images/github.svg" style="height: 20px"
24-
/></a>
22+
<a class="ext-link" href="https://github.com/materializecss/materialize" target="_blank" rel="noopener" title="Check out our GitHub">
23+
<img src="images/github.svg" alt="GitHub logo" style="height: 20px" />
24+
</a>
2525
</li>
2626
<li>
27-
<a class="ext-link" href="https://opencollective.com/materialize" target="_blank" title="Support us via OpenCollective"><img src="images/opencollective.svg" /></a>
27+
<a class="ext-link" href="https://opencollective.com/materialize" target="_blank" rel="noopener" title="Support us via OpenCollective">
28+
<img src="images/opencollective.svg" alt="Open Collective logo" />
29+
</a>
2830
</li>
2931
</ul>
3032
</div>
@@ -37,8 +39,7 @@
3739
<a class="brand-logo" id="logo-container" href="/">
3840
<img id="front-page-logo" src="images/materialize.svg" alt="Materialize Web Logo"/>
3941
Materialize
40-
</a
41-
>
42+
</a>
4243
</li>
4344

4445
<li class="search">
@@ -74,12 +75,12 @@ <h4>Color Scheme</h4>
7475
</div>
7576
<div class="modal-content">
7677
<div class="color-row">
77-
<label>Primary Color</label>
78-
<input type="color" id="color-picker" value="#0000ff" />
78+
<input type="color" id="color-picker" value="#0000ff">
79+
<label for="color-picker">Primary Color</label>
7980
</div>
8081
<button id="downloadCss" type="button" class="btn tonal">Download css style</button>
8182
</div>
8283
<div class="modal-footer">
83-
<button class="btn text waves-effect" onclick="paletteSelectorModal.close()">Close</a>
84+
<button type="button" class="btn text waves-effect" onclick="paletteSelectorModal.close()">Close</button>
8485
</div>
8586
</dialog>

src/navbar.html

+24-24
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ <h3 class="header">Right Aligned Links</h3>
2121
<code class="language-html">ul</code>
2222
that contains them.
2323
</p>
24-
<nav class="navbar">
24+
<nav class="nav navbar">
2525
<div class="nav-wrapper">
2626
<div class="col s12">
2727
<a href="#!" class="brand-logo">Logo</a>
@@ -42,7 +42,7 @@ <h3 class="header">Right Aligned Links</h3>
4242

4343
<pre><code class="language-html">
4444
<xmp>
45-
<nav class="navbar">
45+
<nav class="nav navbar">
4646
<div class="nav-wrapper">
4747
<a href="#" class="brand-logo">Logo</a>
4848
<ul id="nav-mobile" class="right hide-on-med-and-down">
@@ -63,7 +63,7 @@ <h3 class="header">Left Aligned Links</h3>
6363
<code class="language-html">ul</code>
6464
that contains them.
6565
</p>
66-
<nav class="navbar">
66+
<nav class="nav navbar">
6767
<div class="nav-wrapper">
6868
<div class="col s12">
6969
<a href="#!" class="brand-logo right">Logo</a>
@@ -84,7 +84,7 @@ <h3 class="header">Left Aligned Links</h3>
8484

8585
<pre><code class="language-html">
8686
<xmp>
87-
<nav class="navbar">
87+
<nav class="nav navbar">
8888
<div class="nav-wrapper">
8989
<a href="#" class="brand-logo right">Logo</a>
9090
<ul id="nav-mobile" class="left hide-on-med-and-down">
@@ -107,7 +107,7 @@ <h3 class="header">Centering the logo</h3>
107107
&lt;a class=&quot;brand-logo&quot;&gt;&lt;/a&gt;
108108
</code>. You will have to make sure yourself that links do not overlap if you use this.
109109
</p>
110-
<nav>
110+
<nav clas="nav navbar">
111111
<div class="nav-wrapper">
112112
<a href="#!" class="brand-logo center">Logo</a>
113113
<ul class="left hide-on-med-and-down">
@@ -123,7 +123,7 @@ <h3 class="header">Centering the logo</h3>
123123

124124
<pre><code class="language-html">
125125
<xmp>
126-
<nav class="navbar">
126+
<nav class="nav navbar">
127127
<div class="nav-wrapper">
128128
<a href="#" class="brand-logo center">Logo</a>
129129
<ul id="nav-mobile" class="left hide-on-med-and-down">
@@ -141,7 +141,7 @@ <h3 class="header">Centering the logo</h3>
141141
<h3 class="header">Active Items</h3>
142142
<p>Add active class to your li tags to denote the current page.</p>
143143

144-
<nav class="navbar">
144+
<nav class="nav navbar">
145145
<div class="nav-wrapper">
146146
<a href="#!" class="brand-logo center">Logo</a>
147147
<ul class="left hide-on-med-and-down">
@@ -160,7 +160,7 @@ <h3 class="header">Active Items</h3>
160160

161161
<pre><code class="language-html">
162162
<xmp>
163-
<nav class="navbar">
163+
<nav class="nav navbar">
164164
<div class="nav-wrapper">
165165
<a href="#!" class="brand-logo center">Logo</a>
166166
<ul class="left hide-on-med-and-down">
@@ -182,7 +182,7 @@ <h3 class="header">Extended Navbar with Tabs</h3>
182182
can just include a tabs component inside the <span class="language-html">nav-wrapper</span>.
183183
</p>
184184

185-
<nav class="navbar nav-extended">
185+
<nav class="nav navbar nav-extended">
186186
<div class="nav-wrapper">
187187
<a href="#" class="brand-logo">Logo</a>
188188
<a href="#" data-target="mobile-demo" class="sidenav-trigger">
@@ -237,7 +237,7 @@ <h3 class="header">Extended Navbar with Tabs</h3>
237237

238238
<pre><code class="language-html">
239239
<xmp>
240-
<nav class="navbar nav-extended">
240+
<nav class="nav navbar nav-extended">
241241
<div class="nav-wrapper">
242242
<a href="#" class="brand-logo">Logo</a>
243243
<a href="#" data-target="mobile-demo" class="sidenav-trigger"><i class="material-icons">menu</i></a>
@@ -282,7 +282,7 @@ <h3 class="header">Fixed Navbar</h3>
282282
<pre><code class="language-html">
283283
<xmp>
284284
<div class="navbar-fixed">
285-
<nav class="navbar">
285+
<nav class="nav navbar">
286286
<div class="nav-wrapper">
287287
<a href="#!" class="brand-logo">Logo</a>
288288
<ul class="right hide-on-med-and-down">
@@ -317,7 +317,7 @@ <h3 class="header">Navbar Dropdown Menu</h3>
317317
<a href="#!">three</a>
318318
</li>
319319
</ul>
320-
<nav class="navbar">
320+
<nav class="nav navbar">
321321
<div class="nav-wrapper">
322322
<a href="#!" class="brand-logo">Logo</a>
323323
<ul class="right hide-on-med-and-down">
@@ -347,7 +347,7 @@ <h3 class="header">Navbar Dropdown Menu</h3>
347347
<li class="divider"></li>
348348
<li><a href="#!">three</a></li>
349349
</ul>
350-
<nav class="navbar">
350+
<nav class="nav navbar">
351351
<div class="nav-wrapper">
352352
<a href="#!" class="brand-logo">Logo</a>
353353
<ul class="right hide-on-med-and-down">
@@ -382,7 +382,7 @@ <h5>Trigger dropdown menu on click</h5>
382382
<div id="icons" class="section scrollspy">
383383
<h3 class="header">Icon Links</h3>
384384

385-
<nav class="navbar">
385+
<nav class="nav navbar">
386386
<div class="nav-wrapper">
387387
<a href="#!" class="brand-logo"> <i class="material-icons">cloud</i>Logo</a>
388388
<ul class="right hide-on-med-and-down">
@@ -415,7 +415,7 @@ <h3 class="header">Icon Links</h3>
415415
</p>
416416
<pre><code class="language-html">
417417
<xmp>
418-
<nav class="navbar">
418+
<nav class="nav navbar">
419419
<div class="nav-wrapper">
420420
<a href="#!" class="brand-logo"><i class="material-icons">cloud</i>Logo</a>
421421
<ul class="right hide-on-med-and-down">
@@ -429,7 +429,7 @@ <h3 class="header">Icon Links</h3>
429429
</xmp>
430430
</code></pre>
431431

432-
<nav class="navbar">
432+
<nav class="nav navbar">
433433
<div class="nav-wrapper">
434434
<a href="#!" class="brand-logo">Logo</a>
435435
<ul class="right hide-on-med-and-down">
@@ -452,7 +452,7 @@ <h3 class="header">Icon Links</h3>
452452
</p>
453453
<pre><code class="language-html">
454454
<xmp>
455-
<nav class="navbar">
455+
<nav class="nav navbar">
456456
<div class="nav-wrapper">
457457
<a href="#!" class="brand-logo">Logo</a>
458458
<ul class="right hide-on-med-and-down">
@@ -468,7 +468,7 @@ <h3 class="header">Icon Links</h3>
468468
<div id="buttons" class="section scrollspy">
469469
<h3 class="header">Buttons</h3>
470470

471-
<nav class="navbar">
471+
<nav class="nav navbar">
472472
<div class="nav-wrapper">
473473
<a href="#!" class="brand-logo">Logo</a>
474474
<ul class="right hide-on-med-and-down">
@@ -494,7 +494,7 @@ <h3 class="header">Buttons</h3>
494494
</p>
495495
<pre><code class="language-html">
496496
<xmp>
497-
<nav class="navbar">
497+
<nav class="nav navbar">
498498
<div class="nav-wrapper">
499499
<a href="#!" class="brand-logo">Logo</a>
500500
<ul class="right hide-on-med-and-down">
@@ -510,7 +510,7 @@ <h3 class="header">Buttons</h3>
510510
<h5>Halfway FAB in Extended Navbar</h5>
511511
<p>Add a halfway FAB to your extended navbar.</p>
512512

513-
<nav class="navbar nav-extended">
513+
<nav class="nav navbar nav-extended">
514514
<div class="nav-wrapper">
515515
<a href="#!" class="brand-logo">Logo</a>
516516
<ul class="right hide-on-med-and-down">
@@ -535,7 +535,7 @@ <h5>Halfway FAB in Extended Navbar</h5>
535535

536536
<pre><code class="language-html">
537537
<xmp>
538-
<nav class="navbar nav-extended">
538+
<nav class="nav navbar nav-extended">
539539
<div class="nav-wrapper">
540540
<a href="#!" class="brand-logo">Logo</a>
541541
<ul class="right hide-on-med-and-down">
@@ -558,7 +558,7 @@ <h5>Halfway FAB in Extended Navbar</h5>
558558
<div id="search-docs" class="section scrollspy">
559559
<h3 class="header">Search Bar</h3>
560560

561-
<nav class="navbar">
561+
<nav class="nav navbar">
562562
<div class="nav-wrapper">
563563
<form>
564564
<div class="input-field">
@@ -593,7 +593,7 @@ <h3 class="header">Search Bar</h3>
593593
<div id="mobile-collapse" class="section scrollspy">
594594
<h3 class="header">Mobile Collapse Button</h3>
595595

596-
<nav class="navbar">
596+
<nav class="nav navbar">
597597
<div class="nav-wrapper">
598598
<a href="#!" class="brand-logo">Logo</a>
599599
<a href="#" data-target="mobile-demo" class="sidenav-trigger">
@@ -643,7 +643,7 @@ <h3 class="header">Mobile Collapse Button</h3>
643643
</p>
644644
<pre><code class="language-html">
645645
<xmp>
646-
<nav class="navbar">
646+
<nav class="nav navbar">
647647
<div class="nav-wrapper">
648648
<a href="#!" class="brand-logo">Logo</a>
649649
<a href="#" data-target="mobile-demo" class="sidenav-trigger"><i class="material-icons">menu</i></a>

0 commit comments

Comments
 (0)