aboutsummaryrefslogtreecommitdiff
path: root/bootstrap.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-01-07 23:21:40 -0800
committerMark Otto <[email protected]>2012-01-07 23:21:40 -0800
commitd170224457581b6ab7305b29b4e2a15cb50ab853 (patch)
tree662b029a1c09d89dbb97f042568deac022d35d4a /bootstrap.css
parent961c479422f10cb566ade1f3a08d1b807d590b7a (diff)
downloadbootstrap-d170224457581b6ab7305b29b4e2a15cb50ab853.tar.xz
bootstrap-d170224457581b6ab7305b29b4e2a15cb50ab853.zip
fix progress bars by removing border and negative margins
Diffstat (limited to 'bootstrap.css')
-rw-r--r--bootstrap.css108
1 files changed, 9 insertions, 99 deletions
diff --git a/bootstrap.css b/bootstrap.css
index ebb3cbe29..6417871fb 100644
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -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: Sat Jan 7 22:06:30 PST 2012
+ * Date: Sat Jan 7 23:21:05 PST 2012
*/
html, body {
margin: 0;
@@ -1962,6 +1962,12 @@ i {
.tabs-below .tabs, .tabs-right .tabs, .tabs-left .tabs {
border-bottom: 0;
}
+.tab-content > .tab-pane, .pill-content > .pill-pane {
+ display: none;
+}
+.tab-content > .active, .pill-content > .active {
+ display: block;
+}
.tabs-below .tabs {
border-top: 1px solid #ddd;
}
@@ -2023,91 +2029,6 @@ i {
.tabs-right .tabs .active > a, .tabs-right .tabs .active > a:hover {
border-color: #ddd #ddd #ddd transparent;
}
-/*
-.tabbable {
-
- // Tabs on left and right
- &.tabs-left,
- &.tabs-right {
- .clearfix();
- .tabs {
- // Give a fixed width to avoid floating .tab-con
- width: 100px;
- // Unfloat them so they stack
- > li {
- float: none;
- margin-bottom: -1px;
- > a {
- margin-bottom: 2px;
- &:hover {
- border-color: transparent;
- }
- }
- }
- }
- }
-
- // Tabs on left
- &.tabs-left {
- .tab-content {
- margin-left: 100px;
- }
- .tabs {
- float: left;
- > li {
- margin-right: -1px;
- > a {
- margin-right: 0;
- .border-radius(4px 0 0 4px);
-
- &:hover {
- border-right-color: #ddd;
- }
- }
- }
- // Active state
- .active > a,
- .active > a:hover {
- border-color: #ddd;
- border-right-color: transparent;
- }
- }
- }
-
- // Tabs on right
- &.tabs-right {
- .tab-content {
- margin-right: 100px;
- }
- .tabs {
- float: right;
- > li {
- margin-left: -1px;
- > a {
- margin-left: 0;
- .border-radius(0 4px 4px 0);
-
- &:hover {
- border-left-color: #ddd;
- }
- }
- }
- // Active state
- .active > a,
- .active > a:hover {
- border-color: #ddd;
- border-left-color: transparent;
- }
- }
- }
-}
-*/
-.tab-content > .tab-pane, .pill-content > .pill-pane {
- display: none;
-}
-.tab-content > .active, .pill-content > .active {
- display: block;
-}
.breadcrumb {
padding: 7px 14px;
margin: 0 0 18px;
@@ -2963,25 +2884,14 @@ a.thumbnail:hover {
background-image: linear-gradient(top, #f5f5f5, #f9f9f9);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0);
- border: 1px solid #ddd;
-webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
}
.progress .bar {
width: 0%;
- height: 20px;
- margin: -1px;
- background-color: #57a957;
- background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957));
- background-image: -moz-linear-gradient(top, #62c462, #57a957);
- background-image: -ms-linear-gradient(top, #62c462, #57a957);
- background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957));
- background-image: -webkit-linear-gradient(top, #62c462, #57a957);
- background-image: -o-linear-gradient(top, #62c462, #57a957);
- background-image: linear-gradient(top, #62c462, #57a957);
- background-repeat: repeat-x;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);
+ height: 18px;
+ margin: ;
background-color: #0480be;
background-image: -khtml-gradient(linear, left top, left bottom, from(#149bdf), to(#0480be));
background-image: -moz-linear-gradient(top, #149bdf, #0480be);