From eff0fcae54c20883119dcf67b36102e13a62b9b8 Mon Sep 17 00:00:00 2001 From: Mike Francis Date: Thu, 4 Jul 2013 22:35:55 +0100 Subject: [PATCH] Merge branch 'master' of https://github.com/mikefrancis/barebones --- {_/js => js}/jquery.min.js | 0 {_/js => js}/script.js | 0 {_/scss => scss}/_vars.scss | 0 {_/scss => scss}/generic/_mixins.scss | 0 {_/scss => scss}/generic/_normalise.scss | 0 {_/scss => scss}/generic/_reset.scss | 0 {_/scss => scss}/generic/_utilities.scss | 0 {_/scss => scss}/objects/_forms.scss | 0 {_/scss => scss}/objects/_nav.scss | 0 {_/scss => scss}/objects/_scaffolding.scss | 0 {_/scss => scss}/objects/_tables.scss | 0 {_/scss => scss}/style.scss | 0 12 files changed, 0 insertions(+), 0 deletions(-) rename {_/js => js}/jquery.min.js (100%) rename {_/js => js}/script.js (100%) rename {_/scss => scss}/_vars.scss (100%) rename {_/scss => scss}/generic/_mixins.scss (100%) rename {_/scss => scss}/generic/_normalise.scss (100%) rename {_/scss => scss}/generic/_reset.scss (100%) rename {_/scss => scss}/generic/_utilities.scss (100%) rename {_/scss => scss}/objects/_forms.scss (100%) rename {_/scss => scss}/objects/_nav.scss (100%) rename {_/scss => scss}/objects/_scaffolding.scss (100%) rename {_/scss => scss}/objects/_tables.scss (100%) rename {_/scss => scss}/style.scss (100%) diff --git a/_/js/jquery.min.js b/js/jquery.min.js similarity index 100% rename from _/js/jquery.min.js rename to js/jquery.min.js diff --git a/_/js/script.js b/js/script.js similarity index 100% rename from _/js/script.js rename to js/script.js diff --git a/_/scss/_vars.scss b/scss/_vars.scss similarity index 100% rename from _/scss/_vars.scss rename to scss/_vars.scss diff --git a/_/scss/generic/_mixins.scss b/scss/generic/_mixins.scss similarity index 100% rename from _/scss/generic/_mixins.scss rename to scss/generic/_mixins.scss diff --git a/_/scss/generic/_normalise.scss b/scss/generic/_normalise.scss similarity index 100% rename from _/scss/generic/_normalise.scss rename to scss/generic/_normalise.scss diff --git a/_/scss/generic/_reset.scss b/scss/generic/_reset.scss similarity index 100% rename from _/scss/generic/_reset.scss rename to scss/generic/_reset.scss diff --git a/_/scss/generic/_utilities.scss b/scss/generic/_utilities.scss similarity index 100% rename from _/scss/generic/_utilities.scss rename to scss/generic/_utilities.scss diff --git a/_/scss/objects/_forms.scss b/scss/objects/_forms.scss similarity index 100% rename from _/scss/objects/_forms.scss rename to scss/objects/_forms.scss diff --git a/_/scss/objects/_nav.scss b/scss/objects/_nav.scss similarity index 100% rename from _/scss/objects/_nav.scss rename to scss/objects/_nav.scss diff --git a/_/scss/objects/_scaffolding.scss b/scss/objects/_scaffolding.scss similarity index 100% rename from _/scss/objects/_scaffolding.scss rename to scss/objects/_scaffolding.scss diff --git a/_/scss/objects/_tables.scss b/scss/objects/_tables.scss similarity index 100% rename from _/scss/objects/_tables.scss rename to scss/objects/_tables.scss diff --git a/_/scss/style.scss b/scss/style.scss similarity index 100% rename from _/scss/style.scss rename to scss/style.scss