Download as
Browse Code »

Commit 0f31392712eb17ea95a63f9285359ac11f880855

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

Mixins are now all with dashes instead of underscores 

(there really should be some convention for all gitlab css)
Showing 5 changed files with 21 additions and 19 deletions   Show diff stats
app/assets/stylesheets/gitlab_bootstrap/blocks.scss
  Diff comments   View file @0f31392
... ... @@ -16,7 +16,7 @@
16 16 @extend .prepend-top-20;
17 17 @extend .append-bottom-20;
18 18 border-width: 1px;
19   - @include solid_shade;
  19 + @include solid-shade;
20 20  
21 21  
22 22 img { max-width: 100%; }
... ... @@ -66,7 +66,7 @@
66 66 @include border-radius(4px);
67 67  
68 68 border-color: #CCC;
69   - @include solid_shade;
  69 + @include solid-shade;
70 70  
71 71 &.white {
72 72 background: #fff;
... ...
app/assets/stylesheets/gitlab_bootstrap/files.scss
  Diff comments   View file @0f31392
... ... @@ -5,7 +5,7 @@
5 5 .file_holder {
6 6 border: 1px solid #BBB;
7 7 margin-bottom: 1em;
8   - @include solid_shade;
  8 + @include solid-shade;
9 9  
10 10 .file_title {
11 11 border-bottom: 1px solid #bbb;
... ...
app/assets/stylesheets/gitlab_bootstrap/tables.scss
  Diff comments   View file @0f31392
1 1 table {
2 2 @extend .table;
3 3 @extend .table-striped;
4   - @include solid_shade;
  4 + @include solid-shade;
5 5 border: 1px solid #bbb;
6 6 width: 100%;
7 7  
... ...
app/assets/stylesheets/mixins.scss
  Diff comments   View file @0f31392
1   -@mixin shade {
2   - -moz-box-shadow: 0 0 3px #ddd;
3   - -webkit-box-shadow: 0 0 3px #ddd;
4   - box-shadow: 0 0 3px #ddd;
5   -}
6   -
7   -@mixin solid_shade {
8   - -moz-box-shadow: 0 0 0 3px #f1f1f1;
9   - -webkit-box-shadow: 0 0 0 3px #f1f1f1;
10   - box-shadow: 0 0 0 3px #f1f1f1;
11   -}
12   -
13   -
14   -@mixin box-shadow($shadow) {
  1 +/**
  2 + * Generic mixins
  3 + */
  4 + @mixin box-shadow($shadow) {
15 5 -webkit-box-shadow: $shadow;
16 6 -moz-box-shadow: $shadow;
17 7 -ms-box-shadow: $shadow;
... ... @@ -34,6 +24,10 @@
34 24 background-image: -o-linear-gradient($from, $to);
35 25 }
36 26  
  27 +/**
  28 + * Prefilled mixins
  29 + * Mixins with fixed values
  30 + */
37 31 @mixin bg-light-gray-gradient {
38 32 background: #f1f1f1;
39 33 background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #f5f5f5), to(#e1e1e1));
... ... @@ -56,3 +50,11 @@
56 50 background-image: -moz-linear-gradient(#e9e9e9, #d7d7d7);
57 51 background-image: -o-linear-gradient(#e9e9e9, #d7d7d7);
58 52 }
  53 +
  54 +@mixin shade {
  55 + @include box-shadow(0 0 3px #ddd);
  56 +}
  57 +
  58 +@mixin solid-shade {
  59 + @include box-shadow(0 0 0 3px #f1f1f1);
  60 +}
59 61 \ No newline at end of file
... ...
app/assets/stylesheets/sections/issues.scss
  Diff comments   View file @0f31392
... ... @@ -139,7 +139,7 @@ input.check_all_issues {
139 139 border: none;
140 140 box-shadow: none;
141 141 .ui-datepicker-header {
142   - @include solid_shade;
  142 + @include solid-shade;
143 143 margin-bottom: 10px;
144 144 border: 1px solid #bbb;
145 145 }
... ...