Skip to content

Commit fd964d6

Browse files
cvrebertcvrebert
committed
apply fixes from master branch to example templates
1 parent 7473dc5 commit fd964d6

File tree

14 files changed

+104
-20
lines changed

14 files changed

+104
-20
lines changed

‎examples/carousel/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<div class="navbar-wrapper">
3333
<div class="container">
3434

35-
<nav class="navbar navbar-inverse navbar-static-top" role="navigation">
35+
<nav class="navbar navbar-inverse navbar-static-top">
3636
<div class="container">
3737
<div class="navbar-header">
3838
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">

‎examples/dashboard/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
<body>
3131

32-
<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
32+
<nav class="navbar navbar-inverse navbar-fixed-top">
3333
<div class="container-fluid">
3434
<div class="navbar-header">
3535
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">

‎examples/jumbotron/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
<body>
3131

32-
<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
32+
<nav class="navbar navbar-inverse navbar-fixed-top">
3333
<div class="container">
3434
<div class="navbar-header">
3535
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
@@ -41,7 +41,7 @@
4141
<a class="navbar-brand" href="#">Project name</a>
4242
</div>
4343
<div id="navbar" class="navbar-collapse collapse">
44-
<form class="navbar-form navbar-right" role="form">
44+
<form class="navbar-form navbar-right">
4545
<div class="form-group">
4646
<input type="text" placeholder="Email" class="form-control">
4747
</div>

‎examples/justified-nav/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
<div class="masthead">
3535
<h3 class="text-muted">Project name</h3>
36-
<div role="navigation">
36+
<nav>
3737
<ul class="nav nav-justified">
3838
<li class="active"><a href="#">Home</a></li>
3939
<li><a href="#">Projects</a></li>
@@ -42,7 +42,7 @@ <h3 class="text-muted">Project name</h3>
4242
<li><a href="#">About</a></li>
4343
<li><a href="#">Contact</a></li>
4444
</ul>
45-
</div>
45+
</nav>
4646
</div>
4747

4848
<!-- Jumbotron -->

‎examples/navbar-fixed-top/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<body>
3131

3232
<!-- Fixed navbar -->
33-
<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
33+
<nav class="navbar navbar-default navbar-fixed-top">
3434
<div class="container">
3535
<div class="navbar-header">
3636
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">

‎examples/navbar-static-top/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<body>
3131

3232
<!-- Static navbar -->
33-
<nav class="navbar navbar-default navbar-static-top" role="navigation">
33+
<nav class="navbar navbar-default navbar-static-top">
3434
<div class="container">
3535
<div class="navbar-header">
3636
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">

‎examples/navbar/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<div class="container">
3333

3434
<!-- Static navbar -->
35-
<nav class="navbar navbar-default" role="navigation">
35+
<nav class="navbar navbar-default">
3636
<div class="container-fluid">
3737
<div class="navbar-header">
3838
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">

‎examples/non-responsive/index.html

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<body>
3333

3434
<!-- Fixed navbar -->
35-
<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
35+
<nav class="navbar navbar-default navbar-fixed-top">
3636
<div class="container">
3737
<div class="navbar-header">
3838
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
@@ -61,6 +61,12 @@
6161
</ul>
6262
</li>
6363
</ul>
64+
<form class="navbar-form navbar-left" role="search">
65+
<div class="form-group">
66+
<input type="text" class="form-control" placeholder="Search">
67+
</div>
68+
<button type="submit" class="btn btn-default">Submit</button>
69+
</form>
6470
<ul class="nav navbar-nav navbar-right">
6571
<li><a href="#">Link</a></li>
6672
<li><a href="#">Link</a></li>

‎examples/non-responsive/non-responsive.css

Lines changed: 80 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,16 @@
66

77
/* Account for fixed navbar */
88
body {
9-
min-width: 970px;
109
padding-top: 70px;
1110
padding-bottom: 30px;
1211
}
1312

13+
body,
14+
.navbar-fixed-top,
15+
.navbar-fixed-bottom {
16+
min-width: 970px;
17+
}
18+
1419
/* Don't let the lead text change font-size. */
1520
.lead {
1621
font-size: 16px;
@@ -64,6 +69,7 @@ body {
6469
height: auto !important;
6570
padding-bottom: 0;
6671
overflow: visible !important;
72+
visibility: visible !important;
6773
}
6874

6975
.navbar-toggle {
@@ -123,3 +129,76 @@ body {
123129
color: #999 !important;
124130
background-color: transparent !important;
125131
}
132+
133+
/* Undo form expansion */
134+
.navbar-form {
135+
float: left;
136+
width: auto;
137+
padding-top: 0;
138+
padding-bottom: 0;
139+
margin-right: 0;
140+
margin-left: 0;
141+
border: 0;
142+
-webkit-box-shadow: none;
143+
box-shadow: none;
144+
}
145+
146+
/* Copy-pasted from forms.less since we mixin the .form-inline styles. */
147+
.navbar-form .form-group {
148+
display: inline-block;
149+
margin-bottom: 0;
150+
vertical-align: middle;
151+
}
152+
153+
.navbar-form .form-control {
154+
display: inline-block;
155+
width: auto;
156+
vertical-align: middle;
157+
}
158+
159+
.navbar-form .form-control-static {
160+
display: inline-block;
161+
}
162+
163+
.navbar-form .input-group {
164+
display: inline-table;
165+
vertical-align: middle;
166+
}
167+
168+
.navbar-form .input-group .input-group-addon,
169+
.navbar-form .input-group .input-group-btn,
170+
.navbar-form .input-group .form-control {
171+
width: auto;
172+
}
173+
174+
.navbar-form .input-group > .form-control {
175+
width: 100%;
176+
}
177+
178+
.navbar-form .control-label {
179+
margin-bottom: 0;
180+
vertical-align: middle;
181+
}
182+
183+
.navbar-form .radio,
184+
.navbar-form .checkbox {
185+
display: inline-block;
186+
margin-top: 0;
187+
margin-bottom: 0;
188+
vertical-align: middle;
189+
}
190+
191+
.navbar-form .radio label,
192+
.navbar-form .checkbox label {
193+
padding-left: 0;
194+
}
195+
196+
.navbar-form .radio input[type="radio"],
197+
.navbar-form .checkbox input[type="checkbox"] {
198+
position: relative;
199+
margin-left: 0;
200+
}
201+
202+
.navbar-form .has-feedback .form-control-feedback {
203+
top: 0;
204+
}

‎examples/offcanvas/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</head>
2929

3030
<body>
31-
<nav class="navbar navbar-fixed-top navbar-inverse" role="navigation">
31+
<nav class="navbar navbar-fixed-top navbar-inverse">
3232
<div class="container">
3333
<div class="navbar-header">
3434
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
@@ -95,7 +95,7 @@ <h2>Heading</h2>
9595
</div><!--/row-->
9696
</div><!--/.col-xs-12.col-sm-9-->
9797

98-
<div class="col-xs-6 col-sm-3 sidebar-offcanvas" id="sidebar" role="navigation">
98+
<div class="col-xs-6 col-sm-3 sidebar-offcanvas" id="sidebar">
9999
<div class="list-group">
100100
<a href="#" class="list-group-item active">Link</a>
101101
<a href="#" class="list-group-item">Link</a>

0 commit comments

Comments
 (0)