From 840b0a6d37f565c87529544310a6b7fd99dd71d0 Mon Sep 17 00:00:00 2001 From: "@soyjavi" Date: Mon, 28 Jul 2014 17:55:16 +0200 Subject: [PATCH] Included STYLmethods --- .gitmodules | 7 +++++-- gulpfile.js | 2 +- source/styl/STYLmethods | 1 + source/styl/__init.styl | 2 +- source/styl/theme/__init.styl | 2 +- www/examples/app.html | 8 ++++---- www/examples/blog.html | 8 ++++---- www/examples/landing.html | 8 ++++---- www/examples/profile.html | 8 ++++---- www/index.html | 16 ++++++++-------- 10 files changed, 33 insertions(+), 29 deletions(-) create mode 160000 source/styl/STYLmethods diff --git a/.gitmodules b/.gitmodules index d43f385..94c9b37 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ -[submodule "/package"] - path = /package +[submodule "package"] + path = package url = https://github.com/soyjavi/package-tuktuk.git +[submodule "source/styl/STYLmethods"] + path = source/styl/STYLmethods + url = https://github.com/soyjavi/STYLmethods.git diff --git a/gulpfile.js b/gulpfile.js index eeb6664..0ef9c8c 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -67,7 +67,7 @@ gulp.task('theme', function() { }); gulp.task('webserver', function() { - connect.server({ port: 8000, root: 'www/', livereload: true }); + connect.server({ port: 8000, root: './', livereload: true }); }); gulp.task('init', function() { diff --git a/source/styl/STYLmethods b/source/styl/STYLmethods new file mode 160000 index 0000000..f7726e9 --- /dev/null +++ b/source/styl/STYLmethods @@ -0,0 +1 @@ +Subproject commit f7726e97b830dac40594aeeb1508d884fc87e514 diff --git a/source/styl/__init.styl b/source/styl/__init.styl index 94c5ade..8b3b6f8 100644 --- a/source/styl/__init.styl +++ b/source/styl/__init.styl @@ -1,4 +1,4 @@ -@import "../components/CSSmethods/vendor.styl" +@import "STYLmethods/vendor.styl" FONT-SIZE = 14px FONT-SIZE-LARGE = 1.4em diff --git a/source/styl/theme/__init.styl b/source/styl/theme/__init.styl index 442744b..ffcbc75 100644 --- a/source/styl/theme/__init.styl +++ b/source/styl/theme/__init.styl @@ -1,4 +1,4 @@ -@import "../../components/CSSmethods/vendor.styl" +@import "../STYLmethods/vendor.styl" /* DEFAULTS */ COLOR = #222 diff --git a/www/examples/app.html b/www/examples/app.html index 6a8a24c..6168cf6 100644 --- a/www/examples/app.html +++ b/www/examples/app.html @@ -5,10 +5,10 @@ tuktuk - Application Example - - + + - +