diff options
author | Thomas Park <thomas@thomaspark.co> | 2015-06-16 21:40:15 -0400 |
---|---|---|
committer | Thomas Park <thomas@thomaspark.co> | 2015-06-16 21:40:15 -0400 |
commit | ea56c37ca9674f0155448699918650bbfcfbb888 (patch) | |
tree | 12b2d28dc05b533adb55e0ff344c41df36d51301 /bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_theme.scss | |
parent | 06885df3cfbb7d498f59dc5ac61a4cc1cc4f6dc2 (diff) |
update bootstrap to 3.3.5
Diffstat (limited to 'bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_theme.scss')
-rw-r--r-- | bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_theme.scss | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_theme.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_theme.scss index ed106a4f..df571ea7 100644 --- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_theme.scss +++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_theme.scss @@ -1,3 +1,8 @@ +/*! + * Bootstrap v3.3.5 (http://getbootstrap.com) + * Copyright 2011-2015 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + */ // // Load core variables and mixins @@ -28,6 +33,12 @@ @include box-shadow(inset 0 3px 5px rgba(0,0,0,.125)); } + &.disabled, + &[disabled], + fieldset[disabled] & { + @include box-shadow(none); + } + .badge { text-shadow: none; } @@ -53,10 +64,17 @@ } &.disabled, - &:disabled, - &[disabled] { - background-color: darken($btn-color, 12%); - background-image: none; + &[disabled], + fieldset[disabled] & { + &, + &:hover, + &:focus, + &.focus, + &:active, + &.active { + background-color: darken($btn-color, 12%); + background-image: none; + } } } @@ -132,7 +150,7 @@ .navbar-inverse { @include gradient-vertical($start-color: lighten($navbar-inverse-bg, 10%), $end-color: $navbar-inverse-bg); @include reset-filter; // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered; see https://github.com/twbs/bootstrap/issues/10257 - + border-radius: $navbar-border-radius; .navbar-nav > .open > a, .navbar-nav > .active > a { @include gradient-vertical($start-color: $navbar-inverse-link-active-bg, $end-color: lighten($navbar-inverse-link-active-bg, 2.5%)); |