rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-03-15 15:29:22 +01:00
Code Issues Actions Packages Releases Activity

add old dropdown support to tabs dropdowns

Browse Source
This commit is contained in:
Mark Otto 2011-09-02 01:03:16 -07:00
parent 411e324340
commit db830140ee
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bootstrap-1.2.0.css vendored
View File

@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Fri Sep 2 00:57:14 PDT 2011 * Date: Fri Sep 2 01:03:07 PDT 2011
*/ */
/* Reset.less /* 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). * 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).
@ -1449,19 +1449,19 @@ a.menu:after, .dropdown-toggle:after {
border-bottom: 0; border-bottom: 0;
color: #808080; color: #808080;
} }
.tabs .dropdown-menu { .tabs .menu-dropdown, .tabs .dropdown-menu {
top: 35px; top: 35px;
border-width: 1px; border-width: 1px;
-webkit-border-radius: 0 6px 6px 6px; -webkit-border-radius: 0 6px 6px 6px;
-moz-border-radius: 0 6px 6px 6px; -moz-border-radius: 0 6px 6px 6px;
border-radius: 0 6px 6px 6px; border-radius: 0 6px 6px 6px;
} }
.tabs .dropdown-toggle:after { .tabs a.menu:after, .tabs .dropdown-toggle:after {
border-top-color: #999; border-top-color: #999;
margin-top: 15px; margin-top: 15px;
margin-left: 5px; margin-left: 5px;
} }
.tabs .dropdown.open .dropdown-toggle:after { .tabs li.open a.menu:after, .tabs .dropdown.open .dropdown-toggle:after {
border-top-color: #555; border-top-color: #555;
} }
.pills a { .pills a {

6
bootstrap-1.2.0.min.css vendored
View File

@ -205,9 +205,9 @@ a.menu:after,.dropdown-toggle:after{width:0;height:0;display:inline-block;conten
.tabs>li,.pills>li{float:left;}.tabs>li>a,.pills>li>a{display:block;} .tabs>li,.pills>li{float:left;}.tabs>li>a,.pills>li>a{display:block;}
.tabs{width:100%;border-bottom:1px solid #ddd;}.tabs>li{position:relative;top:1px;}.tabs>li>a{margin-right:2px;padding:0 15px;line-height:35px;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.tabs>li>a:hover{background-color:#eee;border-bottom:1px solid #ddd;text-decoration:none;} .tabs{width:100%;border-bottom:1px solid #ddd;}.tabs>li{position:relative;top:1px;}.tabs>li>a{margin-right:2px;padding:0 15px;line-height:35px;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.tabs>li>a:hover{background-color:#eee;border-bottom:1px solid #ddd;text-decoration:none;}
.tabs>li.active>a{background-color:#fff;padding:0 14px;border:1px solid #ddd;border-bottom:0;color:#808080;} .tabs>li.active>a{background-color:#fff;padding:0 14px;border:1px solid #ddd;border-bottom:0;color:#808080;}
.tabs .dropdown-menu{top:35px;border-width:1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px;} .tabs .menu-dropdown,.tabs .dropdown-menu{top:35px;border-width:1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px;}
.tabs .dropdown-toggle:after{border-top-color:#999;margin-top:15px;margin-left:5px;} .tabs a.menu:after,.tabs .dropdown-toggle:after{border-top-color:#999;margin-top:15px;margin-left:5px;}
.tabs .dropdown.open .dropdown-toggle:after{border-top-color:#555;} .tabs li.open a.menu:after,.tabs .dropdown.open .dropdown-toggle:after{border-top-color:#555;}
.pills a{margin:5px 3px 5px 0;padding:0 15px;text-shadow:0 1px 1px #fff;line-height:30px;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}.pills a:hover{background:#0050a3;color:#fff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);} .pills a{margin:5px 3px 5px 0;padding:0 15px;text-shadow:0 1px 1px #fff;line-height:30px;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}.pills a:hover{background:#0050a3;color:#fff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);}
.pills .active a{background:#0069d6;color:#fff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);} .pills .active a{background:#0069d6;color:#fff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);}
.hero-unit{background-color:#f5f5f5;margin-top:60px;margin-bottom:30px;padding:60px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;} .hero-unit{background-color:#f5f5f5;margin-top:60px;margin-bottom:30px;padding:60px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;}

6
lib/patterns.less
View File

@ -337,16 +337,22 @@ a.menu:after,
color: @gray; color: @gray;
} }
} }
// first one for backwards compatibility
.menu-dropdown,
.dropdown-menu { .dropdown-menu {
top: 35px; top: 35px;
border-width: 1px; border-width: 1px;
.border-radius(0 6px 6px 6px); .border-radius(0 6px 6px 6px);
} }
// first one for backwards compatibility
a.menu:after,
.dropdown-toggle:after { .dropdown-toggle:after {
border-top-color: #999; border-top-color: #999;
margin-top: 15px; margin-top: 15px;
margin-left: 5px; margin-left: 5px;
} }
// first one for backwards compatibility
li.open a.menu:after,
.dropdown.open .dropdown-toggle:after { .dropdown.open .dropdown-toggle:after {
border-top-color: #555; border-top-color: #555;
} }