Updated change absolute paths to relative paths

Fixed conflicts and typo in work/proj-3.md
enq89 · Aug 20, 2014 · 676c2bb · 676c2bb
1 parent f5ac2ca
commit 676c2bb
Show file tree

Hide file tree

Showing 21 changed files with 48 additions and 49 deletions.
diff --git a/_includes/clients.html b/_includes/clients.html
@@ -42,7 +42,7 @@ <h3 id="clients">Clients</h3>
 
   <div class="clients-logos">
     {% for client in site.data.settings.clients %}
-    <img class="client-logo" src="/assets/img/clients/{{ client.logo }}" align="{{ client.logo }}">
+    <img class="client-logo" src="assets/img/clients/{{ client.logo }}" align="{{ client.logo }}">
     {% endfor %}
   </div>
 

diff --git a/_includes/work.html b/_includes/work.html
@@ -13,7 +13,7 @@ <h3 id="work">Work</h3>
       <div class="thumb-container">
       {% for project in site.data.settings.projects %}
       <label for="{{ project.folder }}">  
-        <div class="thumb-unit" data-folder="{{ project.folder }}" style="background-image: url(/assets/img/work/{{project.folder}}/thumb.jpg);"> 
+        <div class="thumb-unit" data-folder="{{ project.folder }}" style="background-image: url(assets/img/work/{{project.folder}}/thumb.jpg);"> 
           <div class="thumb-overlay">
             <strong>{{ project.name }}</strong>
           </div>

diff --git a/_includes/work/proj-1.html b/_includes/work/proj-1.html
@@ -1,8 +1,8 @@
-<img src="/assets/img/work/proj-1/img1.jpg" alt="Typo International">
+<img src="assets/img/work/proj-1/img1.jpg" alt="Typo International">
 
 <p>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.</p>
 
-<img src="/assets/img/work/proj-1/img2.jpg" alt="Typo International">
-<img src="/assets/img/work/proj-1/img3.jpg" alt="Typo International">
-<img src="/assets/img/work/proj-1/img4.jpg" alt="Typo International">
-<img src="/assets/img/work/proj-1/img5.jpg" alt="Typo International">
+<img src="assets/img/work/proj-1/img2.jpg" alt="Typo International">
+<img src="assets/img/work/proj-1/img3.jpg" alt="Typo International">
+<img src="assets/img/work/proj-1/img4.jpg" alt="Typo International">
+<img src="assets/img/work/proj-1/img5.jpg" alt="Typo International">
diff --git a/_includes/work/proj-2.html b/_includes/work/proj-2.html
@@ -1 +1 @@
-<img src="/assets/img/work/proj-2/CityIn-AntonSkvortsov.jpg" alt="City In" />
+<img src="assets/img/work/proj-2/CityIn-AntonSkvortsov.jpg" alt="City In" />
diff --git a/_includes/work/proj-3.html b/_includes/work/proj-3.html
@@ -1 +1 @@
-<img src="/assets/img/work/proj-3/CrispyIcons-PetrasNargela.jpg" alt="Crispy Icons" />
+<img src="assets/img/work/proj-3/CrispyIcons-PetrasNargela.jpg" alt="Crispy Icons" />
diff --git a/_includes/work/proj-4.html b/_includes/work/proj-4.html
@@ -1 +1 @@
-<img src="/assets/img/work/proj-4/flatmobile-AyoubElred.jpg" alt="Flat Mobile UX" />
+<img src="assets/img/work/proj-4/flatmobile-AyoubElred.jpg" alt="Flat Mobile UX" />
diff --git a/_includes/work/proj-5.html b/_includes/work/proj-5.html
@@ -1 +1 @@
-<img src="/assets/img/work/proj-5/freshitup-JieyuXiong.jpg" alt="Fersh It Up" />
+<img src="assets/img/work/proj-5/freshitup-JieyuXiong.jpg" alt="Fersh It Up" />
diff --git a/_includes/work/proj-6.html b/_includes/work/proj-6.html
@@ -1 +1 @@
-<img src="/assets/img/work/proj-6/TimeLinePage-SergeyValiukh.jpg" alt="Time Line Page" />
+<img src="assets/img/work/proj-6/TimeLinePage-SergeyValiukh.jpg" alt="Time Line Page" />
diff --git a/_includes/work/proj-7.html b/_includes/work/proj-7.html
@@ -1,5 +1,5 @@
-<img src="/assets/img/work/proj-7/img0.jpg" alt="Weather Dashboard">
-<img src="/assets/img/work/proj-7/img1.jpg" alt="Weather Dashboard">
-<img src="/assets/img/work/proj-7/img2.jpg" alt="Weather Dashboard">
-<img src="/assets/img/work/proj-7/img3.jpg" alt="Weather Dashboard">
-<img src="/assets/img/work/proj-7/img4.jpg" alt="Weather Dashboard">
+<img src="assets/img/work/proj-7/img0.jpg" alt="Weather Dashboard">
+<img src="assets/img/work/proj-7/img1.jpg" alt="Weather Dashboard">
+<img src="assets/img/work/proj-7/img2.jpg" alt="Weather Dashboard">
+<img src="assets/img/work/proj-7/img3.jpg" alt="Weather Dashboard">
+<img src="assets/img/work/proj-7/img4.jpg" alt="Weather Dashboard">
diff --git a/_includes/work/proj-8.html b/_includes/work/proj-8.html
@@ -1 +1 @@
-<img src="/assets/img/work/proj-8/stripes-co-NickZoutendijk.jpg" alt="Stripes & Co" />
+<img src="assets/img/work/proj-8/stripes-co-NickZoutendijk.jpg" alt="Stripes & Co" />
diff --git a/assets/css/3-sections/_about.sass b/assets/css/3-sections/_about.sass
@@ -9,7 +9,7 @@
     border-radius: 50%
     background-size: cover
     background-position: center
-    background-image: url(/assets/img/#{$avatar-path})
+    background-image: url(../img/#{$avatar-path})
     +size(200px)
     +order(3)
 

diff --git a/assets/css/all.sass b/assets/css/all.sass
@@ -1,11 +1,11 @@
 ---
 ---
 
-///////////////////////  --
-//                   //  ----
-//      Variables    //  ------
-//                   //  ----
-///////////////////////  --
+/////////////////////// --
+// // ----
+// Variables // ------
+// // ----
+/////////////////////// --
 
 //------------------------------------------------
 // Transition the image paths from the settings file to usable SASS variables
@@ -17,7 +17,7 @@ $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 
+// Set some colors as sass variables
 
 $accent: {{ site.data.layout.accent }}
 $accent-light: {{ site.data.layout.accent-light }}
@@ -30,13 +30,12 @@ $linkColor: {{ site.data.layout.linkColor }}
 $selectionColor: {{ site.data.layout.selectionColor }}
 
 
-///////////////////////////  --
-//                       //  ----
-//      SASS IMPORTS     //  ------
-//                       //  ----
-///////////////////////////  --
+/////////////////////////// --
+// // ----
+// SASS IMPORTS // ------
+// // ----
+/////////////////////////// --
 
 @import '1-tools/-tools-dir'
 @import '2-base/-base-dir'
-@import '3-sections/-sections-dir'
-
+@import '3-sections/-sections-dir'
diff --git a/assets/js/functions.js b/assets/js/functions.js
@@ -50,7 +50,7 @@ function  workLoad() {
         newTitle = $this.find('strong').text(),
         newfolder = $this.data('folder'),
         spinner = '<div class="loader">Loading...</div>',
-        newHTML = '/work/'+ newfolder;
+        newHTML = 'work/'+ newfolder;
 
     $('.project-load').html(spinner).load(newHTML);
     $('.project-title').text(newTitle);

diff --git a/work/proj-1.md b/work/proj-1.md
@@ -2,11 +2,11 @@
 title: Typo International Design Talks Stuff
 ---
 
-![Typo International](/assets/img/work/proj-1/img1.jpg)
+![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)
+![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.md b/work/proj-2.md
@@ -2,4 +2,4 @@
 title: City In Website Concept
 ---
 
-![City In](/assets/img/work/proj-2/CityIn-AntonSkvortsov.jpg)
+![City In](assets/img/work/proj-2/CityIn-AntonSkvortsov.jpg)
diff --git a/work/proj-3.md b/work/proj-3.md
@@ -2,4 +2,4 @@
 title: Crispy Icons
 ---
 
-![Crispy Icons](/assets/img/work/proj-3/CrispyIcons-PetrasNargėla.jpg)
+![Crispy Icons](assets/img/work/proj-3/CrispyIcons-PetrasNargela.jpg)
diff --git a/work/proj-4.md b/work/proj-4.md
@@ -2,4 +2,4 @@
 title: Flat Mobile UI/UX Concept
 ---
 
-![Flat Mobile UI/UX Concept](/assets/img/work/proj-4/flatmobile-AyoubElred.jpg)
+![Flat Mobile UI/UX Concept](assets/img/work/proj-4/flatmobile-AyoubElred.jpg)
diff --git a/work/proj-5.md b/work/proj-5.md
@@ -2,4 +2,4 @@
 title: Fresh It Up
 ---
 
-![Fresh It Up](/assets/img/work/proj-5/freshitup-JieyuXiong.jpg)
+![Fresh It Up](assets/img/work/proj-5/freshitup-JieyuXiong.jpg)
diff --git a/work/proj-6.md b/work/proj-6.md
@@ -2,4 +2,4 @@
 title: Timeline Page
 ---
 
-![Timeline Page](/assets/img/work/proj-6/TimeLinePage-SergeyValiukh.jpg)
+![Timeline Page](assets/img/work/proj-6/TimeLinePage-SergeyValiukh.jpg)
diff --git a/work/proj-7.md b/work/proj-7.md
@@ -2,8 +2,8 @@
 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)
+![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.md b/work/proj-8.md
@@ -2,4 +2,4 @@
 title: "Stripes & Co"
 ---
 
-![Stripes & Co](/assets/img/work/proj-8/stripes-co-NickZoutendijk.jpg)
+![Stripes & Co](assets/img/work/proj-8/stripes-co-NickZoutendijk.jpg)
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<img src="/assets/img/work/proj-2/CityIn-AntonSkvortsov.jpg" alt="City In" />
		<img src="assets/img/work/proj-2/CityIn-AntonSkvortsov.jpg" alt="City In" />
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<img src="/assets/img/work/proj-3/CrispyIcons-PetrasNargela.jpg" alt="Crispy Icons" />
		<img src="assets/img/work/proj-3/CrispyIcons-PetrasNargela.jpg" alt="Crispy Icons" />
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<img src="/assets/img/work/proj-4/flatmobile-AyoubElred.jpg" alt="Flat Mobile UX" />
		<img src="assets/img/work/proj-4/flatmobile-AyoubElred.jpg" alt="Flat Mobile UX" />
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<img src="/assets/img/work/proj-5/freshitup-JieyuXiong.jpg" alt="Fersh It Up" />
		<img src="assets/img/work/proj-5/freshitup-JieyuXiong.jpg" alt="Fersh It Up" />
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<img src="/assets/img/work/proj-6/TimeLinePage-SergeyValiukh.jpg" alt="Time Line Page" />
		<img src="assets/img/work/proj-6/TimeLinePage-SergeyValiukh.jpg" alt="Time Line Page" />
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<img src="/assets/img/work/proj-8/stripes-co-NickZoutendijk.jpg" alt="Stripes & Co" />
		<img src="assets/img/work/proj-8/stripes-co-NickZoutendijk.jpg" alt="Stripes & Co" />