diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index fe6c3ef1ff..6abfad0811 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -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 { diff --git a/docs/components.html b/docs/components.html index bb9cdb8f5f..39fe7bc4fb 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1106,6 +1106,7 @@
@@ -1113,6 +1114,7 @@<form class="navbar-form pull-left"> <input type="text" class="span2"> + <button type="submit" class="btn">Submit</button> </form>diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 91995cf7d5..2f2f5a78a5 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -1035,6 +1035,7 @@ @@ -1042,6 +1043,7 @@
<form class="navbar-form pull-left"> <input type="text" class="span2"> + <button type="submit" class="btn">{{_i}}Submit{{/i}}</button> </form>diff --git a/less/navbar.less b/less/navbar.less index 0e027d2c32..4306047c70 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -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 // ------------------------- .navbar .btn, @@ -128,7 +137,6 @@ padding: 4px 14px; #font > .sans-serif(13px, normal, 1); .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 .nav li.dropdown.open > .dropdown-toggle, .nav li.dropdown.active > .dropdown-toggle, diff --git a/less/variables.less b/less/variables.less index d4b44a2de2..42b76df45e 100644 --- a/less/variables.less +++ b/less/variables.less @@ -168,10 +168,6 @@ @navbarLinkBackgroundHover: transparent; @navbarLinkBackgroundActive: darken(@navbarBackground, 5%); -@navbarSearchBackground: lighten(@navbarBackground, 25%); -@navbarSearchBackgroundFocus: @white; -@navbarSearchBorder: darken(@navbarSearchBackground, 30%); -@navbarSearchPlaceholderColor: #ccc; @navbarBrandColor: @navbarLinkColor; // Inverted navbar