Skip to content

Commit

Permalink
Merge pull request DevTips#33 from beRoberto/master
Browse files Browse the repository at this point in the history 
Thanks Roberto!!
  • Loading branch information
@travisneilson
travisneilson committed Aug 20, 2014
2 parents 50a5503 + 676c2bb commit eb7795b
Show file tree
Hide file tree
Showing 23 changed files with 51 additions and 51 deletions.
2 changes: 1 addition & 1 deletion _includes/clients.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion _includes/work.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
10 changes: 5 additions & 5 deletions _includes/work/proj-1.html
View file
Original file line number Diff line number Diff line change
@@ -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">
2 changes: 1 addition & 1 deletion _includes/work/proj-2.html
View file
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" />
2 changes: 1 addition & 1 deletion _includes/work/proj-3.html
View file
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" />
2 changes: 1 addition & 1 deletion _includes/work/proj-4.html
View file
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" />
2 changes: 1 addition & 1 deletion _includes/work/proj-5.html
View file
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" />
2 changes: 1 addition & 1 deletion _includes/work/proj-6.html
View file
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" />
10 changes: 5 additions & 5 deletions _includes/work/proj-7.html
View file
Original file line number Diff line number Diff line change
@@ -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">
2 changes: 1 addition & 1 deletion _includes/work/proj-8.html
View file
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" />
2 changes: 1 addition & 1 deletion assets/css/3-sections/_about.sass
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion assets/css/3-sections/_footer.sass
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
footer
@extend %background-image
background-image: url(/assets/img/#{$logo-path}), url(/assets/img/#{$hero-path})
background-image: url(../img/#{$logo-path}), url(../img/#{$hero-path})

.lockup
padding: 50px 30px
Expand Down
2 changes: 1 addition & 1 deletion assets/css/3-sections/_header.sass
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ header
height: 450px
background:
position: 30px 20px, 50% 50%
image: url(/assets/img/#{$logo-path}), url(/assets/img/#{$hero-path})
image: url(../img/#{$logo-path}), url(../img/#{$hero-path})


.logo
Expand Down
25 changes: 12 additions & 13 deletions assets/css/all.sass
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
---
---

/////////////////////// --
// // ----
// Variables // ------
// // ----
/////////////////////// --
/////////////////////// --
// // ----
// Variables // ------
// // ----
/////////////////////// --
//------------------------------------------------
// Transition the image paths from the settings file to usable SASS variables
Expand All @@ -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 }}
Expand All @@ -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'
3 changes: 2 additions & 1 deletion assets/js/functions.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ 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);
});
Expand Down
10 changes: 5 additions & 5 deletions work/proj-1.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion work/proj-2.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion work/proj-3.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion work/proj-4.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion work/proj-5.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion work/proj-6.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
10 changes: 5 additions & 5 deletions work/proj-7.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion work/proj-8.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)

0 comments on commit eb7795b

Please sign in to comment.