Skip to content

Commit

Permalink
colors
Browse files Browse the repository at this point in the history
  • Loading branch information
nonlinear committed Jan 17, 2015
1 parent 2c2f94f commit a214653
Show file tree
Hide file tree
Showing 12 changed files with 128 additions and 128 deletions.
8 changes: 4 additions & 4 deletions SASS/style.sublime-snippet
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
\$gap-1: ${5:10px};
// Colors
\$color-bg: ${6:white};
\$color-primary: ${7:black};
\$color-secondary: ${8:grey};
\$color-tertiary: ${9:red};
\$color-0: ${6:white};
\$color-1: ${7:black};
\$color-2: ${8:grey};
\$color-4: ${9:red};
\$color-4: ${10:green};
\$color-5: ${11:blue};
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
6 changes: 3 additions & 3 deletions assets/stylesheets/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ $gap-20: $gap-1 * 20;

h1, h2, h3, h4 {
font-family: $font-title;
bg-color: $color-bg;
color: $color-primary;
bg-color: $color-0;
color: $color-1;
}

body {
Expand All @@ -38,7 +38,7 @@ body {
}

a {
color: $color-secondary;
color: $color-2;
-webkit-transition: all 300ms ease-out;
-moz-transition: all 300ms ease-out;
-ms-transition: all 300ms ease-out;
Expand Down
56 changes: 28 additions & 28 deletions assets/stylesheets/_colortest.scss
Original file line number Diff line number Diff line change
Expand Up @@ -86,96 +86,96 @@
}
&:first-of-type {
.cell:first-of-type li {
background-color: $color-bg;
background-color: $color-0;
}
.cell:nth-of-type(2) {
@include colortest(light, $color-bg);
@include colortest(light, $color-0);
}
.cell:nth-of-type(3) {
@include colortest(dark, $color-bg);
@include colortest(dark, $color-0);
}
.cell:nth-of-type(4) {
@include colortest(complementary, $color-bg);
@include colortest(complementary, $color-0);
}
.cell:nth-of-type(5) {
@include colortest(triad, $color-bg);
@include colortest(triad, $color-0);
}
.cell:nth-of-type(6) {
@include colortest(analogous, $color-bg);
@include colortest(analogous, $color-0);
}
.cell:nth-of-type(7) {
@include colortest(split, $color-bg);
@include colortest(split, $color-0);
}
}
&:nth-of-type(2) {
.cell:first-of-type li {
background-color: $color-primary;
background-color: $color-1;
}
.cell:nth-of-type(2) {
@include colortest(light, $color-primary);
@include colortest(light, $color-1);
}
.cell:nth-of-type(3) {
@include colortest(dark, $color-primary);
@include colortest(dark, $color-1);
}
.cell:nth-of-type(4) {
@include colortest(complementary, $color-primary);
@include colortest(complementary, $color-1);
}
.cell:nth-of-type(5) {
@include colortest(triad, $color-primary);
@include colortest(triad, $color-1);
}
.cell:nth-of-type(6) {
@include colortest(analogous, $color-primary);
@include colortest(analogous, $color-1);
}
.cell:nth-of-type(7) {
@include colortest(split, $color-primary);
@include colortest(split, $color-1);
}
}

&:nth-of-type(3) {
.cell:first-of-type li {
background-color: $color-secondary;
background-color: $color-2;
}
.cell:nth-of-type(2) {
@include colortest(light, $color-secondary);
@include colortest(light, $color-2);
}
.cell:nth-of-type(3) {
@include colortest(dark, $color-secondary);
@include colortest(dark, $color-2);
}
.cell:nth-of-type(4) {
@include colortest(complementary, $color-secondary);
@include colortest(complementary, $color-2);
}
.cell:nth-of-type(5) {
@include colortest(triad, $color-secondary);
@include colortest(triad, $color-2);
}
.cell:nth-of-type(6) {
@include colortest(analogous, $color-secondary);
@include colortest(analogous, $color-2);
}
.cell:nth-of-type(7) {
@include colortest(split, $color-secondary);
@include colortest(split, $color-2);
}
}

&:nth-of-type(4) {
.cell:first-of-type li {
background-color: $color-tertiary;
background-color: $color-4;
}
.cell:nth-of-type(2) {
@include colortest(light, $color-tertiary);
@include colortest(light, $color-4);
}
.cell:nth-of-type(3) {
@include colortest(dark, $color-tertiary);
@include colortest(dark, $color-4);
}
.cell:nth-of-type(4) {
@include colortest(complementary, $color-tertiary);
@include colortest(complementary, $color-4);
}
.cell:nth-of-type(5) {
@include colortest(triad, $color-tertiary);
@include colortest(triad, $color-4);
}
.cell:nth-of-type(6) {
@include colortest(analogous, $color-tertiary);
@include colortest(analogous, $color-4);
}
.cell:nth-of-type(7) {
@include colortest(split, $color-tertiary);
@include colortest(split, $color-4);
}
}

Expand Down
2 changes: 1 addition & 1 deletion assets/stylesheets/style.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/stylesheets/style.css.map

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions assets/stylesheets/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ $font-icon: FontAwesome;
$gap-1: 10px;

// Colors
$color-bg: violet;
$color-primary: green;
$color-secondary: #666;
$color-tertiary: brown;
$color-0: violet;
$color-1: green;
$color-2: #666;
$color-4: brown;
$color-4: red;
$color-5: blue;

Expand Down
Loading

0 comments on commit a214653

Please sign in to comment.