diff options
-rw-r--r-- | assets/stylesheets/_bootstrap.scss | 6 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/_button-groups.scss | 4 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/_buttons.scss | 8 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/_carousel.scss | 2 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/_forms.scss | 6 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/_jumbotron.scss | 6 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/_list-group.scss | 12 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/_pagination.scss | 4 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/_theme.scss | 7 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/_variables.scss | 7 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/mixins/_list-group.scss | 5 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/mixins/_pagination.scss | 3 | ||||
-rw-r--r-- | lib/bootstrap-sass/version.rb | 2 | ||||
-rw-r--r-- | templates/project/_bootstrap-variables.sass | 7 |
14 files changed, 57 insertions, 22 deletions
diff --git a/assets/stylesheets/_bootstrap.scss b/assets/stylesheets/_bootstrap.scss index 65204aa..89e128e 100644 --- a/assets/stylesheets/_bootstrap.scss +++ b/assets/stylesheets/_bootstrap.scss @@ -1,3 +1,9 @@ +/*! + * Bootstrap v3.3.4 (http://getbootstrap.com) + * Copyright 2011-2015 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + */ + // Core variables and mixins @import "bootstrap/variables"; @import "bootstrap/mixins"; diff --git a/assets/stylesheets/bootstrap/_button-groups.scss b/assets/stylesheets/bootstrap/_button-groups.scss index 731fe29..43d235c 100644 --- a/assets/stylesheets/bootstrap/_button-groups.scss +++ b/assets/stylesheets/bootstrap/_button-groups.scss @@ -173,11 +173,11 @@ border-radius: 0; } &:first-child:not(:last-child) { - border-top-right-radius: $border-radius-base; + border-top-right-radius: $btn-border-radius-base; @include border-bottom-radius(0); } &:last-child:not(:first-child) { - border-bottom-left-radius: $border-radius-base; + border-bottom-left-radius: $btn-border-radius-base; @include border-top-radius(0); } } diff --git a/assets/stylesheets/bootstrap/_buttons.scss b/assets/stylesheets/bootstrap/_buttons.scss index 9320f06..6452b70 100644 --- a/assets/stylesheets/bootstrap/_buttons.scss +++ b/assets/stylesheets/bootstrap/_buttons.scss @@ -17,7 +17,7 @@ background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214 border: 1px solid transparent; white-space: nowrap; - @include button-size($padding-base-vertical, $padding-base-horizontal, $font-size-base, $line-height-base, $border-radius-base); + @include button-size($padding-base-vertical, $padding-base-horizontal, $font-size-base, $line-height-base, $btn-border-radius-base); @include user-select(none); &, @@ -134,14 +134,14 @@ a.btn { .btn-lg { // line-height: ensure even-numbered height of button next to large input - @include button-size($padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $border-radius-large); + @include button-size($padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $btn-border-radius-large); } .btn-sm { // line-height: ensure proper height of button next to small input - @include button-size($padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $border-radius-small); + @include button-size($padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $btn-border-radius-small); } .btn-xs { - @include button-size($padding-xs-vertical, $padding-xs-horizontal, $font-size-small, $line-height-small, $border-radius-small); + @include button-size($padding-xs-vertical, $padding-xs-horizontal, $font-size-small, $line-height-small, $btn-border-radius-small); } diff --git a/assets/stylesheets/bootstrap/_carousel.scss b/assets/stylesheets/bootstrap/_carousel.scss index 24f348c..f700678 100644 --- a/assets/stylesheets/bootstrap/_carousel.scss +++ b/assets/stylesheets/bootstrap/_carousel.scss @@ -130,6 +130,7 @@ .glyphicon-chevron-right { position: absolute; top: 50%; + margin-top: -10px; z-index: 5; display: inline-block; } @@ -147,7 +148,6 @@ .icon-next { width: 20px; height: 20px; - margin-top: -10px; line-height: 1; font-family: serif; } diff --git a/assets/stylesheets/bootstrap/_forms.scss b/assets/stylesheets/bootstrap/_forms.scss index a54b033..de4befd 100644 --- a/assets/stylesheets/bootstrap/_forms.scss +++ b/assets/stylesheets/bootstrap/_forms.scss @@ -176,13 +176,17 @@ input[type="search"] { // text within the input to become vertically misaligned. As a workaround, we // set a pixel line-height that matches the given height of the input, but only // for Safari. See https://bugs.webkit.org/show_bug.cgi?id=139848 +// +// Note that as of 8.3, iOS doesn't support `datetime` or `week`. @media screen and (-webkit-min-device-pixel-ratio: 0) { input[type="date"], input[type="time"], input[type="datetime-local"], input[type="month"] { - line-height: $input-height-base; + &.form-control { + line-height: $input-height-base; + } &.input-sm, .input-group-sm & { diff --git a/assets/stylesheets/bootstrap/_jumbotron.scss b/assets/stylesheets/bootstrap/_jumbotron.scss index e03203f..439d23d 100644 --- a/assets/stylesheets/bootstrap/_jumbotron.scss +++ b/assets/stylesheets/bootstrap/_jumbotron.scss @@ -4,7 +4,8 @@ .jumbotron { - padding: $jumbotron-padding ($jumbotron-padding / 2); + padding-top: $jumbotron-padding; + padding-bottom: $jumbotron-padding; margin-bottom: $jumbotron-padding; color: $jumbotron-color; background-color: $jumbotron-bg; @@ -34,7 +35,8 @@ } @media screen and (min-width: $screen-sm-min) { - padding: ($jumbotron-padding * 1.6) 0; + padding-top: ($jumbotron-padding * 1.6); + padding-bottom: ($jumbotron-padding * 1.6); .container &, .container-fluid & { diff --git a/assets/stylesheets/bootstrap/_list-group.scss b/assets/stylesheets/bootstrap/_list-group.scss index 26b23ff..7cb83aa 100644 --- a/assets/stylesheets/bootstrap/_list-group.scss +++ b/assets/stylesheets/bootstrap/_list-group.scss @@ -38,12 +38,13 @@ } -// Linked list items +// Interactive list items // -// Use anchor elements instead of `li`s or `div`s to create linked list items. +// Use anchor or button elements instead of `li`s or `div`s to create interactive items. // Includes an extra `.active` modifier class for showing selected items. -a.list-group-item { +a.list-group-item, +button.list-group-item { color: $list-group-link-color; .list-group-item-heading { @@ -59,6 +60,11 @@ a.list-group-item { } } +button.list-group-item { + width: 100%; + text-align: left; +} + .list-group-item { // Disabled state &.disabled, diff --git a/assets/stylesheets/bootstrap/_pagination.scss b/assets/stylesheets/bootstrap/_pagination.scss index 261a8da..fb23f91 100644 --- a/assets/stylesheets/bootstrap/_pagination.scss +++ b/assets/stylesheets/bootstrap/_pagination.scss @@ -80,10 +80,10 @@ // Large .pagination-lg { - @include pagination-size($padding-large-vertical, $padding-large-horizontal, $font-size-large, $border-radius-large); + @include pagination-size($padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $border-radius-large); } // Small .pagination-sm { - @include pagination-size($padding-small-vertical, $padding-small-horizontal, $font-size-small, $border-radius-small); + @include pagination-size($padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $border-radius-small); } diff --git a/assets/stylesheets/bootstrap/_theme.scss b/assets/stylesheets/bootstrap/_theme.scss index f6a95af..9903994 100644 --- a/assets/stylesheets/bootstrap/_theme.scss +++ b/assets/stylesheets/bootstrap/_theme.scss @@ -1,3 +1,8 @@ +/*! + * Bootstrap v3.3.4 (http://getbootstrap.com) + * Copyright 2011-2015 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + */ // // Load core variables and mixins @@ -145,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%)); diff --git a/assets/stylesheets/bootstrap/_variables.scss b/assets/stylesheets/bootstrap/_variables.scss index 1aaf2de..bf9373b 100644 --- a/assets/stylesheets/bootstrap/_variables.scss +++ b/assets/stylesheets/bootstrap/_variables.scss @@ -175,6 +175,11 @@ $btn-danger-border: darken($btn-danger-bg, 5%) !default; $btn-link-disabled-color: $gray-light !default; +// Allows for customizing button radius independently from global border radius +$btn-border-radius-base: $border-radius-base !default; +$btn-border-radius-large: $border-radius-large !default; +$btn-border-radius-small: $border-radius-small !default; + //== Forms // @@ -388,7 +393,7 @@ $navbar-default-toggle-icon-bar-bg: #888 !default; $navbar-default-toggle-border-color: #ddd !default; -// Inverted navbar +//=== Inverted navbar // Reset inverted navbar basics $navbar-inverse-color: lighten($gray-light, 15%) !default; $navbar-inverse-bg: #222 !default; diff --git a/assets/stylesheets/bootstrap/mixins/_list-group.scss b/assets/stylesheets/bootstrap/mixins/_list-group.scss index 5f05e7b..c478eeb 100644 --- a/assets/stylesheets/bootstrap/mixins/_list-group.scss +++ b/assets/stylesheets/bootstrap/mixins/_list-group.scss @@ -5,10 +5,11 @@ color: $color; background-color: $background; - // [converter] extracted a& to a.list-group-item-#{$state} + // [converter] extracted a&, button& to a.list-group-item-#{$state}, button.list-group-item-#{$state} } - a.list-group-item-#{$state} { + a.list-group-item-#{$state}, + button.list-group-item-#{$state} { color: $color; .list-group-item-heading { diff --git a/assets/stylesheets/bootstrap/mixins/_pagination.scss b/assets/stylesheets/bootstrap/mixins/_pagination.scss index 43fff68..d4a5404 100644 --- a/assets/stylesheets/bootstrap/mixins/_pagination.scss +++ b/assets/stylesheets/bootstrap/mixins/_pagination.scss @@ -1,11 +1,12 @@ // Pagination -@mixin pagination-size($padding-vertical, $padding-horizontal, $font-size, $border-radius) { +@mixin pagination-size($padding-vertical, $padding-horizontal, $font-size, $line-height, $border-radius) { > li { > a, > span { padding: $padding-vertical $padding-horizontal; font-size: $font-size; + line-height: $line-height; } &:first-child { > a, diff --git a/lib/bootstrap-sass/version.rb b/lib/bootstrap-sass/version.rb index 9d40750..4707aba 100644 --- a/lib/bootstrap-sass/version.rb +++ b/lib/bootstrap-sass/version.rb @@ -1,4 +1,4 @@ module Bootstrap VERSION = '3.3.4.1' - BOOTSTRAP_SHA = '2aa102bfd40859d15790febed1939e0111a6fb1a' + BOOTSTRAP_SHA = '3487898a6af8c1d5b12f7b040d30e71b19e34923' end diff --git a/templates/project/_bootstrap-variables.sass b/templates/project/_bootstrap-variables.sass index 41654b7..ab99303 100644 --- a/templates/project/_bootstrap-variables.sass +++ b/templates/project/_bootstrap-variables.sass @@ -176,6 +176,11 @@ // $btn-link-disabled-color: $gray-light +// Allows for customizing button radius independently from global border radius +// $btn-border-radius-base: $border-radius-base +// $btn-border-radius-large: $border-radius-large +// $btn-border-radius-small: $border-radius-small + //== Forms // @@ -389,7 +394,7 @@ // $navbar-default-toggle-border-color: #ddd -// Inverted navbar +//=== Inverted navbar // Reset inverted navbar basics // $navbar-inverse-color: lighten($gray-light, 15%) // $navbar-inverse-bg: #222 |