From b03d9dcbb14838e50d868b55b4d5bec583e4b1e9 Mon Sep 17 00:00:00 2001 From: devfake Date: Mon, 22 Jun 2015 09:28:08 +0200 Subject: [PATCH] styling and set gulp watcher for js --- site/client/assets/sass/_form.scss | 2 +- site/client/assets/sass/_landing.scss | 2 +- site/client/assets/sass/_nav.scss | 4 ++++ site/client/gulpfile.js | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/site/client/assets/sass/_form.scss b/site/client/assets/sass/_form.scss index 65f627d..08dec80 100644 --- a/site/client/assets/sass/_form.scss +++ b/site/client/assets/sass/_form.scss @@ -1,5 +1,5 @@ .icon-load { - background: url(../img/load.gif) #ca5a07 no-repeat; + background: url(../img/load.gif) no-repeat; width: 16px; height: 16px; float: right; diff --git a/site/client/assets/sass/_landing.scss b/site/client/assets/sass/_landing.scss index 9aeeafd..d50a6d0 100644 --- a/site/client/assets/sass/_landing.scss +++ b/site/client/assets/sass/_landing.scss @@ -4,7 +4,7 @@ body.landing { } .icon-guest-load { - background: url(../img/guest-load.gif) #ca5a07 no-repeat; + background: url(../img/guest-load.gif) no-repeat; width: 16px; height: 16px; float: right; diff --git a/site/client/assets/sass/_nav.scss b/site/client/assets/sass/_nav.scss index dfeda0e..1bcf67d 100644 --- a/site/client/assets/sass/_nav.scss +++ b/site/client/assets/sass/_nav.scss @@ -41,4 +41,8 @@ nav { .sub-nav { float: right; + + a { + padding: 12px; + } } \ No newline at end of file diff --git a/site/client/gulpfile.js b/site/client/gulpfile.js index 5ffe772..b63b44e 100755 --- a/site/client/gulpfile.js +++ b/site/client/gulpfile.js @@ -10,4 +10,6 @@ elixir.config.publicDir = '../public/'; elixir(function(mix) { mix.sass('app.scss'); mix.browserify('../../app/app.js'); + + mix.task('browserify', '../../app/**/*.js'); });