Skip to content

Commit

Permalink
Merged all accent color and generate them automatically.
Browse files Browse the repository at this point in the history
  • Loading branch information
Niklas Ravnsborg-Gjertsen authored and niklasravnsborg committed Feb 13, 2015
1 parent 661e564 commit 77292d4
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 28 deletions.
9 changes: 3 additions & 6 deletions _data/layout.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,8 @@ avatar: "travitar.jpg"
# Colors

accent: "#c99065"
accent-light: "#e1c184"
bgcolor: "#e5eaee"

documentBackgroundColor: "#fff"
headlineColor: "#333"
textColor: "#666"
linkColor: "#c99065"
selectionColor: "#ffff9e"
headlineColor: "#333"
bgcolor: "#e5eaee"
documentBackgroundColor: "#fff"
4 changes: 2 additions & 2 deletions assets/css/2-base/_base.sass
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ hr
/* Links
------------------------------------ */
a
color: $linkColor
color: $accent
text-decoration: none
outline: 0

a:hover, a:focus
color: lighten($linkColor, 20%)
color: lighten($accent, 20%)



Expand Down
27 changes: 7 additions & 20 deletions assets/css/all.sass
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
---
---

///////////////////////
//
// Variables
//
///////////////////////
@import '1-tools/-tools-dir'

//------------------------------------------------
// Transition the image paths from the settings file to usable SASS variables
Expand All @@ -20,22 +16,13 @@ $projects: {% for project in site.data.settings.projects %} "{{ project.folder }
// Set some colors as sass variables
$accent: {{ site.data.layout.accent }}
$accent-light: {{ site.data.layout.accent-light }}
$bgcolor: {{ site.data.layout.bgcolor }}
$accent-light: adjust-hue(saturate(lighten($accent, 11%), 12.6%), 14%)
$selectionColor: lighten($accent, 30%)

$documentBackgroundColor: {{ site.data.layout.documentBackgroundColor }}
$headlineColor: {{ site.data.layout.headlineColor }}
$textColor: {{ site.data.layout.textColor }}
$linkColor: {{ site.data.layout.linkColor }}
$selectionColor: {{ site.data.layout.selectionColor }}


///////////////////////////
//
// SASS IMPORTS
//
///////////////////////////
$headlineColor: {{ site.data.layout.headlineColor }}
$bgcolor: {{ site.data.layout.bgcolor }}
$documentBackgroundColor: {{ site.data.layout.documentBackgroundColor }}

@import '1-tools/-tools-dir'
@import '2-base/-base-dir'
@import '3-sections/-sections-dir'
@import '3-sections/-sections-dir'

0 comments on commit 77292d4

Please sign in to comment.