Skip to content

Commit

Permalink
fix tabs jitter bug when there is no active class
Browse files Browse the repository at this point in the history
  • Loading branch information
mdo committed Sep 16, 2011
1 parent c579e4d commit e663cfb
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 17 deletions.
15 changes: 8 additions & 7 deletions bootstrap.css
Original file line number Diff line number Diff line change
Expand Up @@ -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: Fri Sep 16 09:47:29 PDT 2011
* Date: Fri Sep 16 10:13:51 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).
Expand Down Expand Up @@ -1591,22 +1591,23 @@ a.menu:after, .dropdown-toggle:after {
.tabs > li > a {
margin-right: 2px;
padding: 0 15px;
line-height: 35px;
line-height: 36px;
border: 1px solid transparent;
-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;
background-color: #eee;
border-color: #eee #eee #ddd;
}
.tabs > li.active > a {
background-color: #ffffff;
padding: 0 14px;
border: 1px solid #ddd;
border-bottom: 0;
color: #808080;
background-color: #ffffff;
border: 1px solid #ddd;
border-bottom-color: transparent;
}
.tabs .menu-dropdown, .tabs .dropdown-menu {
top: 35px;
Expand Down
4 changes: 2 additions & 2 deletions bootstrap.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -1367,7 +1367,7 @@ <h2>Tabs and pills</h2>
</div>
<div class="span12">
<ul class="tabs">
<li class="active"><a href="#">Home</a></li>
<li class=""><a href="#">Home</a></li>
<li><a href="#">Profile</a></li>
<li><a href="#">Messages</a></li>
<li><a href="#">Settings</a></li>
Expand Down
14 changes: 7 additions & 7 deletions lib/patterns.less
Original file line number Diff line number Diff line change
Expand Up @@ -342,22 +342,22 @@ a.menu:after,
position: relative; // For the dropdowns mostly
top: 1px;
> a {
margin-right: 2px;
padding: 0 15px;
line-height: (@baseline * 2) - 1;
margin-right: 2px;
line-height: @baseline * 2;
border: 1px solid transparent;
.border-radius(4px 4px 0 0);
&:hover {
background-color: #eee;
border-bottom: 1px solid #ddd;
text-decoration: none;
background-color: #eee;
border-color: #eee #eee #ddd;
}
}
&.active > a {
color: @gray;
background-color: @white;
padding: 0 14px;
border: 1px solid #ddd;
border-bottom: 0;
color: @gray;
border-bottom-color: transparent;
}
}
// first one for backwards compatibility
Expand Down

0 comments on commit e663cfb

Please sign in to comment.