diff --git a/bootstrap.css b/bootstrap.css index 741218e48cb5..9389781c66f3 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: Wed Oct 26 15:52:05 PDT 2011 + * Date: Sun Nov 6 19:50:14 CET 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). @@ -1598,6 +1598,9 @@ a.menu:after, .dropdown-toggle:after { display: inline-block; *display: inline; } +.btn-dropdown .dropdown-menu { + *left: 0px; +} .btn-dropdown .dropdown-toggle { padding-right: 11px; } @@ -1636,6 +1639,10 @@ a.menu:after, .dropdown-toggle:after { .btn-dropdown .large + .dropdown-menu { top: 38px; } +.btn-dropdown .small + .dropdown-menu { + top: 30px; + *top: 31px; +} .tabs, .pills { margin: 0 0 18px; padding: 0; diff --git a/bootstrap.min.css b/bootstrap.min.css index 96f7979df7a3..23501d1b52b8 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -257,7 +257,7 @@ 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;*display:inline;} +.btn-dropdown{display:inline-block;*display:inline;}.btn-dropdown .dropdown-menu{*left:0px;} .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;} @@ -265,6 +265,7 @@ a.menu:after,.dropdown-toggle:after{width:0;height:0;display:inline-block;conten .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;*top:30px;border-width:1px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} .btn-dropdown .large+.dropdown-menu{top:38px;} +.btn-dropdown .small+.dropdown-menu{top:30px;*top:31px;} .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;} .tabs>li,.pills>li{float:left;}.tabs>li>a,.pills>li>a{display:block;} diff --git a/lib/patterns.less b/lib/patterns.less index e42fd3103b22..810abf7e1285 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -326,6 +326,10 @@ a.menu:after, .btn-dropdown { display: inline-block; *display: inline; + + .dropdown-menu { + *left: 0px; + } } // Define different toggle styles (colors, borders, margin and padding) for dropdown buttons @@ -372,6 +376,12 @@ a.menu:after, top: 38px; } +// Change position for small buttons +.btn-dropdown .small + .dropdown-menu { + top: 30px; + *top: 31px; +} + // TABS AND PILLS // --------------