Merge branch 'master' of https://github.com/DevTips/Artists-Theme

enq89 · Aug 20, 2014 · 316e1c9 · 316e1c9
2 parents ed10afd + dece463
commit 316e1c9
Show file tree

Hide file tree

Showing 36 changed files with 105 additions and 50 deletions.
diff --git a/_config.yml b/_config.yml
@@ -6,6 +6,7 @@ permalink: pretty
 port: 8000
 
 include: ['_includes/work']
+exclude: ['the_design.psd']
 
 sass:
   sass_dir: assets/css

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/1-tools/spinner.scss → assets/css/1-tools/_spinner.scss b/assets/css/1-tools/spinner.scss → assets/css/1-tools/_spinner.scss
diff --git a/assets/css/1-tools/animations/_animations-dir.sass b/assets/css/1-tools/animations/_animations-dir.sass
@@ -1,11 +1,11 @@
-@import 'bounceOut/bounceOut'
-@import 'fadeIn/fadeIn'
-@import 'bottomUp/bottomUp'
-@import 'none/none'
-@import 'topDown/topDown'
-@import 'bottomDoor/bottomDoor'
-@import 'topDoor/topDoor'
-@import 'leftRight/leftRight'
-@import 'rightLeft/rightLeft'
-@import 'backgroundIn/backgroundIn'
-@import 'textSlide/textSlide'
+@import 'bounceOut'
+@import 'fadeIn'
+@import 'bottomUp'
+@import 'none'
+@import 'topDown'
+@import 'bottomDoor'
+@import 'topDoor'
+@import 'leftRight'
+@import 'rightLeft'
+@import 'backgroundIn'
+@import 'textSlide'
diff --git a/...animations/backgroundIn/backgroundIn.sass → ...css/1-tools/animations/_backgroundIn.sass b/...animations/backgroundIn/backgroundIn.sass → ...css/1-tools/animations/_backgroundIn.sass
diff --git a/...ols/animations/bottomDoor/bottomDoor.sass → ...s/css/1-tools/animations/_bottomDoor.sass b/...ols/animations/bottomDoor/bottomDoor.sass → ...s/css/1-tools/animations/_bottomDoor.sass
diff --git a/...1-tools/animations/bottomUp/bottomUp.sass → assets/css/1-tools/animations/_bottomUp.sass b/...1-tools/animations/bottomUp/bottomUp.sass → assets/css/1-tools/animations/_bottomUp.sass
diff --git a/...tools/animations/bounceOut/bounceOut.scss → ...ts/css/1-tools/animations/_bounceOut.scss b/...tools/animations/bounceOut/bounceOut.scss → ...ts/css/1-tools/animations/_bounceOut.scss
diff --git a/...css/1-tools/animations/fadeIn/fadeIn.sass → assets/css/1-tools/animations/_fadeIn.sass b/...css/1-tools/animations/fadeIn/fadeIn.sass → assets/css/1-tools/animations/_fadeIn.sass
diff --git a/...tools/animations/leftRight/leftRight.sass → ...ts/css/1-tools/animations/_leftRight.sass b/...tools/animations/leftRight/leftRight.sass → ...ts/css/1-tools/animations/_leftRight.sass
diff --git a/assets/css/1-tools/animations/none/none.sass → assets/css/1-tools/animations/_none.sass b/assets/css/1-tools/animations/none/none.sass → assets/css/1-tools/animations/_none.sass
diff --git a/...tools/animations/rightLeft/rightLeft.sass → ...ts/css/1-tools/animations/_rightLeft.sass b/...tools/animations/rightLeft/rightLeft.sass → ...ts/css/1-tools/animations/_rightLeft.sass
diff --git a/...tools/animations/textSlide/textSlide.sass → ...ts/css/1-tools/animations/_textSlide.sass b/...tools/animations/textSlide/textSlide.sass → ...ts/css/1-tools/animations/_textSlide.sass
diff --git a/...s/1-tools/animations/topDoor/topDoor.sass → assets/css/1-tools/animations/_topDoor.sass b/...s/1-tools/animations/topDoor/topDoor.sass → assets/css/1-tools/animations/_topDoor.sass
diff --git a/...s/1-tools/animations/topDown/topDown.sass → assets/css/1-tools/animations/_topDown.sass b/...s/1-tools/animations/topDown/topDown.sass → assets/css/1-tools/animations/_topDown.sass
diff --git a/assets/css/3-sections/_about.sass b/assets/css/3-sections/_about.sass
@@ -7,6 +7,8 @@
 
   .face-img
     border-radius: 50%
+    background-size: cover
+    background-position: center
     background-image: url(/assets/img/#{$avatar-path})
     +size(200px)
     +order(3)

diff --git a/assets/css/3-sections/clients.sass → assets/css/3-sections/_clients.sass b/assets/css/3-sections/clients.sass → assets/css/3-sections/_clients.sass
diff --git a/assets/css/3-sections/_work.sass b/assets/css/3-sections/_work.sass
@@ -28,6 +28,9 @@
   left: 0%
   +transition(all, 800ms)
 
+  &.slided
+    +transform(translate3d(-50%, 0, 0))
+
 .thumb-wrap, .work-wrap
   width: 50%
   float: left

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 }}
 
 
 ///////////////////////////  --

diff --git a/assets/js/functions.js b/assets/js/functions.js
@@ -29,12 +29,12 @@ function workBelt() {
   $(".return").remove();
 
   $('.thumb-unit').click(function() {
-    $('.work-belt').css('left','-100%');
+    $('.work-belt').addClass("slided");
     $('.work-container').show();
   });
 
   $('.work-return').click(function() {
-    $('.work-belt').css('left','0%');
+    $('.work-belt').removeClass("slided");
     $('.work-container').hide(800);
   });
 
@@ -50,7 +50,7 @@ function  workLoad() {
         newTitle = $this.find('strong').text(),
         newfolder = $this.data('folder'),
         spinner = '<div class="loader">Loading...</div>',
-        newHTML = '/work/'+ newfolder +'.html';
+        newHTML = '/work/'+ newfolder;
     $('.project-load').html(spinner).load(newHTML);
     $('.project-title').text(newTitle);
   });

diff --git a/work/proj-1.html b/work/proj-1.html
diff --git a/work/proj-1.md b/work/proj-1.md
@@ -0,0 +1,12 @@
+---
+title: Typo International Design Talks Stuff
+---
+
+![Typo International](/assets/img/work/proj-1/img1.jpg)
+
+TYPO: International Design Talks is an annual event held in Berlin, London, and San Francisco. This promotional project is developed to market the event for the designindustry. The use of patterns, sophisticated color scheme and typography are applied for the print and mobile application.
+
+![Typo International](/assets/img/work/proj-1/img2.jpg)
+![Typo International](/assets/img/work/proj-1/img3.jpg)
+![Typo International](/assets/img/work/proj-1/img4.jpg)
+![Typo International](/assets/img/work/proj-1/img5.jpg)
diff --git a/work/proj-2.html b/work/proj-2.html
diff --git a/work/proj-2.md b/work/proj-2.md
@@ -0,0 +1,5 @@
+---
+title: City In Website Concept
+---
+
+![City In](/assets/img/work/proj-2/CityIn-AntonSkvortsov.jpg)
diff --git a/work/proj-3.html b/work/proj-3.html
diff --git a/work/proj-3.md b/work/proj-3.md
@@ -0,0 +1,5 @@
+---
+title: Crispy Icons
+---
+
+![Crispy Icons](/assets/img/work/proj-3/CrispyIcons-PetrasNargėla.jpg)
diff --git a/work/proj-4.html b/work/proj-4.html
diff --git a/work/proj-4.md b/work/proj-4.md
@@ -0,0 +1,5 @@
+---
+title: Flat Mobile UI/UX Concept
+---
+
+![Flat Mobile UI/UX Concept](/assets/img/work/proj-4/flatmobile-AyoubElred.jpg)
diff --git a/work/proj-5.html b/work/proj-5.html
diff --git a/work/proj-5.md b/work/proj-5.md
@@ -0,0 +1,5 @@
+---
+title: Fresh It Up
+---
+
+![Fresh It Up](/assets/img/work/proj-5/freshitup-JieyuXiong.jpg)
diff --git a/work/proj-6.html b/work/proj-6.html
diff --git a/work/proj-6.md b/work/proj-6.md
@@ -0,0 +1,5 @@
+---
+title: Timeline Page
+---
+
+![Timeline Page](/assets/img/work/proj-6/TimeLinePage-SergeyValiukh.jpg)
diff --git a/work/proj-7.html b/work/proj-7.html
diff --git a/work/proj-7.md b/work/proj-7.md
@@ -0,0 +1,9 @@
+---
+title: Weather Dashboard
+---
+
+![Weather Dashboard](/assets/img/work/proj-7/img0.jpg)
+![Weather Dashboard](/assets/img/work/proj-7/img1.jpg)
+![Weather Dashboard](/assets/img/work/proj-7/img2.jpg)
+![Weather Dashboard](/assets/img/work/proj-7/img3.jpg)
+![Weather Dashboard](/assets/img/work/proj-7/img4.jpg)
diff --git a/work/proj-8.html b/work/proj-8.html
diff --git a/work/proj-8.md b/work/proj-8.md
@@ -0,0 +1,5 @@
+---
+title: "Stripes & Co"
+---
+
+![Stripes & Co](/assets/img/work/proj-8/stripes-co-NickZoutendijk.jpg)