Permalink
Browse files

AUI-1287 Wrong css formatting when running "grunt format"

  • Loading branch information...
1 parent aa46c8f commit f791aa44d98f5deb4abdb09a69642846fabbec61 @eduardolundgren eduardolundgren committed Apr 25, 2014
Showing with 47 additions and 40 deletions.
  1. +0 −4 .jsbeautifyrc
  2. +9 −3 Gruntfile.js
  3. +38 −33 package.json
View
@@ -1,8 +1,4 @@
{
- "css": {
- "indentChar": " ",
- "indentSize": 4
- },
"html": {
"braceStyle": "end-expand",
"indentChar": " ",
View
@@ -121,18 +121,23 @@ module.exports = function(grunt) {
name: 'aui-test'
},
+ cssbeautifier : {
+ files : [
+ 'src/**/*.css',
+ '!src/aui-css/css/*.css'
+ ]
+ },
+
init: {
dependencies: '<%= pkg.dependencies %>'
},
jsbeautifier: {
files: [
'src/**/*.js',
- 'src/**/*.css',
'grunt/*.js',
'!src/aui-base/js/aui-aliases.js',
'!src/aui-base/js/aui-loader.js',
- '!src/aui-css/css/*.css',
'!src/yui/js/*.js'
],
options: {
@@ -173,11 +178,12 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-contrib-compress');
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-contrib-jshint');
+ grunt.loadNpmTasks('grunt-cssbeautifier');
grunt.loadNpmTasks('grunt-jsbeautifier');
grunt.registerTask('api', ['copy:api', 'api-include', 'api-build']);
grunt.registerTask('api-deploy', ['api', 'api-push', 'clean:api']);
- grunt.registerTask('format', ['jsbeautifier']);
+ grunt.registerTask('format', ['cssbeautifier', 'jsbeautifier']);
grunt.registerTask('lint', ['jshint']);
grunt.registerTask('release', ['clean:zip', 'all', 'zip:release']);
grunt.registerTask('release-cdn', ['clean:zip', 'all', 'cdn', 'zip:cdn', 'build:aui']);
View
@@ -1,34 +1,39 @@
{
- "name": "alloy",
- "description": "AlloyUI",
- "version": "2.5.0",
- "author": {
- "name": "Eduardo Lundgren",
- "email": "eduardo.lundgren@liferay.com",
- "web": "http://www.eduardolundgren.com",
- "twitter": "eduardolundgren"
- },
- "license": "BSD",
- "repository": {
- "type": "git",
- "url": "git@github.com:liferay/alloy-ui.git"
- },
- "keywords": [
- "alloy", "yui", "external", "commands", "helpers"
- ],
- "devDependencies": {
- "async": "0.2.9",
- "command": "0.0.4",
- "fs-extra": "~0.8.1",
- "grunt": "~0.4.2",
- "grunt-contrib-clean": "0.5.0",
- "grunt-contrib-compress": "~0.6.0",
- "grunt-contrib-copy": "~0.5.0",
- "grunt-contrib-jshint": "~0.10.0",
- "grunt-jsbeautifier": "~0.2.6",
- "which": "1.0.5"
- },
- "engines": {
- "node": ">=0.8 <0.12"
- }
-}
+ "name": "alloy",
+ "description": "AlloyUI",
+ "version": "2.5.0",
+ "author": {
+ "name": "Eduardo Lundgren",
+ "email": "eduardo.lundgren@liferay.com",
+ "web": "http://www.eduardolundgren.com",
+ "twitter": "eduardolundgren"
+ },
+ "license": "BSD",
+ "repository": {
+ "type": "git",
+ "url": "git@github.com:liferay/alloy-ui.git"
+ },
+ "keywords": [
+ "alloy",
+ "yui",
+ "external",
+ "commands",
+ "helpers"
+ ],
+ "devDependencies": {
+ "async": "0.2.9",
+ "command": "0.0.4",
+ "fs-extra": "~0.8.1",
+ "grunt": "~0.4.2",
+ "grunt-contrib-clean": "0.5.0",
+ "grunt-contrib-compress": "~0.6.0",
+ "grunt-contrib-copy": "~0.5.0",
+ "grunt-contrib-jshint": "~0.10.0",
+ "grunt-cssbeautifier": "~0.1.1",
+ "grunt-jsbeautifier": "~0.2.6",
+ "which": "1.0.5"
+ },
+ "engines": {
+ "node": ">=0.8 <0.12"
+ }
+}

0 comments on commit f791aa4

Please sign in to comment.