Skip to content

Commit

Permalink
Merge branch 'feature/convert-code-to-each-loop' into develop
Browse files Browse the repository at this point in the history
* feature/convert-code-to-each-loop:
  Bumped version
  Converted code to @each loop
  • Loading branch information
kedano committed Jul 13, 2015
2 parents 23ac09f + 18b69c3 commit 5c7f651
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 21 deletions.
30 changes: 11 additions & 19 deletions app/assets/sass/colors.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@import '../../../vendor/sass-mq/mq';


$c-black: #000;
$c-white: #fff;
$c-pink: #D77869;
Expand All @@ -10,29 +9,22 @@ $c-warmgrey:#A396A3;
$c-purple:#347E84;
$c-aquablue:#C8C2BE;

.c-black {color:$c-black;}

.c-white {color:$c-white;}

.c-pink {color:$c-pink}

.c-seagreen {color:$c-seagreen;}

.c-lightwarmgrey {color:$c-lightwarmgrey;}

.c-warmgrey {color:$c-warmgrey;}

.c-purple {color:$c-purple;}
$array: (black, $c-black), (white, $c-white), (pink, $c-pink), (seagreen, $c-seagreen), (lightwarmgrey, $c-lightwarmgrey), (warmgrey, $c-warmgrey), (purple, $c-purple), (aquablue, $c-aquablue);

.c-aquablue {color:$c-aquablue;}
@each $colorname, $colorvalue in $array{
.c-#{$colorname}{
color: $colorvalue;
}
}

.c-bg-black {background-color:$c-black;}

.c-bg-white {background-color:$c-white;}
@each $colorname, $colorvalue in $array{
.c-bg-#{$colorname}{
background-color: $colorvalue;
}
}

.c-bg-pink {background-color:$c-pink}

.c-bg-seagreen {background-color:$c-seagreen;}

.c-bg-lightwarmgrey {background-color:$c-lightwarmgrey;}

Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "colors",
"version": "1.0.0-beta.1",
"version": "1.0.0-beta.2",
"homepage": "https://github.com/hiof/colors",
"authors": [
"Kenneth Dahlstrøm <[email protected]>"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "colors",
"version": "1.0.0-beta.1",
"version": "1.0.0-beta.2",
"author": "HiØ, Kenneth Dahlstrøm <[email protected]>",
"repository": {
"type": "git",
Expand Down

0 comments on commit 5c7f651

Please sign in to comment.