mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-30 08:39:56 +02:00
Code Issues Releases Wiki Activity

fixes #4342: navbar vars not in use, render navbar dividers

Browse Source
This commit is contained in:
Mark Otto
2012-08-13 22:57:40 -07:00
parent 0040a78058
commit 97a23ef2e6
5 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
docs/assets/css/bootstrap.css vendored
View File

@@ -4054,6 +4054,13 @@ input[type="submit"].btn.btn-mini {
color: #333333;
}
.navbar .divider-vertical {
height: 40px;
margin: 0 9px;
border-right: 1px solid #ffffff;
border-left: 1px solid #f2f2f2;
}
.navbar .btn,
.navbar .btn-group {
margin-top: 6px;
@@ -4129,18 +4136,6 @@ input[type="submit"].btn.btn-mini {
border-radius: 15px;
}
.navbar-search .search-query:-moz-placeholder {
color: #cccccc;
}
.navbar-search .search-query:-ms-input-placeholder {
color: #cccccc;
}
.navbar-search .search-query::-webkit-input-placeholder {
color: #cccccc;
}
.navbar-fixed-top,
.navbar-fixed-bottom {
position: fixed;
@@ -4412,6 +4407,11 @@ input[type="submit"].btn.btn-mini {
color: #ffffff;
}
.navbar-inverse .divider-vertical {
border-right-color: #222222;
border-left-color: #111111;
}
.navbar-inverse .nav li.dropdown.open > .dropdown-toggle,
.navbar-inverse .nav li.dropdown.active > .dropdown-toggle,
.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle {

2
docs/components.html
View File

@@ -1106,6 +1106,7 @@
<div class="navbar-inner">
<form class="navbar-form pull-left">
<input type="text" class="span2">
<button type="submit" class="btn">Submit</button>
</form>
</div>
</div>
@@ -1113,6 +1114,7 @@
<pre class="prettyprint linenums">
&lt;form class="navbar-form pull-left"&gt;
&lt;input type="text" class="span2"&gt;
&lt;button type="submit" class="btn"&gt;Submit&lt;/button&gt;
&lt;/form&gt;
</pre>

2
docs/templates/pages/components.mustache vendored
View File

@@ -1035,6 +1035,7 @@
<div class="navbar-inner">
<form class="navbar-form pull-left">
<input type="text" class="span2">
<button type="submit" class="btn">{{_i}}Submit{{/i}}</button>
</form>
</div>
</div>
@@ -1042,6 +1043,7 @@
<pre class="prettyprint linenums">
&lt;form class="navbar-form pull-left"&gt;
&lt;input type="text" class="span2"&gt;
&lt;button type="submit" class="btn"&gt;{{_i}}Submit{{/i}}&lt;/button&gt;
&lt;/form&gt;
</pre>