kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'mixin-cleanup' into 'master'

Browse source 
Mixin cleanup

* Remove old mixins
* add issue box shadow
* change color for network graph box
This commit is contained in:
Dmitriy Zaporozhets 2014-05-08 20:01:52 +00:00
commit 23ae3911aa
3 changed files with 4 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/stylesheets/generic/issue_box.scss
View file

@ -12,6 +12,7 @@
margin:20px 0; margin:20px 0;
background: #FFF; background: #FFF;
border: 1px solid #EEE; border: 1px solid #EEE;
@include box-shadow(0 1px 1px rgba(0, 0, 0, 0.05));
&.issue-box-closed { &.issue-box-closed {
border-color: #DA4E49; border-color: #DA4E49;

25
app/assets/stylesheets/main/mixins.scss
View file

@ -41,31 +41,6 @@
* Prefilled mixins * Prefilled mixins
* Mixins with fixed values * Mixins with fixed values
*/ */
@mixin bg-light-gray-gradient {
background: #f1f1f1;
background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #f5f5f5), to(#e1e1e1));
background-image: -webkit-linear-gradient(#f5f5f5 6.6%, #e1e1e1);
background-image: -moz-linear-gradient(#f5f5f5 6.6%, #e1e1e1);
background-image: -ms-linear-gradient(#f5f5f5 6.6%, #e1e1e1);
background-image: -o-linear-gradient(#f5f5f5 6.6%, #e1e1e1);
}
@mixin bg-gray-gradient {
background: #eee;
background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf));
background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf);
background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf);
background-image: -ms-linear-gradient(#eee 6.6%, #dfdfdf);
background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf);
}
@mixin bg-dark-gray-gradient {
background: #eee;
background-image: -webkit-linear-gradient(#e9e9e9, #d7d7d7);
background-image: -moz-linear-gradient(#e9e9e9, #d7d7d7);
background-image: -ms-linear-gradient(#e9e9e9, #d7d7d7);
background-image: -o-linear-gradient(#e9e9e9, #d7d7d7);
}
@mixin shade { @mixin shade {
@include box-shadow(0 0 3px #ddd); @include box-shadow(0 0 3px #ddd);

7
app/assets/stylesheets/sections/graph.scss
View file

@ -1,17 +1,16 @@
.project-network { .project-network {
border: 1px solid #aaa; border: 1px solid #CCC;
padding: 1px;
.tip { .tip {
color: #888; color: #888;
font-size: 14px; font-size: 14px;
padding: 10px; padding: 10px;
border-bottom: 1px solid #bbb; border-bottom: 1px solid #bbb;
@include bg-gray-gradient; background: #EEE;
} }
.network-graph { .network-graph {
background: #f1f1f1; background: #FFF;
height: 500px; height: 500px;
overflow-y: scroll; overflow-y: scroll;
overflow-x: hidden; overflow-x: hidden;