fixes #4342: navbar vars not in use, render navbar dividers
This commit is contained in:
parent
0040a78058
commit
97a23ef2e6
|
@ -4054,6 +4054,13 @@ input[type="submit"].btn.btn-mini {
|
||||||
color: #333333;
|
color: #333333;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.navbar .divider-vertical {
|
||||||
|
height: 40px;
|
||||||
|
margin: 0 9px;
|
||||||
|
border-right: 1px solid #ffffff;
|
||||||
|
border-left: 1px solid #f2f2f2;
|
||||||
|
}
|
||||||
|
|
||||||
.navbar .btn,
|
.navbar .btn,
|
||||||
.navbar .btn-group {
|
.navbar .btn-group {
|
||||||
margin-top: 6px;
|
margin-top: 6px;
|
||||||
|
@ -4129,18 +4136,6 @@ input[type="submit"].btn.btn-mini {
|
||||||
border-radius: 15px;
|
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-top,
|
||||||
.navbar-fixed-bottom {
|
.navbar-fixed-bottom {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
|
@ -4412,6 +4407,11 @@ input[type="submit"].btn.btn-mini {
|
||||||
color: #ffffff;
|
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.open > .dropdown-toggle,
|
||||||
.navbar-inverse .nav li.dropdown.active > .dropdown-toggle,
|
.navbar-inverse .nav li.dropdown.active > .dropdown-toggle,
|
||||||
.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle {
|
.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle {
|
||||||
|
|
|
@ -1106,6 +1106,7 @@
|
||||||
<div class="navbar-inner">
|
<div class="navbar-inner">
|
||||||
<form class="navbar-form pull-left">
|
<form class="navbar-form pull-left">
|
||||||
<input type="text" class="span2">
|
<input type="text" class="span2">
|
||||||
|
<button type="submit" class="btn">Submit</button>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -1113,6 +1114,7 @@
|
||||||
<pre class="prettyprint linenums">
|
<pre class="prettyprint linenums">
|
||||||
<form class="navbar-form pull-left">
|
<form class="navbar-form pull-left">
|
||||||
<input type="text" class="span2">
|
<input type="text" class="span2">
|
||||||
|
<button type="submit" class="btn">Submit</button>
|
||||||
</form>
|
</form>
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
|
|
|
@ -1035,6 +1035,7 @@
|
||||||
<div class="navbar-inner">
|
<div class="navbar-inner">
|
||||||
<form class="navbar-form pull-left">
|
<form class="navbar-form pull-left">
|
||||||
<input type="text" class="span2">
|
<input type="text" class="span2">
|
||||||
|
<button type="submit" class="btn">{{_i}}Submit{{/i}}</button>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -1042,6 +1043,7 @@
|
||||||
<pre class="prettyprint linenums">
|
<pre class="prettyprint linenums">
|
||||||
<form class="navbar-form pull-left">
|
<form class="navbar-form pull-left">
|
||||||
<input type="text" class="span2">
|
<input type="text" class="span2">
|
||||||
|
<button type="submit" class="btn">{{_i}}Submit{{/i}}</button>
|
||||||
</form>
|
</form>
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
|
|
|
@ -76,6 +76,15 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Dividers in navbar
|
||||||
|
// -------------------------
|
||||||
|
.navbar .divider-vertical {
|
||||||
|
height: @navbarHeight;
|
||||||
|
margin: 0 9px;
|
||||||
|
border-left: 1px solid @navbarBackground;
|
||||||
|
border-right: 1px solid @navbarBackgroundHighlight;
|
||||||
|
}
|
||||||
|
|
||||||
// Buttons in navbar
|
// Buttons in navbar
|
||||||
// -------------------------
|
// -------------------------
|
||||||
.navbar .btn,
|
.navbar .btn,
|
||||||
|
@ -128,7 +137,6 @@
|
||||||
padding: 4px 14px;
|
padding: 4px 14px;
|
||||||
#font > .sans-serif(13px, normal, 1);
|
#font > .sans-serif(13px, normal, 1);
|
||||||
.border-radius(15px); // redeclare because of specificity of the type attribute
|
.border-radius(15px); // redeclare because of specificity of the type attribute
|
||||||
.placeholder(@navbarSearchPlaceholderColor);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -373,6 +381,12 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Dividers in navbar
|
||||||
|
.divider-vertical {
|
||||||
|
border-left-color: @navbarInverseBackground;
|
||||||
|
border-right-color: @navbarInverseBackgroundHighlight;
|
||||||
|
}
|
||||||
|
|
||||||
// Dropdowns
|
// Dropdowns
|
||||||
.nav li.dropdown.open > .dropdown-toggle,
|
.nav li.dropdown.open > .dropdown-toggle,
|
||||||
.nav li.dropdown.active > .dropdown-toggle,
|
.nav li.dropdown.active > .dropdown-toggle,
|
||||||
|
|
|
@ -168,10 +168,6 @@
|
||||||
@navbarLinkBackgroundHover: transparent;
|
@navbarLinkBackgroundHover: transparent;
|
||||||
@navbarLinkBackgroundActive: darken(@navbarBackground, 5%);
|
@navbarLinkBackgroundActive: darken(@navbarBackground, 5%);
|
||||||
|
|
||||||
@navbarSearchBackground: lighten(@navbarBackground, 25%);
|
|
||||||
@navbarSearchBackgroundFocus: @white;
|
|
||||||
@navbarSearchBorder: darken(@navbarSearchBackground, 30%);
|
|
||||||
@navbarSearchPlaceholderColor: #ccc;
|
|
||||||
@navbarBrandColor: @navbarLinkColor;
|
@navbarBrandColor: @navbarLinkColor;
|
||||||
|
|
||||||
// Inverted navbar
|
// Inverted navbar
|
||||||
|
|
Loading…
Reference in New Issue