lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Let's compile application.scss into all.css closes #70

Browse Source
This commit is contained in:
James Brooks
2014-12-10 08:37:37 +00:00
parent d4cdd6cb68
commit d0a15a2d62
5 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/layout/master.blade.php
View File

@@ -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>

2
gulpfile.js
View File

@@ -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',

15
public/build/css/all-edda61f6.css → public/build/css/all-43d753ea.css
View File

@@ -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; }

15
public/build/css/all.css
View File

@@ -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; }

2
public/build/rev-manifest.json
View File

@@ -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"
}