Skip to content

Commit 6b33c08

Browse files
committed
Merge pull request #19667 from vsn4ik/v4-dev-use-border-radius-mixin
Use @border-radius and add $nav-tabs-border-radius variable
2 parents b479efb + fdf92b1 commit 6b33c08

File tree

4 files changed

+13
-16
lines changed

4 files changed

+13
-16
lines changed

scss/_card.scss

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -48,20 +48,16 @@
4848
}
4949
}
5050

51-
@if $enable-rounded {
52-
.card {
53-
> .list-group:first-child {
54-
.list-group-item:first-child {
55-
border-top-left-radius: $card-border-radius;
56-
border-top-right-radius: $card-border-radius;
57-
}
51+
.card {
52+
> .list-group:first-child {
53+
.list-group-item:first-child {
54+
@include border-top-radius($card-border-radius);
5855
}
56+
}
5957

60-
> .list-group:last-child {
61-
.list-group-item:last-child {
62-
border-bottom-right-radius: $card-border-radius;
63-
border-bottom-left-radius: $card-border-radius;
64-
}
58+
> .list-group:last-child {
59+
.list-group-item:last-child {
60+
@include border-bottom-radius($card-border-radius);
6561
}
6662
}
6763
}
@@ -195,10 +191,10 @@
195191

196192
// Card image caps
197193
.card-img-top {
198-
@include border-radius($card-border-radius-inner $card-border-radius-inner 0 0);
194+
@include border-top-radius($card-border-radius-inner);
199195
}
200196
.card-img-bottom {
201-
@include border-radius(0 0 $card-border-radius-inner $card-border-radius-inner);
197+
@include border-bottom-radius($card-border-radius-inner);
202198
}
203199

204200

scss/_images.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
padding: $thumbnail-padding;
2020
background-color: $thumbnail-bg;
2121
border: $thumbnail-border-width solid $thumbnail-border-color;
22-
border-radius: $thumbnail-border-radius;
22+
@include border-radius($thumbnail-border-radius);
2323
transition: all .2s ease-in-out;
2424
@include box-shadow($thumbnail-box-shadow);
2525

scss/_nav.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
display: block;
6666
padding: $nav-link-padding;
6767
border: $nav-tabs-border-width solid transparent;
68-
@include border-radius($border-radius $border-radius 0 0);
68+
@include border-top-radius($nav-tabs-border-radius);
6969

7070
@include hover-focus {
7171
border-color: $nav-tabs-link-hover-border-color $nav-tabs-link-hover-border-color $nav-tabs-border-color;

scss/_variables.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -502,6 +502,7 @@ $nav-disabled-link-hover-bg: transparent !default;
502502

503503
$nav-tabs-border-color: #ddd !default;
504504
$nav-tabs-border-width: $border-width !default;
505+
$nav-tabs-border-radius: $border-radius !default;
505506
$nav-tabs-link-hover-border-color: $gray-lighter !default;
506507
$nav-tabs-active-link-hover-color: $gray !default;
507508
$nav-tabs-active-link-hover-bg: $body-bg !default;

0 commit comments

Comments
 (0)