Use @border-radius and add $nav-tabs-border-radius variable

diff --git a/scss/_card.scss b/scss/_card.scss
index 856d6c6349cfbb6588bf4cdd763b590fa7b83773..24a90c2271bb06e04f2cbbec0da63bff25482d6a 100644 (file)
--- 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 d17006df24f2b23cb2d7e85d0b39e9fa4b24ce81..989426999712f15d8193eae2609ecefede34c7e2 100644 (file)
--- 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 6bb09fdbdd70e128520a2ec396e667de1ed4a80c..640956ca2f16f6aa23311110d8d53f3cb19e6960 100644 (file)
--- 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 82ef6f96309c3eca5fae160d6f8f7a3b1cdabff5..3b147646a0d9a7052b6089fa1326939af94fe6f6 100644 (file)
--- 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;