rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-10 22:24:19 +01:00
Code Issues Actions Packages Releases Activity

Merge pull request #19667 from vsn4ik/v4-dev-use-border-radius-mixin

Browse Source 
Use @border-radius and add $nav-tabs-border-radius variable
This commit is contained in:
Mark Otto 2016-05-09 09:56:28 -07:00
commit 6b33c08310
4 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scss/_card.scss
View File

@ -48,20 +48,16 @@
} }
} }
@if $enable-rounded { .card {
.card {
> .list-group:first-child { > .list-group:first-child {
.list-group-item:first-child { .list-group-item:first-child {
border-top-left-radius: $card-border-radius; @include border-top-radius($card-border-radius);
border-top-right-radius: $card-border-radius;
} }
} }
> .list-group:last-child { > .list-group:last-child {
.list-group-item:last-child { .list-group-item:last-child {
border-bottom-right-radius: $card-border-radius; @include border-bottom-radius($card-border-radius);
border-bottom-left-radius: $card-border-radius;
}
} }
} }
} }
@ -195,10 +191,10 @@
// Card image caps // Card image caps
.card-img-top { .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 { .card-img-bottom {
@include border-radius(0 0 $card-border-radius-inner $card-border-radius-inner); @include border-bottom-radius($card-border-radius-inner);
} }

2
scss/_images.scss
View File

@ -19,7 +19,7 @@
padding: $thumbnail-padding; padding: $thumbnail-padding;
background-color: $thumbnail-bg; background-color: $thumbnail-bg;
border: $thumbnail-border-width solid $thumbnail-border-color; 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; transition: all .2s ease-in-out;
@include box-shadow($thumbnail-box-shadow); @include box-shadow($thumbnail-box-shadow);

2
scss/_nav.scss
View File

@ -65,7 +65,7 @@
display: block; display: block;
padding: $nav-link-padding; padding: $nav-link-padding;
border: $nav-tabs-border-width solid transparent; 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 { @include hover-focus {
border-color: $nav-tabs-link-hover-border-color $nav-tabs-link-hover-border-color $nav-tabs-border-color; border-color: $nav-tabs-link-hover-border-color $nav-tabs-link-hover-border-color $nav-tabs-border-color;

1
scss/_variables.scss
View File

@ -502,6 +502,7 @@ $nav-disabled-link-hover-bg: transparent !default;
$nav-tabs-border-color: #ddd !default; $nav-tabs-border-color: #ddd !default;
$nav-tabs-border-width: $border-width !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-link-hover-border-color: $gray-lighter !default;
$nav-tabs-active-link-hover-color: $gray !default; $nav-tabs-active-link-hover-color: $gray !default;
$nav-tabs-active-link-hover-bg: $body-bg !default; $nav-tabs-active-link-hover-bg: $body-bg !default;