Skip to content

Commit

Permalink
cleanup tabs and pills to prep css for new stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
mdo committed Oct 10, 2011
1 parent 770e764 commit 1b19799
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 21 deletions.
16 changes: 8 additions & 8 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: Sun Oct 9 22:44:29 PDT 2011
* Date: Sun Oct 9 23:02:24 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 @@ -1686,28 +1686,28 @@ a.menu:after, .dropdown-toggle:after {
.tabs li.open a.menu:after, .tabs .dropdown.open .dropdown-toggle:after {
border-top-color: #555;
}
.tab-content {
clear: both;
}
.pills a {
margin: 5px 3px 5px 0;
padding: 0 15px;
text-shadow: 0 1px 1px #ffffff;
line-height: 30px;
text-shadow: 0 1px 1px #ffffff;
-webkit-border-radius: 15px;
-moz-border-radius: 15px;
border-radius: 15px;
}
.pills a:hover {
background: #00438a;
color: #ffffff;
text-decoration: none;
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25);
background-color: #00438a;
}
.pills .active a {
background: #0069d6;
color: #ffffff;
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25);
background-color: #0069d6;
}
.tab-content, .pill-content {
clear: both;
}
.tab-content > *, .pill-content > * {
display: none;
Expand All @@ -1716,8 +1716,8 @@ a.menu:after, .dropdown-toggle:after {
display: block;
}
.breadcrumb {
margin: 0 0 18px;
padding: 7px 14px;
margin: 0 0 18px;
background-color: #f5f5f5;
background-repeat: repeat-x;
background-image: -khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5));
Expand Down
8 changes: 4 additions & 4 deletions bootstrap.min.css

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

22 changes: 13 additions & 9 deletions lib/patterns.less
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,9 @@ a.menu:after,
border-bottom-color: transparent;
}
}
}
// Dropdowns in tabs
.tabs {
// first one for backwards compatibility
.menu-dropdown,
.dropdown-menu {
Expand All @@ -387,37 +390,38 @@ a.menu:after,
border-top-color: #555;
}
}
.tab-content {
clear: both;
}

// Basic pill nav
.pills {
a {
margin: 5px 3px 5px 0;
margin: 5px 3px 5px 0;
padding: 0 15px;
text-shadow: 0 1px 1px @white;
line-height: 30px;
text-shadow: 0 1px 1px @white;
.border-radius(15px);
&:hover {
background: @linkColorHover;
color: @white;
text-decoration: none;
text-shadow: 0 1px 1px rgba(0,0,0,.25);
background-color: @linkColorHover;
}
}
.active a {
background: @linkColor;
color: @white;
text-shadow: 0 1px 1px rgba(0,0,0,.25);
background-color: @linkColor;
}
}

// For js-enabled tabbed areas
.tab-content,
.pill-content {
clear: both;
}
.tab-content > *,
.pill-content > * {
display: none;
}

.tab-content > .active,
.pill-content > .active {
display:block;
Expand All @@ -428,8 +432,8 @@ a.menu:after,
// -----------

.breadcrumb {
margin: 0 0 @baseline;
padding: 7px 14px;
margin: 0 0 @baseline;
#gradient > .vertical(#ffffff, #f5f5f5);
border: 1px solid #ddd;
.border-radius(3px);
Expand Down

0 comments on commit 1b19799

Please sign in to comment.