deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Mixins are now all with dashes instead of underscores

Browse source 
(there really should be some convention for all gitlab css)
This commit is contained in:
Koen Punt 2012-11-28 00:30:26 +01:00
parent d7e9eda24d
commit 0f31392712
5 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/stylesheets/gitlab_bootstrap/blocks.scss
View file

@ -16,7 +16,7 @@
@extend .prepend-top-20; @extend .prepend-top-20;
@extend .append-bottom-20; @extend .append-bottom-20;
border-width: 1px; border-width: 1px;
@include solid_shade; @include solid-shade;
img { max-width: 100%; } img { max-width: 100%; }
@ -66,7 +66,7 @@
@include border-radius(4px); @include border-radius(4px);
border-color: #CCC; border-color: #CCC;
@include solid_shade; @include solid-shade;
&.white { &.white {
background: #fff; background: #fff;

2
app/assets/stylesheets/gitlab_bootstrap/files.scss
View file

@ -5,7 +5,7 @@
.file_holder { .file_holder {
border: 1px solid #BBB; border: 1px solid #BBB;
margin-bottom: 1em; margin-bottom: 1em;
@include solid_shade; @include solid-shade;
.file_title { .file_title {
border-bottom: 1px solid #bbb; border-bottom: 1px solid #bbb;

2
app/assets/stylesheets/gitlab_bootstrap/tables.scss
View file

@ -1,7 +1,7 @@
table { table {
@extend .table; @extend .table;
@extend .table-striped; @extend .table-striped;
@include solid_shade; @include solid-shade;
border: 1px solid #bbb; border: 1px solid #bbb;
width: 100%; width: 100%;

28
app/assets/stylesheets/mixins.scss
View file

@ -1,16 +1,6 @@
@mixin shade { /**
-moz-box-shadow: 0 0 3px #ddd; * Generic mixins
-webkit-box-shadow: 0 0 3px #ddd; */
box-shadow: 0 0 3px #ddd;
}
@mixin solid_shade {
-moz-box-shadow: 0 0 0 3px #f1f1f1;
-webkit-box-shadow: 0 0 0 3px #f1f1f1;
box-shadow: 0 0 0 3px #f1f1f1;
}
@mixin box-shadow($shadow) { @mixin box-shadow($shadow) {
-webkit-box-shadow: $shadow; -webkit-box-shadow: $shadow;
-moz-box-shadow: $shadow; -moz-box-shadow: $shadow;
@ -34,6 +24,10 @@
background-image: -o-linear-gradient($from, $to); background-image: -o-linear-gradient($from, $to);
} }
/**
* Prefilled mixins
* Mixins with fixed values
*/
@mixin bg-light-gray-gradient { @mixin bg-light-gray-gradient {
background: #f1f1f1; background: #f1f1f1;
background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #f5f5f5), to(#e1e1e1)); background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #f5f5f5), to(#e1e1e1));
@ -56,3 +50,11 @@
background-image: -moz-linear-gradient(#e9e9e9, #d7d7d7); background-image: -moz-linear-gradient(#e9e9e9, #d7d7d7);
background-image: -o-linear-gradient(#e9e9e9, #d7d7d7); background-image: -o-linear-gradient(#e9e9e9, #d7d7d7);
} }
@mixin shade {
@include box-shadow(0 0 3px #ddd);
}
@mixin solid-shade {
@include box-shadow(0 0 0 3px #f1f1f1);
}

2
app/assets/stylesheets/sections/issues.scss
View file

@ -139,7 +139,7 @@ input.check_all_issues {
border: none; border: none;
box-shadow: none; box-shadow: none;
.ui-datepicker-header { .ui-datepicker-header {
@include solid_shade; @include solid-shade;
margin-bottom: 10px; margin-bottom: 10px;
border: 1px solid #bbb; border: 1px solid #bbb;
} }