Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Yeo <patrick.yeo@liferay.com>2017-06-02 01:51:31 +0300
committerMark Otto <markd.otto@gmail.com>2017-06-04 08:17:57 +0300
commitec56bbe6bf1455bc9c5ae55d3fb16324593a4ebc (patch)
treeab133ac1ee49491d1243f937a03400f5d2890adf
parent3a00b005c19b8ea9dead451f5647c8c2182d40f0 (diff)
Rename `$card-border-radius-inner` to `$card-inner-border-radius`
-rw-r--r--scss/_card.scss10
-rw-r--r--scss/_variables.scss2
2 files changed, 6 insertions, 6 deletions
diff --git a/scss/_card.scss b/scss/_card.scss
index 7be2aaf8b5..148c4f89b6 100644
--- a/scss/_card.scss
+++ b/scss/_card.scss
@@ -68,7 +68,7 @@
border-bottom: $card-border-width solid $card-border-color;
&:first-child {
- @include border-radius($card-border-radius-inner $card-border-radius-inner 0 0);
+ @include border-radius($card-inner-border-radius $card-inner-border-radius 0 0);
}
}
@@ -78,7 +78,7 @@
border-top: $card-border-width solid $card-border-color;
&:last-child {
- @include border-radius(0 0 $card-border-radius-inner $card-border-radius-inner);
+ @include border-radius(0 0 $card-inner-border-radius $card-inner-border-radius);
}
}
@@ -170,18 +170,18 @@
.card-img {
width: 100%; // Required because we use flexbox and this inherently applies align-self: stretch
- @include border-radius($card-border-radius-inner);
+ @include border-radius($card-inner-border-radius);
}
// Card image caps
.card-img-top {
width: 100%; // Required because we use flexbox and this inherently applies align-self: stretch
- @include border-top-radius($card-border-radius-inner);
+ @include border-top-radius($card-inner-border-radius);
}
.card-img-bottom {
width: 100%; // Required because we use flexbox and this inherently applies align-self: stretch
- @include border-bottom-radius($card-border-radius-inner);
+ @include border-bottom-radius($card-inner-border-radius);
}
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 74e2fab730..e5aa9e9256 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -673,7 +673,7 @@ $card-spacer-x: 1.25rem !default;
$card-border-width: 1px !default;
$card-border-radius: $border-radius !default;
$card-border-color: rgba($black,.125) !default;
-$card-border-radius-inner: calc(#{$card-border-radius} - #{$card-border-width}) !default;
+$card-inner-border-radius: calc(#{$card-border-radius} - #{$card-border-width}) !default;
$card-cap-bg: $gray-lightest !default;
$card-bg: $white !default;