removed overqualified mixins round-borders-*

5 files changed, 13 insertions, 24 deletions

diff --git a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss
index db149ee7069..251b11e9f87 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss
@@ -61,7 +61,10 @@
 .ui-box {
   background: #F9F9F9;
   margin-bottom: 25px;
-  @include round-borders-all(4px);
+
+  border: 1px solid #eaeaea;
+  @include border-radius(4px);
+  
   border-color: #CCC;
   @include solid_shade;
 
@@ -75,8 +78,9 @@
 
   h5, .title {
     padding: 0 10px;
-    @include round-borders-top(4px);
+    @include border-radius(4px 4px 0 0);
     @include bg-gray-gradient;
+    border-top: 1px solid #eaeaea;
     border-bottom: 1px solid #bbb;
 
     &.small {
@@ -104,7 +108,7 @@
 
   .bottom {
     @include bg-gray-gradient;
-    @include round-borders-bottom(4px);
+    @include border-radius(0 0 4px 4px);
     border-bottom: none;
     border-top: 1px solid #bbb;
   }
@@ -137,12 +141,12 @@
   li, .wll {
     padding: 10px;
     &:first-child {
-      @include round-borders-top(4px);
+      @include border-radius(4px 4px 0 0);
       border-top: none;
     }
 
     &:last-child {
-      @include round-borders-bottom(4px);
+      @include border-radius(0 0 4px 4px);
       border: none;
     }
   }
diff --git a/app/assets/stylesheets/mixins.scss b/app/assets/stylesheets/mixins.scss
index 3ee8d0f5b1d..c704de064f3 100644
--- a/app/assets/stylesheets/mixins.scss
+++ b/app/assets/stylesheets/mixins.scss
@@ -34,21 +34,6 @@
   background-image: -o-linear-gradient($from, $to);
 }
 
-@mixin round-borders-bottom($radius) {
-  border-top: 1px solid #eaeaea;
-  @include border-radius(0 0 $radius $radius);
-}
-
-@mixin round-borders-top($radius) {
-  border-top: 1px solid #eaeaea;
-  @include border-radius($radius $radius 0 0);
-}
-
-@mixin round-borders-all($radius) {
-  border: 1px solid #eaeaea;
-  @include border-radius($radius);
-}
-
 @mixin bg-gradient($from, $to) {
   @include linear-gradient($from, $to);
 }
diff --git a/app/assets/stylesheets/sections/commits.scss b/app/assets/stylesheets/sections/commits.scss
index 5fe53ceb8bd..bf405bfcd51 100644
--- a/app/assets/stylesheets/sections/commits.scss
+++ b/app/assets/stylesheets/sections/commits.scss
@@ -295,9 +295,8 @@
 }
 
 .label_commit {
-  @include round-borders-all(4px);
+  @include border-radius(4px);
   padding: 2px 4px;
-  border: none;
   font-size: 13px;
   background: #474D57;
   color: #fff;
diff --git a/app/assets/stylesheets/sections/merge_requests.scss b/app/assets/stylesheets/sections/merge_requests.scss
index 270658315bb..a5ec1756e5f 100644
--- a/app/assets/stylesheets/sections/merge_requests.scss
+++ b/app/assets/stylesheets/sections/merge_requests.scss
@@ -84,7 +84,7 @@ li.merge_request {
 }
 
 .label_branch {
-  @include round-borders-all(4px);
+  @include border-radius(4px);
   padding: 2px 4px;
   border: none;
   font-size: 14px;
diff --git a/app/assets/stylesheets/sections/notes.scss b/app/assets/stylesheets/sections/notes.scss
index 50b8bd40ba4..0c2a56d62f5 100644
--- a/app/assets/stylesheets/sections/notes.scss
+++ b/app/assets/stylesheets/sections/notes.scss
@@ -105,7 +105,8 @@ tr.line_notes_row {
       padding: 7px 10px;
     }
     a.line_note_reply_link {
-      @include round-borders-all(4px);
+      border: 1px solid #eaeaea;
+      @include border-radius(4px);
       padding: 3px 10px;
       margin-left: 5px;
       color: white;