Update to jekyll 2.3.0

MooGusta · Aug 17, 2014 · 4c0d646 · 4c0d646
1 parent d25e21d
commit 4c0d646
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 17 deletions.
diff --git a/_data/layout.yml b/_data/layout.yml
@@ -0,0 +1,21 @@
+# Layout settings
+
+animation: "bounceOut"
+
+# Images
+
+logo: "logo.svg"
+hero: "hero-bg.jpg"
+avatar: "travitar.jpg"
+
+# Colors
+
+accent: "#c99065"
+accent-light: "#e1c184"
+bgcolor: "#e5eaee"
+
+documentBackgroundColor: "#fff"
+headlineColor: "#333"
+textColor: "#666"
+linkColor: "#c99065"
+selectionColor: "#ffff9e"
diff --git a/assets/css/all.sass b/assets/css/all.sass
@@ -3,35 +3,31 @@
 
 ///////////////////////  --
 //                   //  ----
-//      SETTINGS     //  ------
+//      Variables    //  ------
 //                   //  ----
 ///////////////////////  --
 
 //------------------------------------------------
 // Transition the image paths from the settings file to usable SASS variables
-$animation: "bounceOut" 
-$logo-path: 'logo.svg'
-$hero-path: 'hero-bg.jpg'
-$avatar-path: 'travitar.jpg'
+$animation: {{ site.data.layout.animation }}
+$logo-path: '{{ site.data.layout.logo }}'
+$hero-path: '{{ site.data.layout.hero }}'
+$avatar-path: '{{ site.data.layout.avatar }}'
 
 $projects: "proj-1", "proj-2", "proj-3", "proj-4", "proj-5", "proj-6", "proj-7", "proj-8"
 
 //------------------------------------------------
 // Set some colors as sass variables 
 
-$accent: #c99065
-$accent-light: #e1c184
-$bgcolor: #e5eaee
-
-$documentBackgroundColor: #fff
-$headlineColor: #333
-$textColor: #666
-$linkColor: $accent
-$selectionColor: rgb(255,255,158)
-
-
-
+$accent: {{ site.data.layout.accent }}
+$accent-light: {{ site.data.layout.accent-light }}
+$bgcolor: {{ site.data.layout.bgcolor }}
 
+$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 }}
 
 
 ///////////////////////////  --