Download as
Browse Code »

Commit c05692b7b1194e67b5427ca0a6a4926562abdf6e

Authored by randx
1 parent fee26c58
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

scss refactoring

Showing 6 changed files with 15 additions and 38 deletions   Show diff stats
app/assets/stylesheets/gitlab_bootstrap.scss
  Diff comments   View file @c05692b
@@ -468,12 +468,8 @@ form { @@ -468,12 +468,8 @@ form {
468 h5, .title { 468 h5, .title {
469 padding: 0 10px; 469 padding: 0 10px;
470 @include round-borders-top(4px); 470 @include round-borders-top(4px);
  471 + @include bg-gray-gradient;
471 border-bottom: 1px solid #bbb; 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 &.small { 474 &.small {
479 line-height: 28px; 475 line-height: 28px;
@@ -499,10 +495,7 @@ form { @@ -499,10 +495,7 @@ form {
499 } 495 }
500 496
501 .bottom { 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 @include round-borders-bottom(4px); 499 @include round-borders-bottom(4px);
507 border-bottom:none; 500 border-bottom:none;
508 border-top: 1px solid #bbb; 501 border-top: 1px solid #bbb;
@@ -555,11 +548,7 @@ table.admin-table { @@ -555,11 +548,7 @@ table.admin-table {
555 th { 548 th {
556 border-color: #CCC; 549 border-color: #CCC;
557 border-bottom: 1px solid #bbb; 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,11 +671,7 @@ h3.page_title {
682 671
683 .file_title { 672 .file_title {
684 border-bottom: 1px solid #bbb; 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 margin: 0; 675 margin: 0;
691 font-weight: normal; 676 font-weight: normal;
692 font-weight: bold; 677 font-weight: bold;
app/assets/stylesheets/main.scss
  Diff comments   View file @c05692b
@@ -72,7 +72,13 @@ $hover: #FDF5D9; @@ -72,7 +72,13 @@ $hover: #FDF5D9;
72 border-radius: $radius; 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 * Header of application. 84 * Header of application.
app/assets/stylesheets/ref_select.scss
  Diff comments   View file @c05692b
@@ -33,9 +33,7 @@ @@ -33,9 +33,7 @@
33 } 33 }
34 34
35 .chzn-single { 35 .chzn-single {
36 - background:#ddd;  
37 - //border:none;  
38 - //box-shadow:none; 36 + @include bg-gray-gradient;
39 37
40 div { 38 div {
41 background:transparent; 39 background:transparent;
app/assets/stylesheets/sections/graph.scss
  Diff comments   View file @c05692b
@@ -6,11 +6,7 @@ @@ -6,11 +6,7 @@
6 h4 { 6 h4 {
7 padding:0 10px; 7 padding:0 10px;
8 border-bottom: 1px solid #bbb; 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 .graph { 12 .graph {
app/assets/stylesheets/sections/nav.scss
  Diff comments   View file @c05692b
@@ -6,13 +6,9 @@ ul.main_menu { @@ -6,13 +6,9 @@ ul.main_menu {
6 border-radius: 4px; 6 border-radius: 4px;
7 margin: auto; 7 margin: auto;
8 margin:30px 0; 8 margin:30px 0;
9 - background:#eee;  
10 border:1px solid #bbb; 9 border:1px solid #bbb;
11 height:37px; 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 position:relative; 12 position:relative;
17 overflow:hidden; 13 overflow:hidden;
18 @include shade; 14 @include shade;
app/assets/stylesheets/sections/tree.scss
  Diff comments   View file @c05692b
@@ -72,11 +72,7 @@ @@ -72,11 +72,7 @@
72 th { 72 th {
73 border-color: #CCC; 73 border-color: #CCC;
74 border-bottom: 1px solid #bbb; 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