Mixins are now all with dashes instead of underscores

 (there really should be some convention for all gitlab css)

5 files changed, 21 insertions, 19 deletions

diff --git a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss
index 251b11e9f87..ecd6cf7e4e8 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss
@@ -16,7 +16,7 @@
   @extend .prepend-top-20;
   @extend .append-bottom-20;
   border-width: 1px;
-  @include solid_shade;
+  @include solid-shade;
 
 
   img { max-width: 100%; }
@@ -66,7 +66,7 @@
   @include border-radius(4px);
   
   border-color: #CCC;
-  @include solid_shade;
+  @include solid-shade;
 
   &.white {
     background: #fff;
diff --git a/app/assets/stylesheets/gitlab_bootstrap/files.scss b/app/assets/stylesheets/gitlab_bootstrap/files.scss
index b392d640c7f..e4924a49456 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/files.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/files.scss
@@ -5,7 +5,7 @@
 .file_holder {
   border: 1px solid #BBB;
   margin-bottom: 1em;
-  @include solid_shade;
+  @include solid-shade;
 
   .file_title {
     border-bottom: 1px solid #bbb;
diff --git a/app/assets/stylesheets/gitlab_bootstrap/tables.scss b/app/assets/stylesheets/gitlab_bootstrap/tables.scss
index e132209901f..5905efd3aae 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/tables.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/tables.scss
@@ -1,7 +1,7 @@
 table {
   @extend .table;
   @extend .table-striped;
-  @include solid_shade;
+  @include solid-shade;
   border: 1px solid #bbb;
   width: 100%;
 
diff --git a/app/assets/stylesheets/mixins.scss b/app/assets/stylesheets/mixins.scss
index 11a8535d257..441a85f3410 100644
--- a/app/assets/stylesheets/mixins.scss
+++ b/app/assets/stylesheets/mixins.scss
@@ -1,17 +1,7 @@
-@mixin shade {
-  -moz-box-shadow: 0 0 3px #ddd;
-  -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) {
+/**
+ * Generic mixins
+ */
+ @mixin box-shadow($shadow) {
   -webkit-box-shadow: $shadow;
   -moz-box-shadow: $shadow;
   -ms-box-shadow: $shadow;
@@ -34,6 +24,10 @@
   background-image: -o-linear-gradient($from, $to);
 }
 
+/**
+ * Prefilled mixins
+ * 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));
@@ -56,3 +50,11 @@
   background-image: -moz-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);
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/sections/issues.scss b/app/assets/stylesheets/sections/issues.scss
index 60b3e32afab..ca1aab44916 100644
--- a/app/assets/stylesheets/sections/issues.scss
+++ b/app/assets/stylesheets/sections/issues.scss
@@ -139,7 +139,7 @@ input.check_all_issues {
   border: none;
   box-shadow: none;
   .ui-datepicker-header {
-    @include solid_shade;
+    @include solid-shade;
     margin-bottom: 10px;
     border: 1px solid #bbb;
   }