Download as
Browse Code »

Commit 81175073a0604633bfec08b95c1ed19d054b48b5

Authored by Koen Punt
1 parent 238c214a
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

removed overqualified mixins round-borders-*

Showing 5 changed files with 13 additions and 24 deletions   Show diff stats
app/assets/stylesheets/gitlab_bootstrap/blocks.scss
  Diff comments   View file @8117507
... ... @@ -61,7 +61,10 @@
61 61 .ui-box {
62 62 background: #F9F9F9;
63 63 margin-bottom: 25px;
64   - @include round-borders-all(4px);
  64 +
  65 + border: 1px solid #eaeaea;
  66 + @include border-radius(4px);
  67 +
65 68 border-color: #CCC;
66 69 @include solid_shade;
67 70  
... ... @@ -75,8 +78,9 @@
75 78  
76 79 h5, .title {
77 80 padding: 0 10px;
78   - @include round-borders-top(4px);
  81 + @include border-radius(4px 4px 0 0);
79 82 @include bg-gray-gradient;
  83 + border-top: 1px solid #eaeaea;
80 84 border-bottom: 1px solid #bbb;
81 85  
82 86 &.small {
... ... @@ -104,7 +108,7 @@
104 108  
105 109 .bottom {
106 110 @include bg-gray-gradient;
107   - @include round-borders-bottom(4px);
  111 + @include border-radius(0 0 4px 4px);
108 112 border-bottom: none;
109 113 border-top: 1px solid #bbb;
110 114 }
... ... @@ -137,12 +141,12 @@
137 141 li, .wll {
138 142 padding: 10px;
139 143 &:first-child {
140   - @include round-borders-top(4px);
  144 + @include border-radius(4px 4px 0 0);
141 145 border-top: none;
142 146 }
143 147  
144 148 &:last-child {
145   - @include round-borders-bottom(4px);
  149 + @include border-radius(0 0 4px 4px);
146 150 border: none;
147 151 }
148 152 }
... ...
app/assets/stylesheets/mixins.scss
  Diff comments   View file @8117507
... ... @@ -34,21 +34,6 @@
34 34 background-image: -o-linear-gradient($from, $to);
35 35 }
36 36  
37   -@mixin round-borders-bottom($radius) {
38   - border-top: 1px solid #eaeaea;
39   - @include border-radius(0 0 $radius $radius);
40   -}
41   -
42   -@mixin round-borders-top($radius) {
43   - border-top: 1px solid #eaeaea;
44   - @include border-radius($radius $radius 0 0);
45   -}
46   -
47   -@mixin round-borders-all($radius) {
48   - border: 1px solid #eaeaea;
49   - @include border-radius($radius);
50   -}
51   -
52 37 @mixin bg-gradient($from, $to) {
53 38 @include linear-gradient($from, $to);
54 39 }
... ...
app/assets/stylesheets/sections/commits.scss
  Diff comments   View file @8117507
... ... @@ -295,9 +295,8 @@
295 295 }
296 296  
297 297 .label_commit {
298   - @include round-borders-all(4px);
  298 + @include border-radius(4px);
299 299 padding: 2px 4px;
300   - border: none;
301 300 font-size: 13px;
302 301 background: #474D57;
303 302 color: #fff;
... ...
app/assets/stylesheets/sections/merge_requests.scss
  Diff comments   View file @8117507
... ... @@ -84,7 +84,7 @@ li.merge_request {
84 84 }
85 85  
86 86 .label_branch {
87   - @include round-borders-all(4px);
  87 + @include border-radius(4px);
88 88 padding: 2px 4px;
89 89 border: none;
90 90 font-size: 14px;
... ...
app/assets/stylesheets/sections/notes.scss
  Diff comments   View file @8117507
... ... @@ -105,7 +105,8 @@ tr.line_notes_row {
105 105 padding: 7px 10px;
106 106 }
107 107 a.line_note_reply_link {
108   - @include round-borders-all(4px);
  108 + border: 1px solid #eaeaea;
  109 + @include border-radius(4px);
109 110 padding: 3px 10px;
110 111 margin-left: 5px;
111 112 color: white;
... ...