Getting Elixir to work again

This commit is contained in:
James Brooks
2014-11-19 12:31:47 +00:00
parent 589a47cabc
commit f3c2060088
6 changed files with 75 additions and 2 deletions
+1
View File
@@ -1,6 +1,7 @@
/bootstrap/compiled.php /bootstrap/compiled.php
/vendor /vendor
/node_modules /node_modules
/public/build/css/application-*
composer.phar composer.phar
composer.lock composer.lock
.env.*.php .env.*.php
+2 -1
View File
@@ -1,5 +1,6 @@
var elixir = require('laravel-elixir'); var elixir = require('laravel-elixir');
elixir(function(mix) { elixir(function(mix) {
mix.sass("application.scss").version('css/application.css'); mix.sass("application.scss")
.version('css/application.css');
}); });
+27
View File
@@ -1,3 +1,30 @@
body { body {
color: #333333; 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;
}
Regular → Executable
+22
View File
@@ -1,2 +1,24 @@
body { body {
color: #333333; } 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; }
+1 -1
View File
@@ -1,3 +1,3 @@
{ {
"css/application.css": "css/application-ce1dc7c2.css" "css/application.css": "css/application-6480b49a.css"
} }
Regular → Executable
+22
View File
@@ -1,2 +1,24 @@
body { body {
color: #333333; } 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; }