aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2011-10-09 23:02:34 -0700
committerMark Otto <[email protected]>2011-10-09 23:02:34 -0700
commit1b19799d700b56f693fdeaf826edaea7cd030b98 (patch)
tree3430cc09fae4b41cfe1911406d3c1b726ad1b275 /lib
parent770e7647d1372974a7e89d53259ce6b3a6ba8f68 (diff)
downloadbootstrap-1b19799d700b56f693fdeaf826edaea7cd030b98.tar.xz
bootstrap-1b19799d700b56f693fdeaf826edaea7cd030b98.zip
cleanup tabs and pills to prep css for new stuff
Diffstat (limited to 'lib')
-rw-r--r--lib/patterns.less22
1 files changed, 13 insertions, 9 deletions
diff --git a/lib/patterns.less b/lib/patterns.less
index bd22b07b2..e35087d03 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -362,6 +362,9 @@ a.menu:after,
border-bottom-color: transparent;
}
}
+}
+// Dropdowns in tabs
+.tabs {
// first one for backwards compatibility
.menu-dropdown,
.dropdown-menu {
@@ -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;
@@ -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);