diff options
| author | Mark Otto <[email protected]> | 2013-01-11 20:40:17 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-01-11 20:40:17 -0800 |
| commit | d3b3b4c48f86be988148948eb97f0b2ef6ca41c1 (patch) | |
| tree | cd3879249c015116d518f73f5e69fc31f48d178a | |
| parent | d7c93fc647f38fb4baab9a2f95225600050dc1fe (diff) | |
| download | bootstrap-d3b3b4c48f86be988148948eb97f0b2ef6ca41c1.tar.xz bootstrap-d3b3b4c48f86be988148948eb97f0b2ef6ca41c1.zip | |
Fixes #6474: remove duplicate .btn border colors to make @btn-border work
| -rw-r--r-- | docs/assets/css/bootstrap.css | 9 | ||||
| -rw-r--r-- | less/buttons.less | 5 | ||||
| -rw-r--r-- | less/variables.less | 2 |
3 files changed, 3 insertions, 13 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 4ff2a3539..478586a14 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3169,11 +3169,11 @@ button.close { background-image: -o-linear-gradient(top, #ffffff, #e6e6e6); background-image: linear-gradient(to bottom, #ffffff, #e6e6e6); background-repeat: repeat-x; - border: 1px solid #bbbbbb; + border: 1px solid #cccccc; *border: 0; border-color: #e6e6e6 #e6e6e6 #bfbfbf; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - border-bottom-color: #a2a2a2; + border-bottom-color: #b3b3b3; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; @@ -3308,11 +3308,6 @@ input[type="button"].btn-block { color: rgba(255, 255, 255, 0.75); } -.btn { - border-color: #c5c5c5; - border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25); -} - .btn-primary { color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); diff --git a/less/buttons.less b/less/buttons.less index 6f565b73c..71865a748 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -141,11 +141,6 @@ input[type="button"] { // Set the backgrounds // ------------------------- -.btn { - // reset here as of 2.0.3 due to Recess property order - border-color: #c5c5c5; - border-color: rgba(0,0,0,.15) rgba(0,0,0,.15) rgba(0,0,0,.25); -} .btn-primary { .buttonBackground(@btnPrimaryBackground, @btnPrimaryBackgroundHighlight); } diff --git a/less/variables.less b/less/variables.less index de36074fd..31c131b1e 100644 --- a/less/variables.less +++ b/less/variables.less @@ -86,7 +86,7 @@ // ------------------------- @btnBackground: @white; @btnBackgroundHighlight: darken(@white, 10%); -@btnBorder: #bbb; +@btnBorder: #ccc; @btnPrimaryBackground: @linkColor; @btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 20%); |