diff options
author | Gleb Mazovetskiy <glex.spb@gmail.com> | 2017-09-11 17:23:33 +0300 |
---|---|---|
committer | Gleb Mazovetskiy <glex.spb@gmail.com> | 2017-09-11 17:23:33 +0300 |
commit | eb2e1a606e2c3324e7c511ba07c5ba0195801b00 (patch) | |
tree | 37c6441979f159dc13e6021fdc5322a42f374099 /assets/stylesheets | |
parent | b12fdcd48c26cee905c3365626247f452fb941f2 (diff) |
rake update[v4-dev]
Diffstat (limited to 'assets/stylesheets')
-rw-r--r-- | assets/stylesheets/bootstrap/_breadcrumb.scss | 5 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/_forms.scss | 1 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/mixins/_buttons.scss | 2 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/utilities/_borders.scss | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/assets/stylesheets/bootstrap/_breadcrumb.scss b/assets/stylesheets/bootstrap/_breadcrumb.scss index 52fadec..5d77eea 100644 --- a/assets/stylesheets/bootstrap/_breadcrumb.scss +++ b/assets/stylesheets/bootstrap/_breadcrumb.scss @@ -1,15 +1,14 @@ .breadcrumb { + display: flex; + flex-wrap: wrap; padding: $breadcrumb-padding-y $breadcrumb-padding-x; margin-bottom: $breadcrumb-margin-bottom; list-style: none; background-color: $breadcrumb-bg; @include border-radius($border-radius); - @include clearfix; } .breadcrumb-item { - float: left; - // The separator between breadcrumbs (by default, a forward-slash: "/") + .breadcrumb-item::before { display: inline-block; // Suppress underlining of the separator in modern browsers diff --git a/assets/stylesheets/bootstrap/_forms.scss b/assets/stylesheets/bootstrap/_forms.scss index 33163a0..fb3dc55 100644 --- a/assets/stylesheets/bootstrap/_forms.scss +++ b/assets/stylesheets/bootstrap/_forms.scss @@ -130,6 +130,7 @@ select.form-control { padding-bottom: $input-btn-padding-y; margin-bottom: 0; // match inputs if this class comes on inputs with default margins line-height: $input-btn-line-height; + background-color: transparent; border: solid transparent; border-width: $input-btn-border-width 0; diff --git a/assets/stylesheets/bootstrap/mixins/_buttons.scss b/assets/stylesheets/bootstrap/mixins/_buttons.scss index 312a18f..44ce4f7 100644 --- a/assets/stylesheets/bootstrap/mixins/_buttons.scss +++ b/assets/stylesheets/bootstrap/mixins/_buttons.scss @@ -10,7 +10,7 @@ @include box-shadow($btn-box-shadow); @include hover { - @include color-yiq($background); + @include color-yiq($active-background); background-color: $active-background; border-color: $active-border; } diff --git a/assets/stylesheets/bootstrap/utilities/_borders.scss b/assets/stylesheets/bootstrap/utilities/_borders.scss index b7e91c2..3ff603c 100644 --- a/assets/stylesheets/bootstrap/utilities/_borders.scss +++ b/assets/stylesheets/bootstrap/utilities/_borders.scss @@ -44,9 +44,9 @@ } .rounded-circle { - border-radius: 50%; + border-radius: 50% !important; } .rounded-0 { - border-radius: 0; + border-radius: 0 !important; } |