deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

removed overqualified mixins round-borders-*

Browse source
This commit is contained in:
Koen Punt 2012-11-25 18:30:18 +01:00
parent 238c214ac9
commit 81175073a0
5 changed files with 13 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/assets/stylesheets/gitlab_bootstrap/blocks.scss
View file

@ -61,7 +61,10 @@
.ui-box { .ui-box {
background: #F9F9F9; background: #F9F9F9;
margin-bottom: 25px; margin-bottom: 25px;
@include round-borders-all(4px);
border: 1px solid #eaeaea;
@include border-radius(4px);
border-color: #CCC; border-color: #CCC;
@include solid_shade; @include solid_shade;
@ -75,8 +78,9 @@
h5, .title { h5, .title {
padding: 0 10px; padding: 0 10px;
@include round-borders-top(4px); @include border-radius(4px 4px 0 0);
@include bg-gray-gradient; @include bg-gray-gradient;
border-top: 1px solid #eaeaea;
border-bottom: 1px solid #bbb; border-bottom: 1px solid #bbb;
&.small { &.small {
@ -104,7 +108,7 @@
.bottom { .bottom {
@include bg-gray-gradient; @include bg-gray-gradient;
@include round-borders-bottom(4px); @include border-radius(0 0 4px 4px);
border-bottom: none; border-bottom: none;
border-top: 1px solid #bbb; border-top: 1px solid #bbb;
} }
@ -137,12 +141,12 @@
li, .wll { li, .wll {
padding: 10px; padding: 10px;
&:first-child { &:first-child {
@include round-borders-top(4px); @include border-radius(4px 4px 0 0);
border-top: none; border-top: none;
} }
&:last-child { &:last-child {
@include round-borders-bottom(4px); @include border-radius(0 0 4px 4px);
border: none; border: none;
} }
} }

15
app/assets/stylesheets/mixins.scss
View file

@ -34,21 +34,6 @@
background-image: -o-linear-gradient($from, $to); 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) { @mixin bg-gradient($from, $to) {
@include linear-gradient($from, $to); @include linear-gradient($from, $to);
} }

3
app/assets/stylesheets/sections/commits.scss
View file

@ -295,9 +295,8 @@
} }
.label_commit { .label_commit {
@include round-borders-all(4px); @include border-radius(4px);
padding: 2px 4px; padding: 2px 4px;
border: none;
font-size: 13px; font-size: 13px;
background: #474D57; background: #474D57;
color: #fff; color: #fff;

2
app/assets/stylesheets/sections/merge_requests.scss
View file

@ -84,7 +84,7 @@ li.merge_request {
} }
.label_branch { .label_branch {
@include round-borders-all(4px); @include border-radius(4px);
padding: 2px 4px; padding: 2px 4px;
border: none; border: none;
font-size: 14px; font-size: 14px;

3
app/assets/stylesheets/sections/notes.scss
View file

@ -105,7 +105,8 @@ tr.line_notes_row {
padding: 7px 10px; padding: 7px 10px;
} }
a.line_note_reply_link { a.line_note_reply_link {
@include round-borders-all(4px); border: 1px solid #eaeaea;
@include border-radius(4px);
padding: 3px 10px; padding: 3px 10px;
margin-left: 5px; margin-left: 5px;
color: white; color: white;