Elixir now versions updated bower components

This commit is contained in:
Elliot Hesp
2014-12-01 19:33:15 +00:00
parent d12684414f
commit 9f435ff5d0
17 changed files with 123 additions and 489 deletions

4
.gitignore vendored
View File

@@ -1,7 +1,7 @@
/bootstrap/compiled.php
/vendor
/node_modules
/public/assets/bower_components
/app/assets/bower_components
composer.phar
.env.*.php
.env.php
@@ -9,3 +9,5 @@ composer.phar
Thumbs.db
config.codekit
npm-debug.log
public/js
publics/css

View File

@@ -1,152 +0,0 @@
body {
color: #333333;
font-size: 1.4em;
font-weight: 300;
}
hr {
margin-top: 10px;
margin-bottom: 10px;
}
h1 {
margin-bottom: 20px;
}
.text-success, .text-component-1 {
color: #4cae4c;
}
.text-info, .text-component-2 {
color: #46b8da;
}
.text-alert, .text-component-3 {
color: #F9BF3B;
}
.text-danger, .text-component-4 {
color: #D91E18;
}
.container {
max-width: 960px;
}
.page-header {
margin-top: 10px;
}
.alert {
margin-top: 20px;
border-radius: 0;
font-size: 1.2em;
&.alert-success {
background-color: #8DCD8D;
border-color: #4cae4c;
color: white;
}
&.alert-info {
background: #8CD3E8;
border-color: #46b8da;
color: #FFF;
}
&.alert-danger {
background: #D91E18;
border-color: #CF000F;
color: #FFF;
}
}
.badge {
padding-top: 8px;
padding-bottom: 8px;
padding-left: 12px;
padding-right: 12px;
&.badge-incident-1 {
background-color: #F27935;
}
&.badge-incident-2 {
background-color: #F9BF3B;
}
&.badge-incident-3 {
background-color: #46b8da;
}
&.badge-incident-4 {
background-color: #4cae4c;
}
}
.list-group {
margin-bottom: 20px;
padding-left: 0;
border-radius: 0;
.list-group-item {
border-radius: 0;
background-color: #ffffff;
border: 1px solid #BDC3C7;
font-size: 1.1em;
span.badge {
position: absolute;
top: 0;
right: 0;
border-radius: 0;
display: block;
}
i.glyphicon {
font-size: 1.4em;
}
h1, h2, h3, h4 {
margin-bottom: 2px;
}
h4 {
font-weight: 400;
max-width: 90%;
}
p, time {
margin-bottom: 0;
line-height: 1.3em;
}
time {
color: #6C7A89;
// letter-spacing: 0.02em;
font-weight: 300;
font-size: 1.1em;
}
&.active {
background-color: #F2F1EF;
h3 {
color: #22313F;
padding-top: 6px;
padding-bottom: 6px;
font-weight: 300;
font-size: 1.6em;
}
&:hover {
color: inherit;
border-color: #BDC3C7;
}
}
}
&.components {
margin-bottom: 30px;
p {
margin-bottom: 10px;
}
.badge {
color: transparent;
}
}
}

0
app/storage/production.sqlite Normal file → Executable file
View File

View File

@@ -3,14 +3,17 @@
<head>
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>{{ isset($pageTitle) ? $pageTitle : Setting::get('app_name') }} | Cachet</title>
<!-- Set the viewport width to device width for mobile -->
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="author" content="http://james-brooks.uk">
<meta name="apple-mobile-web-app-capable" content="yes">
<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="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css">
<link rel="stylesheet" href="{{ elixir('css/application.css') }}">
<link rel="stylesheet" href="{{ elixir('css/all.css') }}">
<script src="{{ elixir('js/all.js') }}"></script>
</head>
<body>
<div class='container'>

View File

@@ -1,6 +1,9 @@
{
"name": "Cachet",
"dependencies": {
"Chart.js": "*"
}
"name": "Cachet",
"dependencies": {
"cachet-ui": "*",
"jquery": "~2.1.1",
"chartjs": "0.2.*",
"rivets": "0.7.*"
}
}

3
composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "6a8ddbabbd2a61cd7be7327e895cd682",
"hash": "aef1ba4739f50885866f6d46efe82dbb",
"packages": [
{
"name": "classpreloader/classpreloader",
@@ -2870,7 +2870,6 @@
"stability-flags": {
"thujohn/rss": 20
},
"prefer-stable": false,
"platform": [],
"platform-dev": []
}

View File

@@ -1,5 +1,5 @@
{
"assetsDir": "app/assets/",
"cssOutput": "public/css/",
"jsOutput": "public/js/"
"assetsDir": "app/assets",
"cssOutput": "public/css",
"jsOutput": "public/js"
}

View File

@@ -1,6 +1,14 @@
var elixir = require('laravel-elixir');
elixir(function(mix) {
mix.sass("application.scss")
.version('css/application.css');
mix.scripts([
'bower_components/jquery/dist/jquery.min.js',
'bower_components/chartjs/Chart.min.js',
'bower_components/rivets/dist/riverts.bundle.js',
'js/**/*.js',
], 'app/assets')
.styles([
'bower_components/cachet-ui/dist/cachet.min.css',
], 'app/assets')
.version(['public/css/all.css', 'public/js/all.js'], 'public');
});

File diff suppressed because one or more lines are too long

1
public/build/css/all.css Normal file

File diff suppressed because one or more lines are too long

View File

@@ -1,107 +0,0 @@
body {
color: #333333;
font-size: 1.4em;
font-weight: 300; }
hr {
margin-top: 10px;
margin-bottom: 10px; }
h1 {
margin-bottom: 20px; }
.text-success, .text-component-1 {
color: #4cae4c; }
.text-info, .text-component-2 {
color: #46b8da; }
.text-alert, .text-component-3 {
color: #F9BF3B; }
.text-danger, .text-component-4 {
color: #D91E18; }
.container {
max-width: 960px; }
.page-header {
margin-top: 10px; }
.alert {
margin-top: 20px;
border-radius: 0;
font-size: 1.2em; }
.alert.alert-success {
background-color: #8DCD8D;
border-color: #4cae4c;
color: white; }
.alert.alert-info {
background: #8CD3E8;
border-color: #46b8da;
color: #FFF; }
.alert.alert-danger {
background: #D91E18;
border-color: #CF000F;
color: #FFF; }
.badge {
padding-top: 8px;
padding-bottom: 8px;
padding-left: 12px;
padding-right: 12px; }
.badge.badge-incident-1 {
background-color: #F27935; }
.badge.badge-incident-2 {
background-color: #F9BF3B; }
.badge.badge-incident-3 {
background-color: #46b8da; }
.badge.badge-incident-4 {
background-color: #4cae4c; }
.list-group {
margin-bottom: 20px;
padding-left: 0;
border-radius: 0; }
.list-group .list-group-item {
border-radius: 0;
background-color: #ffffff;
border: 1px solid #BDC3C7;
font-size: 1.1em; }
.list-group .list-group-item span.badge {
position: absolute;
top: 0;
right: 0;
border-radius: 0;
display: block; }
.list-group .list-group-item i.glyphicon {
font-size: 1.4em; }
.list-group .list-group-item h1, .list-group .list-group-item h2, .list-group .list-group-item h3, .list-group .list-group-item h4 {
margin-bottom: 2px; }
.list-group .list-group-item h4 {
font-weight: 400;
max-width: 90%; }
.list-group .list-group-item p, .list-group .list-group-item time {
margin-bottom: 0;
line-height: 1.3em; }
.list-group .list-group-item time {
color: #6C7A89;
font-weight: 300;
font-size: 1.1em; }
.list-group .list-group-item.active {
background-color: #F2F1EF; }
.list-group .list-group-item.active h3 {
color: #22313F;
padding-top: 6px;
padding-bottom: 6px;
font-weight: 300;
font-size: 1.6em; }
.list-group .list-group-item.active:hover {
color: inherit;
border-color: #BDC3C7; }
.list-group.components {
margin-bottom: 30px; }
.list-group.components p {
margin-bottom: 10px; }
.list-group.components .badge {
color: transparent; }

View File

@@ -1,107 +0,0 @@
body {
color: #333333;
font-size: 1.4em;
font-weight: 300; }
hr {
margin-top: 10px;
margin-bottom: 10px; }
h1 {
margin-bottom: 20px; }
.text-success, .text-component-1 {
color: #4cae4c; }
.text-info, .text-component-2 {
color: #46b8da; }
.text-alert, .text-component-3 {
color: #F9BF3B; }
.text-danger, .text-component-4 {
color: #D91E18; }
.container {
max-width: 960px; }
.page-header {
margin-top: 10px; }
.alert {
margin-top: 20px;
border-radius: 0;
font-size: 1.2em; }
.alert.alert-success {
background-color: #8DCD8D;
border-color: #4cae4c;
color: white; }
.alert.alert-info {
background: #8CD3E8;
border-color: #46b8da;
color: #FFF; }
.alert.alert-danger {
background: #D91E18;
border-color: #CF000F;
color: #FFF; }
.badge {
padding-top: 8px;
padding-bottom: 8px;
padding-left: 12px;
padding-right: 12px; }
.badge.badge-incident-1 {
background-color: #F27935; }
.badge.badge-incident-2 {
background-color: #F9BF3B; }
.badge.badge-incident-3 {
background-color: #46b8da; }
.badge.badge-incident-4 {
background-color: #4cae4c; }
.list-group {
margin-bottom: 20px;
padding-left: 0;
border-radius: 0; }
.list-group .list-group-item {
border-radius: 0;
background-color: #ffffff;
border: 1px solid #BDC3C7;
font-size: 1.1em; }
.list-group .list-group-item span.badge {
position: absolute;
top: 0;
right: 0;
border-radius: 0;
display: block; }
.list-group .list-group-item i.glyphicon {
font-size: 1.4em; }
.list-group .list-group-item h1, .list-group .list-group-item h2, .list-group .list-group-item h3, .list-group .list-group-item h4 {
margin-bottom: 2px; }
.list-group .list-group-item h4 {
font-weight: 400;
max-width: 90%; }
.list-group .list-group-item p, .list-group .list-group-item time {
margin-bottom: 0;
line-height: 1.3em; }
.list-group .list-group-item time {
color: #6C7A89;
font-weight: 300;
font-size: 1.1em; }
.list-group .list-group-item.active {
background-color: #F2F1EF; }
.list-group .list-group-item.active h3 {
color: #22313F;
padding-top: 6px;
padding-bottom: 6px;
font-weight: 300;
font-size: 1.6em; }
.list-group .list-group-item.active:hover {
color: inherit;
border-color: #BDC3C7; }
.list-group.components {
margin-bottom: 30px; }
.list-group.components p {
margin-bottom: 10px; }
.list-group.components .badge {
color: transparent; }

File diff suppressed because one or more lines are too long

44
public/build/js/all.js Normal file

File diff suppressed because one or more lines are too long

View File

@@ -1,3 +1,4 @@
{
"css/application.css": "css/application-4c5cd8a5.css"
"css/all.css": "css/all-7d3ac2b8.css",
"js/all.js": "js/all-03134fc0.js"
}

1
public/css/all.css Normal file

File diff suppressed because one or more lines are too long

View File

@@ -1,107 +0,0 @@
body {
color: #333333;
font-size: 1.4em;
font-weight: 300; }
hr {
margin-top: 10px;
margin-bottom: 10px; }
h1 {
margin-bottom: 20px; }
.text-success, .text-component-1 {
color: #4cae4c; }
.text-info, .text-component-2 {
color: #46b8da; }
.text-alert, .text-component-3 {
color: #F9BF3B; }
.text-danger, .text-component-4 {
color: #D91E18; }
.container {
max-width: 960px; }
.page-header {
margin-top: 10px; }
.alert {
margin-top: 20px;
border-radius: 0;
font-size: 1.2em; }
.alert.alert-success {
background-color: #8DCD8D;
border-color: #4cae4c;
color: white; }
.alert.alert-info {
background: #8CD3E8;
border-color: #46b8da;
color: #FFF; }
.alert.alert-danger {
background: #D91E18;
border-color: #CF000F;
color: #FFF; }
.badge {
padding-top: 8px;
padding-bottom: 8px;
padding-left: 12px;
padding-right: 12px; }
.badge.badge-incident-1 {
background-color: #F27935; }
.badge.badge-incident-2 {
background-color: #F9BF3B; }
.badge.badge-incident-3 {
background-color: #46b8da; }
.badge.badge-incident-4 {
background-color: #4cae4c; }
.list-group {
margin-bottom: 20px;
padding-left: 0;
border-radius: 0; }
.list-group .list-group-item {
border-radius: 0;
background-color: #ffffff;
border: 1px solid #BDC3C7;
font-size: 1.1em; }
.list-group .list-group-item span.badge {
position: absolute;
top: 0;
right: 0;
border-radius: 0;
display: block; }
.list-group .list-group-item i.glyphicon {
font-size: 1.4em; }
.list-group .list-group-item h1, .list-group .list-group-item h2, .list-group .list-group-item h3, .list-group .list-group-item h4 {
margin-bottom: 2px; }
.list-group .list-group-item h4 {
font-weight: 400;
max-width: 90%; }
.list-group .list-group-item p, .list-group .list-group-item time {
margin-bottom: 0;
line-height: 1.3em; }
.list-group .list-group-item time {
color: #6C7A89;
font-weight: 300;
font-size: 1.1em; }
.list-group .list-group-item.active {
background-color: #F2F1EF; }
.list-group .list-group-item.active h3 {
color: #22313F;
padding-top: 6px;
padding-bottom: 6px;
font-weight: 300;
font-size: 1.6em; }
.list-group .list-group-item.active:hover {
color: inherit;
border-color: #BDC3C7; }
.list-group.components {
margin-bottom: 30px; }
.list-group.components p {
margin-bottom: 10px; }
.list-group.components .badge {
color: transparent; }