From f3c20600887239817930b8fbfc9755cbec75a39d Mon Sep 17 00:00:00 2001 From: James Brooks Date: Wed, 19 Nov 2014 12:31:47 +0000 Subject: [PATCH] Getting Elixir to work again --- .gitignore | 1 + gulpfile.js | 3 ++- public/assets/sass/application.scss | 27 +++++++++++++++++++++++++++ public/build/css/application.css | 22 ++++++++++++++++++++++ public/build/rev-manifest.json | 2 +- public/css/application.css | 22 ++++++++++++++++++++++ 6 files changed, 75 insertions(+), 2 deletions(-) mode change 100644 => 100755 public/assets/sass/application.scss mode change 100644 => 100755 public/build/css/application.css mode change 100644 => 100755 public/css/application.css diff --git a/.gitignore b/.gitignore index 82460e68..7604935b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ /bootstrap/compiled.php /vendor /node_modules +/public/build/css/application-* composer.phar composer.lock .env.*.php diff --git a/gulpfile.js b/gulpfile.js index 37855636..024f372e 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,5 +1,6 @@ var elixir = require('laravel-elixir'); elixir(function(mix) { - mix.sass("application.scss").version('css/application.css'); + mix.sass("application.scss") + .version('css/application.css'); }); diff --git a/public/assets/sass/application.scss b/public/assets/sass/application.scss old mode 100644 new mode 100755 index d483467e..05c5f64c --- a/public/assets/sass/application.scss +++ b/public/assets/sass/application.scss @@ -1,3 +1,30 @@ body { color: #333333; } + +h4 { + margin-top: 25px; +} + +.row { + margin-bottom: 20px; +} + +.row .row { + margin-top: 10px; + margin-bottom: 0; +} + +[class*="col-"] { + padding-top: 15px; + padding-bottom: 15px; + background-color: #eee; + background-color: rgba(86,61,124,.15); + border: 1px solid #ddd; + border: 1px solid rgba(86,61,124,.2); +} + +hr { + margin-top: 40px; + margin-bottom: 40px; +} diff --git a/public/build/css/application.css b/public/build/css/application.css old mode 100644 new mode 100755 index d1b77f6b..55b59278 --- a/public/build/css/application.css +++ b/public/build/css/application.css @@ -1,2 +1,24 @@ body { color: #333333; } + +h4 { + margin-top: 25px; } + +.row { + margin-bottom: 20px; } + +.row .row { + margin-top: 10px; + margin-bottom: 0; } + +[class*="col-"] { + padding-top: 15px; + padding-bottom: 15px; + background-color: #eee; + background-color: rgba(86, 61, 124, 0.15); + border: 1px solid #ddd; + border: 1px solid rgba(86, 61, 124, 0.2); } + +hr { + margin-top: 40px; + margin-bottom: 40px; } diff --git a/public/build/rev-manifest.json b/public/build/rev-manifest.json index 329d2c7f..6c583e58 100644 --- a/public/build/rev-manifest.json +++ b/public/build/rev-manifest.json @@ -1,3 +1,3 @@ { - "css/application.css": "css/application-ce1dc7c2.css" + "css/application.css": "css/application-6480b49a.css" } \ No newline at end of file diff --git a/public/css/application.css b/public/css/application.css old mode 100644 new mode 100755 index d1b77f6b..55b59278 --- a/public/css/application.css +++ b/public/css/application.css @@ -1,2 +1,24 @@ body { color: #333333; } + +h4 { + margin-top: 25px; } + +.row { + margin-bottom: 20px; } + +.row .row { + margin-top: 10px; + margin-bottom: 0; } + +[class*="col-"] { + padding-top: 15px; + padding-bottom: 15px; + background-color: #eee; + background-color: rgba(86, 61, 124, 0.15); + border: 1px solid #ddd; + border: 1px solid rgba(86, 61, 124, 0.2); } + +hr { + margin-top: 40px; + margin-bottom: 40px; }