Download as
Browse Code »

Commit 23ae3911aa55f075e30da9da4e687e064e59a9fa

Authored by Dmitriy Zaporozhets
2 parents 9e111537 211e975d
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Merge branch 'mixin-cleanup' into 'master' 

Mixin cleanup

* Remove old mixins
* add issue box shadow
* change color for network graph box
Showing 3 changed files with 4 additions and 29 deletions   Show diff stats
app/assets/stylesheets/generic/issue_box.scss
  Diff comments   View file @23ae391
@@ -12,6 +12,7 @@ @@ -12,6 +12,7 @@
12 margin:20px 0; 12 margin:20px 0;
13 background: #FFF; 13 background: #FFF;
14 border: 1px solid #EEE; 14 border: 1px solid #EEE;
  15 + @include box-shadow(0 1px 1px rgba(0, 0, 0, 0.05));
15 16
16 &.issue-box-closed { 17 &.issue-box-closed {
17 border-color: #DA4E49; 18 border-color: #DA4E49;
app/assets/stylesheets/main/mixins.scss
  Diff comments   View file @23ae391
@@ -41,31 +41,6 @@ @@ -41,31 +41,6 @@
41 * Prefilled mixins 41 * Prefilled mixins
42 * Mixins with fixed values 42 * Mixins with fixed values
43 */ 43 */
44 -@mixin bg-light-gray-gradient {  
45 - background: #f1f1f1;  
46 - background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #f5f5f5), to(#e1e1e1));  
47 - background-image: -webkit-linear-gradient(#f5f5f5 6.6%, #e1e1e1);  
48 - background-image: -moz-linear-gradient(#f5f5f5 6.6%, #e1e1e1);  
49 - background-image: -ms-linear-gradient(#f5f5f5 6.6%, #e1e1e1);  
50 - background-image: -o-linear-gradient(#f5f5f5 6.6%, #e1e1e1);  
51 -}  
52 -  
53 -@mixin bg-gray-gradient {  
54 - background: #eee;  
55 - background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf));  
56 - background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf);  
57 - background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf);  
58 - background-image: -ms-linear-gradient(#eee 6.6%, #dfdfdf);  
59 - background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf);  
60 -}  
61 -  
62 -@mixin bg-dark-gray-gradient {  
63 - background: #eee;  
64 - background-image: -webkit-linear-gradient(#e9e9e9, #d7d7d7);  
65 - background-image: -moz-linear-gradient(#e9e9e9, #d7d7d7);  
66 - background-image: -ms-linear-gradient(#e9e9e9, #d7d7d7);  
67 - background-image: -o-linear-gradient(#e9e9e9, #d7d7d7);  
68 -}  
69 44
70 @mixin shade { 45 @mixin shade {
71 @include box-shadow(0 0 3px #ddd); 46 @include box-shadow(0 0 3px #ddd);
app/assets/stylesheets/sections/graph.scss
  Diff comments   View file @23ae391
1 .project-network { 1 .project-network {
2 - border: 1px solid #aaa;  
3 - padding: 1px; 2 + border: 1px solid #CCC;
4 3
5 .tip { 4 .tip {
6 color: #888; 5 color: #888;
7 font-size: 14px; 6 font-size: 14px;
8 padding: 10px; 7 padding: 10px;
9 border-bottom: 1px solid #bbb; 8 border-bottom: 1px solid #bbb;
10 - @include bg-gray-gradient; 9 + background: #EEE;
11 } 10 }
12 11
13 .network-graph { 12 .network-graph {
14 - background: #f1f1f1; 13 + background: #FFF;
15 height: 500px; 14 height: 500px;
16 overflow-y: scroll; 15 overflow-y: scroll;
17 overflow-x: hidden; 16 overflow-x: hidden;