Permalink
Browse files

Merge pull request #35 from robertwijas/master

Custom colors
  • Loading branch information...
2 parents 9a9de06 + 0e9641a commit 2cc927dd8c198e7fa0de977e9143c317be16b08b @tommy351 committed Dec 29, 2012
Showing with 16 additions and 7 deletions.
  1. +7 −7 sass/base/_color.scss
  2. +7 −0 sass/custom/_color.scss
  3. +2 −0 sass/screen.scss
View
@@ -1,7 +1,7 @@
-$color-background: #eee;
-$color-main: #258fb8;
-$color-gray01: #666;
-$color-gray02: #999;
-$color-gray03: #ccc;
-$color-gray04: #ddd;
-$color-gray05: #fff;
+$color-background: #eee !default;
+$color-main: #258fb8 !default;
+$color-gray01: #666 !default;
+$color-gray02: #999 !default;
+$color-gray03: #ccc !default;
+$color-gray04: #ddd !default;
+$color-gray05: #fff !default;
View
@@ -0,0 +1,7 @@
+// $color-background: #eee;
+// $color-main: #258fb8;
+// $color-gray01: #666;
+// $color-gray02: #999;
+// $color-gray03: #ccc;
+// $color-gray04: #ddd;
+// $color-gray05: #fff;
View
@@ -1,5 +1,7 @@
@import "compass";
+@import "custom/color";
+
@import "base";
@import "parts";
@import "plugins";

0 comments on commit 2cc927d

Please sign in to comment.