]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Rename `$card-border-radius-inner` to `$card-inner-border-radius`
authorPatrick Yeo <patrick.yeo@liferay.com>
Thu, 1 Jun 2017 22:51:31 +0000 (15:51 -0700)
committerMark Otto <markd.otto@gmail.com>
Sun, 4 Jun 2017 05:17:57 +0000 (22:17 -0700)
scss/_card.scss
scss/_variables.scss

index 7be2aaf8b54f7a7714b8033f216e9159d1a74f08..148c4f89b63344a157cf54a01a92783915091568 100644 (file)
@@ -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);
   }
 }
 
 
 .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);
 }
 
 
index 74e2fab730fa185f4c2d228ff90bea382518640a..e5aa9e9256565d6dd469854cd39a1d99ad2165f2 100644 (file)
@@ -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;