From: Mark Otto Date: Fri, 6 Jan 2012 06:37:23 +0000 (-0800) Subject: docs cleanup and navbar brand hover X-Git-Tag: v2.0.0~6^2~363 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7582520808ad6c3610831652d0d4d33ea4ebf15b;p=thirdparty%2Fbootstrap.git docs cleanup and navbar brand hover --- diff --git a/bootstrap.css b/bootstrap.css index 0014fcdcc2..e2ef40a6c5 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Thu Jan 5 21:43:09 PST 2012 + * Date: Thu Jan 5 22:37:16 PST 2012 */ html, body { margin: 0; @@ -1644,7 +1644,7 @@ i { -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); } -.navbar .brand a:hover, .navbar ul .active > a { +.navbar .brand:hover, .navbar ul .active > a { color: #ffffff; text-decoration: none; background-color: #333333; diff --git a/bootstrap.min.css b/bootstrap.min.css index 86aa51cda9..3d5ec0d6c5 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -280,7 +280,7 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou .close{float:right;font-size:20px;font-weight:bold;line-height:13.5px;color:#000000;text-shadow:0 1px 0 #ffffff;filter:alpha(opacity=20);-moz-opacity:0.2;opacity:0.2;}.close:hover{color:#000000;text-decoration:none;filter:alpha(opacity=40);-moz-opacity:0.4;opacity:0.4;} .navbar{overflow:visible;} .navbar-inner{background-color:#222222;background-color:#222222;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);} -.navbar .brand a:hover,.navbar ul .active>a{color:#ffffff;text-decoration:none;background-color:#333333;background-color:rgba(255, 255, 255, 0.05);} +.navbar .brand:hover,.navbar ul .active>a{color:#ffffff;text-decoration:none;background-color:#333333;background-color:rgba(255, 255, 255, 0.05);} .navbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;font-size:20px;font-weight:200;line-height:1;color:#ffffff;} .navbar p{margin:0;line-height:40px;}.navbar p a:hover{color:#ffffff;background-color:transparent;} .navbar .btn{margin-top:5px;} diff --git a/docs/base-css.html b/docs/base-css.html index 225f10ae2d..a0c3c4cf14 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -638,7 +638,6 @@

3. Bordered table

Add borders around the entire table and between each row, plus a bit of rounded corners for aesthetic purposes.

-

Note Bordered tables do not work well with rowspan due to somewhat hacky CSS applied to the tables. Sorry about that!

@@ -1177,37 +1176,52 @@ -

Button groups

-
-
- Left - Middle - Right +
+ +
+
+

Button groups

+

Use button groups to join multiple buttons together as one composite component. Button groups can be built with not only <a> or <button> elements, but also radios and checkboxes.

+

You can also combine sets of button groups into a toolbar for more complex projects.

+

Get the javascript »

+

Heads up: CSS for button groups is in a separate file, button-groups.less.

-
-
-
-
- 1 - 2 - 3 - 4 - 5 -
-
- 6 - 7 - 8 -
-
- 9 +
+

Linked button group

+

Using the standard <a class="btn" href="#">...</a> markup, simply add all the buttons you need.

+
+
+ Left + Middle + Right +
-
- 10 +

Level up one more time by wrapping multiple instances of <div class="btn-group"> with <div class="btn-toolbar">.

+
+
+
+ 1 + 2 + 3 + 4 + 5 +
+
+ 6 + 7 + 8 +
+
+ 9 +
+
+ 10 +
+
- + diff --git a/lib/navbar.less b/lib/navbar.less index d57f316f59..7e0b17d435 100644 --- a/lib/navbar.less +++ b/lib/navbar.less @@ -20,7 +20,7 @@ // Text and links .navbar { // Hover and active states - .brand a:hover, + .brand:hover, ul .active > a { color: @white; text-decoration: none;