Permalink
Browse files

more tweaks to the buttons layout

  • Loading branch information...
1 parent bc8f63e commit 6e867e48867179b9139e5564798498d29a6f9fe4 @mdo mdo committed Oct 26, 2011
Showing with 7 additions and 3 deletions.
  1. +3 −1 bootstrap.css
  2. +2 −2 bootstrap.min.css
  3. +2 −0 lib/patterns.less
View
@@ -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: Tue Oct 25 21:02:20 PDT 2011
+ * Date: Wed Oct 26 15:52:05 PDT 2011
*/
/* Reset.less
* Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@ -1596,6 +1596,7 @@ a.menu:after, .dropdown-toggle:after {
}
.btn-dropdown {
display: inline-block;
+ *display: inline;
}
.btn-dropdown .dropdown-toggle {
padding-right: 11px;
@@ -1626,6 +1627,7 @@ a.menu:after, .dropdown-toggle:after {
}
.btn-dropdown .dropdown-menu {
top: 29px;
+ *top: 30px;
border-width: 1px;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
View
@@ -257,13 +257,13 @@ a.menu:after,.dropdown-toggle:after{width:0;height:0;display:inline-block;conten
.topbar .dropdown-menu a,.dropdown-menu a{display:block;padding:4px 15px;clear:both;font-weight:normal;line-height:18px;color:#808080;text-shadow:0 1px 0 #ffffff;}.topbar .dropdown-menu a:hover,.dropdown-menu a:hover,.topbar .dropdown-menu a.hover,.dropdown-menu a.hover{background-color:#dddddd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd));background-image:-moz-linear-gradient(top, #eeeeee, #dddddd);background-image:-ms-linear-gradient(top, #eeeeee, #dddddd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #dddddd));background-image:-webkit-linear-gradient(top, #eeeeee, #dddddd);background-image:-o-linear-gradient(top, #eeeeee, #dddddd);background-image:linear-gradient(top, #eeeeee, #dddddd);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dddddd', GradientType=0);color:#404040;text-decoration:none;-webkit-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);}
.dropdown.open{z-index:100;}.dropdown.open .dropdown-toggle{color:#ffffff;background:#ccc;background:rgba(0, 0, 0, 0.3);}
.dropdown.open .dropdown-menu{display:block;}
-.btn-dropdown{display:inline-block;}
+.btn-dropdown{display:inline-block;*display:inline;}
.btn-dropdown .dropdown-toggle{padding-right:11px;}
.btn-dropdown .dropdown-toggle:after{margin-top:6px;margin-left:6px;border-top-color:#999;filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;}
.btn-dropdown .small.dropdown-toggle:after{margin-top:4px;}
.btn-dropdown .danger.dropdown-toggle:after,.btn-dropdown .info.dropdown-toggle:after,.btn-dropdown .primary.dropdown-toggle:after,.btn-dropdown .success.dropdown-toggle:after{border-top-color:#ffffff;}
.btn-dropdown.open .dropdown-toggle{-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.25),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.25),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.25),0 1px 2px rgba(0, 0, 0, 0.05);background-position:0 -15px;}
-.btn-dropdown .dropdown-menu{top:29px;border-width:1px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.btn-dropdown .dropdown-menu{top:29px;*top:30px;border-width:1px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
.btn-dropdown .large+.dropdown-menu{top:38px;}
.tabs,.pills{margin:0 0 18px;padding:0;list-style:none;zoom:1;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";zoom:1;}
.tabs:after,.pills:after{clear:both;}
View
@@ -325,6 +325,7 @@ a.menu:after,
// Wrap the buttons in linline-block for same-line rendering
.btn-dropdown {
display: inline-block;
+ *display: inline;
}
// Define different toggle styles (colors, borders, margin and padding) for dropdown buttons
@@ -362,6 +363,7 @@ a.menu:after,
// Positioning and border adjustments
.btn-dropdown .dropdown-menu {
top: 29px;
+ *top: 30px;
border-width: 1px;
.border-radius(4px);
}

0 comments on commit 6e867e4

Please sign in to comment.