This commit is contained in:
Matthew Riley MacPherson 2014-05-23 11:50:36 -04:00
Родитель 29b412d1bc
Коммит ec78085489
5 изменённых файлов: 25 добавлений и 8 удалений

Просмотреть файл

@ -124,7 +124,7 @@ RecroomGenerator.prototype.templates = function templates() {
RecroomGenerator.prototype.writeIndex = function writeIndex() { RecroomGenerator.prototype.writeIndex = function writeIndex() {
var mainCssFiles = [ var mainCssFiles = [
'styles/normalize.css', 'styles/normalize.css',
'styles/style.css', 'styles/compiled-stylus.css',
'bower_components/brick/dist/brick.css' 'bower_components/brick/dist/brick.css'
]; ];
@ -142,7 +142,7 @@ RecroomGenerator.prototype.all = function all() {
this.write('app/index.html', this.indexFile); this.write('app/index.html', this.indexFile);
this.copy('styles/normalize.css', 'app/styles/normalize.css'); this.copy('styles/normalize.css', 'app/styles/normalize.css');
this.copy('styles/style.css', 'app/styles/style.css'); this.copy('styles/app.styl', 'app/styles/app.styl');
this.copy(this._getJSPath('scripts/app'), this._getJSPath('app/scripts/app')); this.copy(this._getJSPath('scripts/app'), this._getJSPath('app/scripts/app'));
this.copy(this._getJSPath('scripts/store'), this._getJSPath('app/scripts/store')); this.copy(this._getJSPath('scripts/store'), this._getJSPath('app/scripts/store'));

Просмотреть файл

@ -28,13 +28,18 @@ module.exports = function (grunt) {
yeoman: yeomanConfig, yeoman: yeomanConfig,
watch: { watch: {
emberTemplates: { emberTemplates: {
files: ['<%= yeoman.app %>/templates/**/*.hbs','<%= yeoman.app %>/bower_components/**/*.hbs'], files: ['<%%= yeoman.app %>/templates/**/*.hbs','<%= yeoman.app %>/bower_components/**/*.hbs'],
tasks: ['emberTemplates'] tasks: ['emberTemplates']
}, },
neuter: { neuter: {
files: ['<%= yeoman.app %>/scripts/{,*/}*.js'], files: ['<%%= yeoman.app %>/scripts/{,*/}*.js'],
tasks: ['neuter'] tasks: ['neuter']
}, },
stylus: {
files: ['<%%= yeoman.app %>/styles/{,*/}*.css',
'<%%= yeoman.app %>/styles/{,*/}*.styl'],
tasks: ['stylus']
},
livereload: { livereload: {
options: { options: {
livereload: LIVERELOAD_PORT livereload: LIVERELOAD_PORT
@ -189,7 +194,7 @@ module.exports = function (grunt) {
cssmin: { cssmin: {
dist: { dist: {
files: { files: {
'<%%= yeoman.dist %>/styles/main.css': [ '<%%= yeoman.dist %>/styles/compiled-stylus.css': [
'.tmp/styles/{,*/}*.css', '.tmp/styles/{,*/}*.css',
'<%%= yeoman.app %>/styles/{,*/}*.css' '<%%= yeoman.app %>/styles/{,*/}*.css'
] ]
@ -296,6 +301,17 @@ module.exports = function (grunt) {
} }
} }
}, },
stylus: {
compile: {
options: {
compress: false,
paths: ['node_modules/grunt-contrib-stylus/node_modules']
},
files: {
'.tmp/styles/compiled-stylus.css': ['<%%= yeoman.app %>/styles/*.styl']
}
}
},
neuter: { neuter: {
app: { app: {
options: { options: {
@ -323,6 +339,7 @@ module.exports = function (grunt) {
'clean:server', 'clean:server',
'replace:app', 'replace:app',
'concurrent:server', 'concurrent:server',
'stylus',
'neuter:app', 'neuter:app',
'connect:livereload', 'connect:livereload',
'open', 'open',
@ -335,6 +352,7 @@ module.exports = function (grunt) {
'replace:app', 'replace:app',
'concurrent:test', 'concurrent:test',
'connect:test', 'connect:test',
'stylus',
'neuter:app',<% if (options.karma) { %> 'neuter:app',<% if (options.karma) { %>
'karma'<% } else if (testFramework === 'mocha') { %> 'karma'<% } else if (testFramework === 'mocha') { %>
'mocha'<% } else if (testFramework === 'jasmine') { %> 'mocha'<% } else if (testFramework === 'jasmine') { %>
@ -346,6 +364,7 @@ module.exports = function (grunt) {
'replace:dist', 'replace:dist',
'useminPrepare', 'useminPrepare',
'concurrent:dist', 'concurrent:dist',
'stylus',
'neuter:app', 'neuter:app',
'concat', 'concat',
'cssmin', 'cssmin',

Просмотреть файл

@ -13,6 +13,7 @@
"grunt-contrib-clean": "~0.5.0", "grunt-contrib-clean": "~0.5.0",
"grunt-contrib-htmlmin": "~0.1.3", "grunt-contrib-htmlmin": "~0.1.3",
"grunt-contrib-imagemin": "~0.2.0", "grunt-contrib-imagemin": "~0.2.0",
"grunt-contrib-stylus": "^0.16.0",
"grunt-contrib-watch": "~0.5.2",<% if (testFramework === 'jasmine') { %> "grunt-contrib-watch": "~0.5.2",<% if (testFramework === 'jasmine') { %>
"grunt-contrib-jasmine": "~0.5.1",<% } %> "grunt-contrib-jasmine": "~0.5.1",<% } %>
"grunt-rev": "~0.1.0", "grunt-rev": "~0.1.0",

Просмотреть файл

@ -24,9 +24,6 @@
<!-- Responsive and mobile friendly stuff --> <!-- Responsive and mobile friendly stuff -->
<meta name="HandheldFriendly" content="True"> <meta name="HandheldFriendly" content="True">
<meta name="MobileOptimized" content="320"> <meta name="MobileOptimized" content="320">
<!-- l10n TODO: build step -->
<link rel="resource" type="application/l10n" href="l10n/en.properties">
</head> </head>
<!-- Content gets replaced by the application.hbs template. --> <!-- Content gets replaced by the application.hbs template. -->

Просмотреть файл