From d0a15a2d628812ea7fc78c0548067f7f3e62be8e Mon Sep 17 00:00:00 2001
From: James Brooks <james@bluebaytravel.co.uk>
Date: Wed, 10 Dec 2014 08:37:37 +0000
Subject: [PATCH] Let's compile application.scss into all.css closes #70

---
 app/views/layout/master.blade.php                 |  2 +-
 gulpfile.js                                       |  2 +-
 .../css/{all-edda61f6.css => all-43d753ea.css}    | 15 +++++++++------
 public/build/css/all.css                          | 15 +++++++++------
 public/build/rev-manifest.json                    |  2 +-
 5 files changed, 21 insertions(+), 15 deletions(-)
 rename public/build/css/{all-edda61f6.css => all-43d753ea.css} (99%)

diff --git a/app/views/layout/master.blade.php b/app/views/layout/master.blade.php
index 203ee418..6dd5a4c9 100644
--- a/app/views/layout/master.blade.php
+++ b/app/views/layout/master.blade.php
@@ -10,7 +10,7 @@
     <title>{{ isset($pageTitle) ? $pageTitle : Setting::get('app_name') }} | Cachet</title>
 
     <link href='http://fonts.googleapis.com/css?family=Raleway:400,700,300,600' rel='stylesheet' type='text/css'>
-    <link rel="stylesheet" href="/css/application.css">
+    <link rel="stylesheet" href="{{ elixir('css/all.css') }}">
 
     <script src="{{ elixir('js/all.js') }}"></script>
 </head>
diff --git a/gulpfile.js b/gulpfile.js
index b98a592a..f31b59e3 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,7 +1,7 @@
 var elixir = require('laravel-elixir');
 
 elixir(function(mix) {
-  mix.sass('main.scss')
+  mix.sass(['main.scss', 'application.scss'])
      .styles([
         'app/assets/bower_components/bootstrap/dist/css/bootstrap.min.css',
         'app/assets/bower_components/fontawesome/css/font-awesome.min.css',
diff --git a/public/build/css/all-edda61f6.css b/public/build/css/all-43d753ea.css
similarity index 99%
rename from public/build/css/all-edda61f6.css
rename to public/build/css/all-43d753ea.css
index b6dd9697..6df7f33f 100644
--- a/public/build/css/all-edda61f6.css
+++ b/public/build/css/all-43d753ea.css
@@ -44,21 +44,23 @@ body.dashboard .wrapper {
     body.dashboard .wrapper .content {
       -webkit-transition: margin 0.2s;
               transition: margin 0.2s;
-      margin-left: 250px; } }
+      margin-left: 250px; }
+ }
   body.dashboard .wrapper.active .sidebar {
     margin-left: 0; }
   @media (min-width: 550px) {
     body.dashboard .wrapper.active .content {
       -webkit-transition: margin 0.2s;
               transition: margin 0.2s;
-      margin-left: 250px; } }
+      margin-left: 250px; }
+ }
 
 body.dashboard .navbar {
   z-index: 999;
   border-radius: 0px;
   border: none;
-  border-bottom: 1px solid #00695b;
-  background: #009c87;
+  border-bottom: 1px solid #00695c;
+  background: #009c89;
   margin: 0; }
   body.dashboard .navbar a, body.dashboard .navbar a:active, body.dashboard .navbar a:visited {
     color: #ffffff; }
@@ -71,7 +73,7 @@ body.dashboard .navbar {
     body.dashboard .navbar .navbar-toggle.collapsed span {
       background-color: #ffffff; }
   body.dashboard .navbar .navbar-collapse {
-    background: #009c87; }
+    background: #009c89; }
   body.dashboard .navbar a.navbar-brand {
     padding: 34px 21px;
     line-height: 0em;
@@ -84,7 +86,8 @@ body.dashboard .navbar {
         padding-right: 10px; }
         body.dashboard .navbar a.navbar-brand span:before {
           font-family: FontAwesome;
-          content: "\f060"; } }
+          content: "\f060"; }
+ }
   body.dashboard .navbar .nav li a {
     height: 68px;
     line-height: 35px; }
diff --git a/public/build/css/all.css b/public/build/css/all.css
index b6dd9697..6df7f33f 100644
--- a/public/build/css/all.css
+++ b/public/build/css/all.css
@@ -44,21 +44,23 @@ body.dashboard .wrapper {
     body.dashboard .wrapper .content {
       -webkit-transition: margin 0.2s;
               transition: margin 0.2s;
-      margin-left: 250px; } }
+      margin-left: 250px; }
+ }
   body.dashboard .wrapper.active .sidebar {
     margin-left: 0; }
   @media (min-width: 550px) {
     body.dashboard .wrapper.active .content {
       -webkit-transition: margin 0.2s;
               transition: margin 0.2s;
-      margin-left: 250px; } }
+      margin-left: 250px; }
+ }
 
 body.dashboard .navbar {
   z-index: 999;
   border-radius: 0px;
   border: none;
-  border-bottom: 1px solid #00695b;
-  background: #009c87;
+  border-bottom: 1px solid #00695c;
+  background: #009c89;
   margin: 0; }
   body.dashboard .navbar a, body.dashboard .navbar a:active, body.dashboard .navbar a:visited {
     color: #ffffff; }
@@ -71,7 +73,7 @@ body.dashboard .navbar {
     body.dashboard .navbar .navbar-toggle.collapsed span {
       background-color: #ffffff; }
   body.dashboard .navbar .navbar-collapse {
-    background: #009c87; }
+    background: #009c89; }
   body.dashboard .navbar a.navbar-brand {
     padding: 34px 21px;
     line-height: 0em;
@@ -84,7 +86,8 @@ body.dashboard .navbar {
         padding-right: 10px; }
         body.dashboard .navbar a.navbar-brand span:before {
           font-family: FontAwesome;
-          content: "\f060"; } }
+          content: "\f060"; }
+ }
   body.dashboard .navbar .nav li a {
     height: 68px;
     line-height: 35px; }
diff --git a/public/build/rev-manifest.json b/public/build/rev-manifest.json
index 5f613973..9a4e7e5b 100644
--- a/public/build/rev-manifest.json
+++ b/public/build/rev-manifest.json
@@ -1,4 +1,4 @@
 {
-  "css/all.css": "css/all-edda61f6.css",
+  "css/all.css": "css/all-43d753ea.css",
   "js/all.js": "js/all-c84ab03b.js"
 }
\ No newline at end of file