diff options
| author | Mark Otto <[email protected]> | 2016-05-09 09:56:28 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-05-09 09:56:28 -0700 |
| commit | 6b33c083106be2eae5e3faaece04aa6dc05c0d62 (patch) | |
| tree | 8efb704fac4b1d79f00db21b67c654e792738907 | |
| parent | b479efb9d639de1955d5aa4cfc4acd810352a6b2 (diff) | |
| parent | fdf92b1528fbec57de73ddfdbf87b347443a3e92 (diff) | |
| download | bootstrap-6b33c083106be2eae5e3faaece04aa6dc05c0d62.tar.xz bootstrap-6b33c083106be2eae5e3faaece04aa6dc05c0d62.zip | |
Merge pull request #19667 from vsn4ik/v4-dev-use-border-radius-mixin
Use @border-radius and add $nav-tabs-border-radius variable
| -rw-r--r-- | scss/_card.scss | 24 | ||||
| -rw-r--r-- | scss/_images.scss | 2 | ||||
| -rw-r--r-- | scss/_nav.scss | 2 | ||||
| -rw-r--r-- | scss/_variables.scss | 1 |
4 files changed, 13 insertions, 16 deletions
diff --git a/scss/_card.scss b/scss/_card.scss index f61da6dd9..0b6a0aa03 100644 --- a/scss/_card.scss +++ b/scss/_card.scss @@ -48,20 +48,16 @@ } } -@if $enable-rounded { - .card { - > .list-group:first-child { - .list-group-item:first-child { - border-top-left-radius: $card-border-radius; - border-top-right-radius: $card-border-radius; - } +.card { + > .list-group:first-child { + .list-group-item:first-child { + @include border-top-radius($card-border-radius); } + } - > .list-group:last-child { - .list-group-item:last-child { - border-bottom-right-radius: $card-border-radius; - border-bottom-left-radius: $card-border-radius; - } + > .list-group:last-child { + .list-group-item:last-child { + @include border-bottom-radius($card-border-radius); } } } @@ -195,10 +191,10 @@ // Card image caps .card-img-top { - @include border-radius($card-border-radius-inner $card-border-radius-inner 0 0); + @include border-top-radius($card-border-radius-inner); } .card-img-bottom { - @include border-radius(0 0 $card-border-radius-inner $card-border-radius-inner); + @include border-bottom-radius($card-border-radius-inner); } diff --git a/scss/_images.scss b/scss/_images.scss index d17006df2..989426999 100644 --- a/scss/_images.scss +++ b/scss/_images.scss @@ -19,7 +19,7 @@ padding: $thumbnail-padding; background-color: $thumbnail-bg; border: $thumbnail-border-width solid $thumbnail-border-color; - border-radius: $thumbnail-border-radius; + @include border-radius($thumbnail-border-radius); transition: all .2s ease-in-out; @include box-shadow($thumbnail-box-shadow); diff --git a/scss/_nav.scss b/scss/_nav.scss index 6bb09fdbd..640956ca2 100644 --- a/scss/_nav.scss +++ b/scss/_nav.scss @@ -65,7 +65,7 @@ display: block; padding: $nav-link-padding; border: $nav-tabs-border-width solid transparent; - @include border-radius($border-radius $border-radius 0 0); + @include border-top-radius($nav-tabs-border-radius); @include hover-focus { border-color: $nav-tabs-link-hover-border-color $nav-tabs-link-hover-border-color $nav-tabs-border-color; diff --git a/scss/_variables.scss b/scss/_variables.scss index a1e8e5bea..d4dc984f2 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -502,6 +502,7 @@ $nav-disabled-link-hover-bg: transparent !default; $nav-tabs-border-color: #ddd !default; $nav-tabs-border-width: $border-width !default; +$nav-tabs-border-radius: $border-radius !default; $nav-tabs-link-hover-border-color: $gray-lighter !default; $nav-tabs-active-link-hover-color: $gray !default; $nav-tabs-active-link-hover-bg: $body-bg !default; |