Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-27 22:49:56 -05:00
Code Issues Activity

Move myth configuration into Brocfile.js.

Browse source
This commit is contained in:
Robert Jackson 2015-08-21 13:30:09 -04:00
parent 5e58b1317e
commit f9ea6fc0a8
No known key found for this signature in database
GPG key ID: B3D10EF8171F7219
2 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/client/Brocfile.js
View file

@ -1,7 +1,9 @@
/* global require, module */ /* global require, module */
var EmberApp = require('ember-cli/lib/broccoli/ember-app'), var EmberApp = require('ember-cli/lib/broccoli/ember-app'),
isProduction = EmberApp.env() === 'production', environment = EmberApp.env(),
isProduction = environment === 'production',
mythCompress = isProduction || environment === 'test',
disabled = {enabled: false}, disabled = {enabled: false},
assetLocation, assetLocation,
app; app;
@ -27,6 +29,8 @@ app = new EmberApp({
source: './app/styles/app.css', source: './app/styles/app.css',
inputFile: 'app.css', inputFile: 'app.css',
browsers: 'last 2 versions', browsers: 'last 2 versions',
sourcemap: !mythCompress,
compress: mythCompress,
outputFile: isProduction ? 'ghost.min.css' : 'ghost.css' outputFile: isProduction ? 'ghost.min.css' : 'ghost.css'
}, },
hinting: false, hinting: false,

14
core/client/config/environment.js
View file

@ -41,9 +41,6 @@ module.exports = function (environment) {
ENV.APP.LOG_TRANSITIONS = true; ENV.APP.LOG_TRANSITIONS = true;
ENV.APP.LOG_TRANSITIONS_INTERNAL = true; ENV.APP.LOG_TRANSITIONS_INTERNAL = true;
ENV.APP.LOG_VIEW_LOOKUPS = true; ENV.APP.LOG_VIEW_LOOKUPS = true;
ENV.mythOptions = {
sourcemap: true
};
} }
if (environment === 'test') { if (environment === 'test') {
@ -56,17 +53,6 @@ module.exports = function (environment) {
ENV.APP.LOG_VIEW_LOOKUPS = false; ENV.APP.LOG_VIEW_LOOKUPS = false;
ENV.APP.rootElement = '#ember-testing'; ENV.APP.rootElement = '#ember-testing';
ENV.mythOptions = {
compress: true,
outputFile: 'ghost.min.css'
};
}
if (environment === 'production') {
ENV.mythOptions = {
compress: true,
outputFile: 'ghost.min.css'
};
} }
return ENV; return ENV;