Skip to content

Commit

Permalink
Use grunt-sass instead of compass
Browse files Browse the repository at this point in the history
This commit includes an updated build of `style.css`, showing the minor
differences between the two build tools.

Fixes #46.
  • Loading branch information
pento committed Jul 5, 2016
1 parent d71599c commit 5c4ce9e
Show file tree
Hide file tree
Showing 4 changed files with 156 additions and 48 deletions.
14 changes: 13 additions & 1 deletion Gruntfile.js
Expand Up @@ -23,6 +23,16 @@ module.exports = function(grunt) {
'!js/utils/moment.js'
]
},
sass: {
options: {
'outputStyle': 'expanded'
},
dist: {
files: {
'css/style.css': 'css/style.scss'
}
}
},
makepot: {
o2: {
options: {
Expand Down Expand Up @@ -55,10 +65,12 @@ module.exports = function(grunt) {

grunt.loadNpmTasks('grunt-phplint');
grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-sass');
grunt.loadNpmTasks('grunt-wp-i18n');

grunt.registerTask('default', [
'phplint',
'jshint'
'jshint',
'sass'
]);
};
3 changes: 2 additions & 1 deletion HACKING.txt
Expand Up @@ -51,4 +51,5 @@ A technical breakdown of how o2 is structured/put together for those interested
There are a number of core modules provided, which will give you an idea on how you could write your own. In addition to "normal" WordPress plugin approaches (actions and filters, mostly), you will also need to integrate things on the front end. We're using Cocktail.js to help mix functionality in with the core JS code.

## Development/Build
* Run 'compass watch' in the root of o2 to rebuild Sass files into CSS
* Run 'npm install' to initially setup the development environment
* Run 'grunt sass' in the root of o2 to rebuild Sass files into CSS

0 comments on commit 5c4ce9e

Please sign in to comment.