kotovalexarian-likes-github/twbs--bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
Code Releases Activity

tweaks and increase specificity of pills and active classes

Browse source
This commit is contained in:
Mark Otto 2011-12-10 22:21:08 -08:00
parent 4d55356e9b
commit d587845149
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bootstrap.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 Dec 9 14:39:08 PST 2011 * Date: Sat Dec 10 22:20:18 PST 2011
*/ */
html, body { html, body {
margin: 0; margin: 0;
@ -2062,7 +2062,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
.tabs li.open a.menu:after, .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 {
padding: 0 15px; padding: 0 15px;
margin: 5px 3px 5px 0; margin: 5px 3px 5px 0;
line-height: 30px; line-height: 30px;
@ -2071,13 +2071,13 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
-moz-border-radius: 15px; -moz-border-radius: 15px;
border-radius: 15px; border-radius: 15px;
} }
.pills a:hover { .pills > a:hover {
color: #ffffff; color: #ffffff;
text-decoration: none; text-decoration: none;
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25); text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25);
background-color: #00438a; background-color: #00438a;
} }
.pills .active a { .pills .active > a {
color: #ffffff; color: #ffffff;
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25); text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25);
background-color: #0069d6; background-color: #0069d6;

4
bootstrap.min.css vendored
View file

@ -274,8 +274,8 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
.tabs a.menu:after,.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 li.open.menu .menu,.tabs .open.dropdown .dropdown-toggle{border-color:#999;} .tabs li.open.menu .menu,.tabs .open.dropdown .dropdown-toggle{border-color:#999;}
.tabs li.open a.menu:after,.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{padding:0 15px;margin:5px 3px 5px 0;line-height:30px;text-shadow:0 1px 1px #ffffff;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}.pills a:hover{color:#ffffff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);background-color:#00438a;} .pills>a{padding:0 15px;margin:5px 3px 5px 0;line-height:30px;text-shadow:0 1px 1px #ffffff;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}.pills>a:hover{color:#ffffff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);background-color:#00438a;}
.pills .active a{color:#ffffff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);background-color:#0069d6;} .pills .active>a{color:#ffffff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);background-color:#0069d6;}
.pills-vertical>li{float:none;} .pills-vertical>li{float:none;}
.tab-content>.tab-pane,.pill-content>.pill-pane{display:none;} .tab-content>.tab-pane,.pill-content>.pill-pane{display:none;}
.tab-content>.active,.pill-content>.active{display:block;} .tab-content>.active,.pill-content>.active{display:block;}

2
docs/index.html
View file

@ -57,7 +57,7 @@
<p class="lead">Bootstrap is a responsive frontend toolkit from Twitter designed to kickstart web development, complete with core HTML, CSS, and JS for grids, type, forms, navigation, and many more components.</p> <p class="lead">Bootstrap is a responsive frontend toolkit from Twitter designed to kickstart web development, complete with core HTML, CSS, and JS for grids, type, forms, navigation, and many more components.</p>
<p class="download-info"> <p class="download-info">
<a href="https://github.com/twitter/bootstrap/" class="btn primary btn-large">Download on GitHub</a> <a href="https://github.com/twitter/bootstrap/" class="btn primary btn-large">Download on GitHub</a>
<a href="./scaffolding.html" class="btn btn-large">Get started</a> <a href="./scaffolding.html" class="btn btn-large">Get started &rarr;</a>
Currently v2.0.0 Currently v2.0.0
</p> </p>

4
lib/tabs-pills.less
View file

@ -182,7 +182,7 @@
// Pills // Pills
.pills { .pills {
a { > a {
padding: 0 15px; padding: 0 15px;
margin: 5px 3px 5px 0; margin: 5px 3px 5px 0;
line-height: 30px; line-height: 30px;
@ -195,7 +195,7 @@
background-color: @linkColorHover; background-color: @linkColorHover;
} }
} }
.active a { .active > a {
color: @white; color: @white;
text-shadow: 0 1px 1px rgba(0,0,0,.25); text-shadow: 0 1px 1px rgba(0,0,0,.25);
background-color: @linkColor; background-color: @linkColor;