diff options
| author | Gleb Mazovetskiy <glex.spb@gmail.com> | 2015-09-02 04:25:02 +0300 |
|---|---|---|
| committer | Gleb Mazovetskiy <glex.spb@gmail.com> | 2015-09-02 04:25:02 +0300 |
| commit | f82b8c81427629968d9d131892189b5adb23f8f1 (patch) | |
| tree | 45665fc3252e2c6aec4219220dbc05f2b3593b28 | |
| parent | e55131680cb1ffd4c007fcbf92d9a4b7d679b926 (diff) | |
rake update[v4-dev]
| -rw-r--r-- | assets/stylesheets/bootstrap/_variables.scss | 3 | ||||
| -rw-r--r-- | lib/bootstrap/version.rb | 2 | ||||
| -rw-r--r-- | templates/project/_bootstrap-variables.scss | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/assets/stylesheets/bootstrap/_variables.scss b/assets/stylesheets/bootstrap/_variables.scss index e4b6387..cfaf954 100644 --- a/assets/stylesheets/bootstrap/_variables.scss +++ b/assets/stylesheets/bootstrap/_variables.scss @@ -451,8 +451,7 @@ $card-border-width: .0625rem !default; $card-border-radius: .25rem !default; $card-border-color: #e5e5e5 !default; $card-border-radius-inner: ($card-border-radius - $card-border-width) !default; - -$card-cap-bg: #f5f5f5; +$card-cap-bg: #f5f5f5 !default; // Tooltips diff --git a/lib/bootstrap/version.rb b/lib/bootstrap/version.rb index b5633dc..3d93e35 100644 --- a/lib/bootstrap/version.rb +++ b/lib/bootstrap/version.rb @@ -1,4 +1,4 @@ module Bootstrap VERSION = '4.0.0.dev' - BOOTSTRAP_SHA = '8941bdfbda237bed621935cac439520eddc79150' + BOOTSTRAP_SHA = 'd258559f11efb71029454c85cef209cbdc97e929' end diff --git a/templates/project/_bootstrap-variables.scss b/templates/project/_bootstrap-variables.scss index 7b06903..3c24268 100644 --- a/templates/project/_bootstrap-variables.scss +++ b/templates/project/_bootstrap-variables.scss @@ -452,8 +452,7 @@ // $card-border-radius: .25rem; // $card-border-color: #e5e5e5; // $card-border-radius-inner: ($card-border-radius - $card-border-width); - -// $card-cap-bg: #f5f5f5; +// $card-cap-bg: #f5f5f5; // Tooltips |