Merge "Grunt build now supports package CSS"
This commit is contained in:
commit
2b3f2572f7
@ -144,8 +144,7 @@ module.exports = function (grunt) {
|
|||||||
mainPath,
|
mainPath,
|
||||||
dir.theme + '/custom/',
|
dir.theme + '/custom/',
|
||||||
dir.theme + '/storyboard/',
|
dir.theme + '/storyboard/',
|
||||||
dir.bower + '/bootstrap/less/',
|
dir.bower + '/bootstrap/less/'
|
||||||
dir.bower + '/font-awesome/less/'
|
|
||||||
];
|
];
|
||||||
},
|
},
|
||||||
cleancss: true,
|
cleancss: true,
|
||||||
|
@ -42,6 +42,10 @@
|
|||||||
|
|
||||||
<link rel="stylesheet" href="styles/main.css">
|
<link rel="stylesheet" href="styles/main.css">
|
||||||
|
|
||||||
|
<!-- build:css(bower_components) styles/libs.css -->
|
||||||
|
<link rel="stylesheet" href="font-awesome/css/font-awesome.css">
|
||||||
|
<!-- endbuild -->
|
||||||
|
|
||||||
<script src="js/storyboard.js"></script>
|
<script src="js/storyboard.js"></script>
|
||||||
<script src="js/templates.js"></script>
|
<script src="js/templates.js"></script>
|
||||||
</head>
|
</head>
|
||||||
|
@ -22,7 +22,6 @@
|
|||||||
*/
|
*/
|
||||||
// Library inclusions
|
// Library inclusions
|
||||||
@import './bootstrap.less';
|
@import './bootstrap.less';
|
||||||
@import './font-awesome.less';
|
|
||||||
// Theme
|
// Theme
|
||||||
@import './theme.less';
|
@import './theme.less';
|
||||||
// Addons to the bootstrap theme.
|
// Addons to the bootstrap theme.
|
||||||
|
Loading…
Reference in New Issue
Block a user