app/assets/stylesheets/twitter/bootstrap/_theme.scss in bootstrap-sass-rails-3.0.0.3 vs app/assets/stylesheets/twitter/bootstrap/_theme.scss in bootstrap-sass-rails-3.0.1.0

- old
+ new

@@ -30,17 +30,25 @@ } } // Mixin for generating new styles @mixin btn-styles($btn-color: #555) { - @include gradient-vertical($start-color: $btn-color, $end-color: darken($btn-color, 10%)); - border-color: darken($btn-color, 12%); + @include gradient-vertical($start-color: $btn-color, $end-color: darken($btn-color, 12%)); + @include reset-filter(); // Disable gradients for IE9 because filter bleeds through rounded corners + background-repeat: repeat-x; + border-color: darken($btn-color, 14%); + &:hover, + &:focus { + background-color: darken($btn-color, 12%); + background-position: 0 -15px; + } + &:active, &.active { - background-color: darken($btn-color, 10%); - border-color: darken($btn-color, 12%); + background-color: darken($btn-color, 12%); + border-color: darken($btn-color, 14%); } } // Common styles .btn { @@ -75,45 +83,52 @@ // // Dropdowns // -------------------------------------------------- .dropdown-menu > li > a:hover, -.dropdown-menu > li > a:focus, +.dropdown-menu > li > a:focus { + @include gradient-vertical($start-color: $dropdown-link-hover-bg, $end-color: darken($dropdown-link-hover-bg, 5%)); + background-color: darken($dropdown-link-hover-bg, 5%); +} .dropdown-menu > .active > a, .dropdown-menu > .active > a:hover, .dropdown-menu > .active > a:focus { - @include gradient-vertical($start-color: $dropdown-link-hover-bg, $end-color: darken($dropdown-link-hover-bg, 5%)); - background-color: darken($dropdown-link-hover-bg, 5%); + @include gradient-vertical($start-color: $dropdown-link-active-bg, $end-color: darken($dropdown-link-active-bg, 5%)); + background-color: darken($dropdown-link-active-bg, 5%); } // // Navbar // -------------------------------------------------- -// Basic navbar -.navbar { +// Default navbar +.navbar-default { @include gradient-vertical($start-color: lighten($navbar-default-bg, 10%), $end-color: $navbar-default-bg); + @include reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered border-radius: $navbar-border-radius; $shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 5px rgba(0,0,0,.075); @include box-shadow($shadow); .navbar-nav > .active > a { - background-color: $navbar-default-bg; + @include gradient-vertical($start-color: darken($navbar-default-bg, 5%), $end-color: darken($navbar-default-bg, 2%)); + @include box-shadow(inset 0 3px 9px rgba(0,0,0,.075)); } } .navbar-brand, .navbar-nav > li > a { text-shadow: 0 1px 0 rgba(255,255,255,.25); } // Inverted navbar .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 .navbar-nav > .active > a { - background-color: $navbar-inverse-bg; + @include gradient-vertical($start-color: $navbar-inverse-bg, $end-color: lighten($navbar-inverse-bg, 2.5%)); + @include box-shadow(inset 0 3px 9px rgba(0,0,0,.25)); } .navbar-brand, .navbar-nav > li > a { text-shadow: 0 -1px 0 rgba(0,0,0,.25);