diff options
| author | Gijs Boddeus <[email protected]> | 2017-09-13 16:46:14 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-09-13 16:46:14 +0200 |
| commit | cf004433e0312482a8c4918d559f38c19a3e14d9 (patch) | |
| tree | 56fd67d5a60a1fe5442c969d29918db4f463b827 /scss | |
| parent | 4356d08abb4d94785af15f3cc9be0e553f1c1c03 (diff) | |
| parent | 75d435f76e48b19007495a02e79b0d41f2690361 (diff) | |
| download | bootstrap-cf004433e0312482a8c4918d559f38c19a3e14d9.tar.xz bootstrap-cf004433e0312482a8c4918d559f38c19a3e14d9.zip | |
Merge pull request #4 from twbs/v4-dev
update forked v4-dev
Diffstat (limited to 'scss')
| -rw-r--r-- | scss/_breadcrumb.scss | 5 | ||||
| -rw-r--r-- | scss/_forms.scss | 1 | ||||
| -rw-r--r-- | scss/_navbar.scss | 4 | ||||
| -rw-r--r-- | scss/mixins/_buttons.scss | 2 | ||||
| -rw-r--r-- | scss/utilities/_borders.scss | 4 |
5 files changed, 10 insertions, 6 deletions
diff --git a/scss/_breadcrumb.scss b/scss/_breadcrumb.scss index 52fadec69..5d77eeab6 100644 --- a/scss/_breadcrumb.scss +++ b/scss/_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/scss/_forms.scss b/scss/_forms.scss index 33163a052..fb3dc5599 100644 --- a/scss/_forms.scss +++ b/scss/_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/scss/_navbar.scss b/scss/_navbar.scss index ed49b76b9..15d218e87 100644 --- a/scss/_navbar.scss +++ b/scss/_navbar.scss @@ -98,6 +98,7 @@ // on the `.navbar` parent. .navbar-collapse { flex-basis: 100%; + flex-grow: 1; // For always expanded or extra full navbars, ensure content aligns itself // properly vertically. Can be easily overridden with flex utilities. align-items: center; @@ -177,6 +178,9 @@ // scss-lint:disable ImportantRule .navbar-collapse { display: flex !important; + + // Changes flex-bases to auto because of an IE10 bug + flex-basis: auto; } // scss-lint:enable ImportantRule diff --git a/scss/mixins/_buttons.scss b/scss/mixins/_buttons.scss index 312a18f1d..44ce4f72e 100644 --- a/scss/mixins/_buttons.scss +++ b/scss/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/scss/utilities/_borders.scss b/scss/utilities/_borders.scss index b7e91c260..3ff603c32 100644 --- a/scss/utilities/_borders.scss +++ b/scss/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; } |