diff options
| author | vsn4ik <[email protected]> | 2016-04-03 01:47:12 +0300 |
|---|---|---|
| committer | vsn4ik <[email protected]> | 2016-04-03 01:47:12 +0300 |
| commit | fdf92b1528fbec57de73ddfdbf87b347443a3e92 (patch) | |
| tree | 96ae2c031b72095fb8e38914e814c0a1a8a2e898 /scss | |
| parent | cc5e248aa2294fe62fee02ae272e0a57aff827b4 (diff) | |
| download | bootstrap-fdf92b1528fbec57de73ddfdbf87b347443a3e92.tar.xz bootstrap-fdf92b1528fbec57de73ddfdbf87b347443a3e92.zip | |
Use @border-radius and add $nav-tabs-border-radius variable
Diffstat (limited to 'scss')
| -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 856d6c634..24a90c227 100644 --- a/scss/_card.scss +++ b/scss/_card.scss @@ -49,20 +49,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); } } } @@ -196,10 +192,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 82ef6f963..3b147646a 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -500,6 +500,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; |