Fix pnotify css import
Change-Id: Ia379985267d1bfa247f496fa22875b3a05faa854
This commit is contained in:
parent
70e3e7c3cb
commit
5412cd8990
10
Gruntfile.js
10
Gruntfile.js
@ -111,6 +111,14 @@ module.exports = function (grunt) {
|
|||||||
|
|
||||||
concat: {
|
concat: {
|
||||||
generated: {
|
generated: {
|
||||||
|
// Will be generated with usemin:html
|
||||||
|
nonull: true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
cssmin: {
|
||||||
|
generated: {
|
||||||
|
// Will be generated with usemin:html
|
||||||
nonull: true
|
nonull: true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -118,6 +126,7 @@ module.exports = function (grunt) {
|
|||||||
// Minify and concatenate bansho in one file
|
// Minify and concatenate bansho in one file
|
||||||
uglify: {
|
uglify: {
|
||||||
generated: {
|
generated: {
|
||||||
|
// Will be generated with usemin:html
|
||||||
nonull: true
|
nonull: true
|
||||||
},
|
},
|
||||||
options: {
|
options: {
|
||||||
@ -168,6 +177,7 @@ module.exports = function (grunt) {
|
|||||||
'useminPrepare:html',
|
'useminPrepare:html',
|
||||||
'concat:generated',
|
'concat:generated',
|
||||||
'uglify:generated',
|
'uglify:generated',
|
||||||
|
'cssmin:generated',
|
||||||
'usemin:html'
|
'usemin:html'
|
||||||
]);
|
]);
|
||||||
};
|
};
|
||||||
|
@ -10,11 +10,13 @@
|
|||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
<link href='http://fonts.googleapis.com/css?family=Roboto:400,700,400italic' rel='stylesheet' type='text/css'>
|
<link href='http://fonts.googleapis.com/css?family=Roboto:400,700,400italic' rel='stylesheet' type='text/css'>
|
||||||
<link rel="stylesheet" href="assets/css/app.css">
|
<link rel="stylesheet" href="assets/css/app.css">
|
||||||
|
<!-- build:css assets/css/app_ext_css.css -->
|
||||||
<!-- pnotify css -->
|
|
||||||
<link href="bower_components/pnotify/pnotify.core.css" media="all" rel="stylesheet" type="text/css" />
|
<link href="bower_components/pnotify/pnotify.core.css" media="all" rel="stylesheet" type="text/css" />
|
||||||
<link href="bower_components/pnotify/pnotify.buttons.css" media="all" rel="stylesheet" type="text/css" />
|
<link href="bower_components/pnotify/pnotify.buttons.css" media="all" rel="stylesheet" type="text/css" />
|
||||||
<link href="bower_components/pnotify/pnotify.history.css" media="all" rel="stylesheet" type="text/css" />
|
<link href="bower_components/pnotify/pnotify.history.css" media="all" rel="stylesheet" type="text/css" />
|
||||||
|
<!-- endbuild -->
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<meta name="description" content="">
|
<meta name="description" content="">
|
||||||
|
|
||||||
|
17
package.json
17
package.json
@ -8,20 +8,21 @@
|
|||||||
"bower": "^1.3.1",
|
"bower": "^1.3.1",
|
||||||
"grunt": "^0.4.5",
|
"grunt": "^0.4.5",
|
||||||
"grunt-cli": "^0.1.13",
|
"grunt-cli": "^0.1.13",
|
||||||
|
"grunt-contrib-clean": "~0.6.0",
|
||||||
|
"grunt-contrib-concat": "~0.5.1",
|
||||||
|
"grunt-contrib-copy": "~0.8.0",
|
||||||
|
"grunt-contrib-cssmin": "^0.12.3",
|
||||||
|
"grunt-contrib-jshint": "~0.11.2",
|
||||||
"grunt-contrib-sass": "^0.8.1",
|
"grunt-contrib-sass": "^0.8.1",
|
||||||
|
"grunt-contrib-uglify": "~0.8.0",
|
||||||
"grunt-contrib-watch": "^0.6.1",
|
"grunt-contrib-watch": "^0.6.1",
|
||||||
|
"grunt-usemin": "~3.0.0",
|
||||||
"http-server": "^0.6.1",
|
"http-server": "^0.6.1",
|
||||||
"karma": "~0.10",
|
"karma": "~0.10",
|
||||||
"karma-junit-reporter": "^0.2.2",
|
"karma-junit-reporter": "^0.2.2",
|
||||||
"protractor": "^1.1.1",
|
|
||||||
"shelljs": "^0.2.6",
|
|
||||||
"grunt-contrib-uglify": "~0.8.0",
|
|
||||||
"grunt-usemin": "~3.0.0",
|
|
||||||
"grunt-contrib-concat": "~0.5.1",
|
|
||||||
"grunt-contrib-clean": "~0.6.0",
|
|
||||||
"grunt-contrib-copy": "~0.8.0",
|
|
||||||
"load-grunt-tasks": "~3.1.0",
|
"load-grunt-tasks": "~3.1.0",
|
||||||
"grunt-contrib-jshint": "~0.11.2"
|
"protractor": "^1.1.1",
|
||||||
|
"shelljs": "^0.2.6"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"postinstall": "bower install",
|
"postinstall": "bower install",
|
||||||
|
Loading…
Reference in New Issue
Block a user