From 81175073a0604633bfec08b95c1ed19d054b48b5 Mon Sep 17 00:00:00 2001 From: Koen Punt Date: Sun, 25 Nov 2012 18:30:18 +0100 Subject: [PATCH] removed overqualified mixins round-borders-* --- app/assets/stylesheets/gitlab_bootstrap/blocks.scss | 14 +++++++++----- app/assets/stylesheets/mixins.scss | 15 --------------- app/assets/stylesheets/sections/commits.scss | 3 +-- app/assets/stylesheets/sections/merge_requests.scss | 2 +- app/assets/stylesheets/sections/notes.scss | 3 ++- 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 db149ee70..251b11e9f 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 3ee8d0f5b..c704de064 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 5fe53ceb8..bf405bfcd 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 270658315..a5ec1756e 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 50b8bd40b..0c2a56d62 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; -- 2.11.0