Commit c05692b7b1194e67b5427ca0a6a4926562abdf6e
1 parent
fee26c58
Exists in
master
and in
4 other branches
scss refactoring
Showing
6 changed files
with
15 additions
and
38 deletions
Show diff stats
app/assets/stylesheets/gitlab_bootstrap.scss
... | ... | @@ -468,12 +468,8 @@ form { |
468 | 468 | h5, .title { |
469 | 469 | padding: 0 10px; |
470 | 470 | @include round-borders-top(4px); |
471 | + @include bg-gray-gradient; | |
471 | 472 | border-bottom: 1px solid #bbb; |
472 | - background:#eee; | |
473 | - background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf)); | |
474 | - background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf); | |
475 | - background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf); | |
476 | - background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf); | |
477 | 473 | |
478 | 474 | &.small { |
479 | 475 | line-height: 28px; |
... | ... | @@ -499,10 +495,7 @@ form { |
499 | 495 | } |
500 | 496 | |
501 | 497 | .bottom { |
502 | - background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf)); | |
503 | - background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf); | |
504 | - background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf); | |
505 | - background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf); | |
498 | + @include bg-gray-gradient; | |
506 | 499 | @include round-borders-bottom(4px); |
507 | 500 | border-bottom:none; |
508 | 501 | border-top: 1px solid #bbb; |
... | ... | @@ -555,11 +548,7 @@ table.admin-table { |
555 | 548 | th { |
556 | 549 | border-color: #CCC; |
557 | 550 | border-bottom: 1px solid #bbb; |
558 | - background:#eee; | |
559 | - background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf)); | |
560 | - background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf); | |
561 | - background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf); | |
562 | - background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf); | |
551 | + @include bg-gray-gradient; | |
563 | 552 | } |
564 | 553 | } |
565 | 554 | |
... | ... | @@ -682,11 +671,7 @@ h3.page_title { |
682 | 671 | |
683 | 672 | .file_title { |
684 | 673 | border-bottom: 1px solid #bbb; |
685 | - background:#eee; | |
686 | - background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf)); | |
687 | - background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf); | |
688 | - background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf); | |
689 | - background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf); | |
674 | + @include bg-gray-gradient; | |
690 | 675 | margin: 0; |
691 | 676 | font-weight: normal; |
692 | 677 | font-weight: bold; | ... | ... |
app/assets/stylesheets/main.scss
... | ... | @@ -72,7 +72,13 @@ $hover: #FDF5D9; |
72 | 72 | border-radius: $radius; |
73 | 73 | } |
74 | 74 | |
75 | - | |
75 | +@mixin bg-gray-gradient { | |
76 | + background:#eee; | |
77 | + background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf)); | |
78 | + background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf); | |
79 | + background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf); | |
80 | + background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf); | |
81 | +} | |
76 | 82 | |
77 | 83 | /** |
78 | 84 | * Header of application. | ... | ... |
app/assets/stylesheets/ref_select.scss
app/assets/stylesheets/sections/graph.scss
... | ... | @@ -6,11 +6,7 @@ |
6 | 6 | h4 { |
7 | 7 | padding:0 10px; |
8 | 8 | border-bottom: 1px solid #bbb; |
9 | - background:#eee; | |
10 | - background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf)); | |
11 | - background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf); | |
12 | - background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf); | |
13 | - background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf); | |
9 | + @include bg-gray-gradient; | |
14 | 10 | } |
15 | 11 | |
16 | 12 | .graph { | ... | ... |
app/assets/stylesheets/sections/nav.scss
... | ... | @@ -6,13 +6,9 @@ ul.main_menu { |
6 | 6 | border-radius: 4px; |
7 | 7 | margin: auto; |
8 | 8 | margin:30px 0; |
9 | - background:#eee; | |
10 | 9 | border:1px solid #bbb; |
11 | 10 | height:37px; |
12 | - background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf)); | |
13 | - background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf); | |
14 | - background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf); | |
15 | - background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf); | |
11 | + @include bg-gray-gradient; | |
16 | 12 | position:relative; |
17 | 13 | overflow:hidden; |
18 | 14 | @include shade; | ... | ... |
app/assets/stylesheets/sections/tree.scss
... | ... | @@ -72,11 +72,7 @@ |
72 | 72 | th { |
73 | 73 | border-color: #CCC; |
74 | 74 | border-bottom: 1px solid #bbb; |
75 | - background:#eee; | |
76 | - background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf)); | |
77 | - background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf); | |
78 | - background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf); | |
79 | - background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf); | |
75 | + @include bg-gray-gradient; | |
80 | 76 | } |
81 | 77 | } |
82 | 78 | ... | ... |