From 74982cf101a8ca8e15c04e4f873d6b56e02c6c7c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 18 Jun 2014 22:23:25 -0700 Subject: grunt --- dist/css/bootstrap-theme.css | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'dist/css/bootstrap-theme.css') diff --git a/dist/css/bootstrap-theme.css b/dist/css/bootstrap-theme.css index e9d9a17eb..17e8a77d8 100644 --- a/dist/css/bootstrap-theme.css +++ b/dist/css/bootstrap-theme.css @@ -55,6 +55,11 @@ background-color: #e0e0e0; border-color: #dbdbdb; } +.btn-default:disabled, +.btn-default[disabled] { + background-color: #e0e0e0; + background-image: none; +} .btn-primary { background-image: -webkit-linear-gradient(top, #428bca 0%, #2d6ca2 100%); background-image: -o-linear-gradient(top, #428bca 0%, #2d6ca2 100%); @@ -75,6 +80,11 @@ background-color: #2d6ca2; border-color: #2b669a; } +.btn-primary:disabled, +.btn-primary[disabled] { + background-color: #2d6ca2; + background-image: none; +} .btn-success { background-image: -webkit-linear-gradient(top, #5cb85c 0%, #419641 100%); background-image: -o-linear-gradient(top, #5cb85c 0%, #419641 100%); @@ -95,6 +105,11 @@ background-color: #419641; border-color: #3e8f3e; } +.btn-success:disabled, +.btn-success[disabled] { + background-color: #419641; + background-image: none; +} .btn-info { background-image: -webkit-linear-gradient(top, #5bc0de 0%, #2aabd2 100%); background-image: -o-linear-gradient(top, #5bc0de 0%, #2aabd2 100%); @@ -115,6 +130,11 @@ background-color: #2aabd2; border-color: #28a4c9; } +.btn-info:disabled, +.btn-info[disabled] { + background-color: #2aabd2; + background-image: none; +} .btn-warning { background-image: -webkit-linear-gradient(top, #f0ad4e 0%, #eb9316 100%); background-image: -o-linear-gradient(top, #f0ad4e 0%, #eb9316 100%); @@ -135,6 +155,11 @@ background-color: #eb9316; border-color: #e38d13; } +.btn-warning:disabled, +.btn-warning[disabled] { + background-color: #eb9316; + background-image: none; +} .btn-danger { background-image: -webkit-linear-gradient(top, #d9534f 0%, #c12e2a 100%); background-image: -o-linear-gradient(top, #d9534f 0%, #c12e2a 100%); @@ -155,6 +180,11 @@ background-color: #c12e2a; border-color: #b92c28; } +.btn-danger:disabled, +.btn-danger[disabled] { + background-color: #c12e2a; + background-image: none; +} .thumbnail, .img-thumbnail { -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .075); -- cgit v1.2.3 From 8bd4163ad463a0f208a55a8f64ba7fc6cb826282 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 19 Jun 2014 18:14:56 -0700 Subject: fixes #13881: restore existing striped progress bar behavior with theme styles --- dist/css/bootstrap-theme.css | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'dist/css/bootstrap-theme.css') diff --git a/dist/css/bootstrap-theme.css b/dist/css/bootstrap-theme.css index 17e8a77d8..7fe3b366d 100644 --- a/dist/css/bootstrap-theme.css +++ b/dist/css/bootstrap-theme.css @@ -354,6 +354,11 @@ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0); background-repeat: repeat-x; } +.progress-bar-striped { + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); +} .list-group { border-radius: 4px; -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .075); -- cgit v1.2.3 From ff6b279b3cd37e7e4e6bd93535afd016f6957afc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 26 Jun 2014 09:13:24 -0700 Subject: bump to v3.2.0 --- dist/css/bootstrap-theme.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dist/css/bootstrap-theme.css') diff --git a/dist/css/bootstrap-theme.css b/dist/css/bootstrap-theme.css index 7fe3b366d..f860bbc06 100644 --- a/dist/css/bootstrap-theme.css +++ b/dist/css/bootstrap-theme.css @@ -1,5 +1,5 @@ /*! - * Bootstrap v3.1.1 (http://getbootstrap.com) + * Bootstrap v3.2.0 (http://getbootstrap.com) * Copyright 2011-2014 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ -- cgit v1.2.3