From a3821639c94134f176b26a2bf1bb2a2a138b45bd Mon Sep 17 00:00:00 2001
From: James Power <thejamespower@gmail.com>
Date: Fri, 12 May 2017 10:36:34 +0100
Subject: [PATCH] Update CSSComb to v4.0.1.

---
 CHANGELOG.md     |  3 +++
 package.json     | 10 +++++++---
 src/options.json |  2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 30a9726a2..f9026d081 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Next
 - ...
 
+# v0.29.25 (2017-05-12)
+- Fix [#1547](https://github.com/Glavin001/atom-beautify/issues/1547), [#1630](https://github.com/Glavin001/atom-beautify/issues/1630). Update CSSComb to latest version.
+
 # v0.29.24 (2017-05-06)
 - Fix [#1643](https://github.com/Glavin001/atom-beautify/issues/1643). Add PHPCBF Version setting and remove "--no-patch" option from version 3.0 of PHPCBF. See [#1645](https://github.com/Glavin001/atom-beautify/pull/1645).
 - Close [#27](https://github.com/Glavin001/atom-beautify/issues/27). Add commands for beautifying a specific language
diff --git a/package.json b/package.json
index c0699eb6a..ee9316c08 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "atom-beautify",
   "main": "./src/beautify",
-  "version": "0.29.24",
+  "version": "0.29.25",
   "private": true,
   "description": "Beautify HTML, CSS, JavaScript, PHP, Python, Ruby, Java, C, C++, C#, Objective-C, CoffeeScript, TypeScript, Coldfusion, SQL, and more in Atom",
   "repository": {
@@ -134,6 +134,10 @@
     {
       "name": "Taylon Silmer",
       "url": "https://github.com/taylon"
+    },
+    {
+      "name": "James Power",
+      "url": "https://github.com/thejamespower"
     }
   ],
   "engines": {
@@ -148,7 +152,7 @@
     "coffee-fmt": "^0.12.0",
     "coffee-formatter": "^0.1.2",
     "coffee-script": "^1.11.0",
-    "csscomb": "^3.1.7",
+    "csscomb": "^4.0.1",
     "diff": "3.0.0",
     "editorconfig": "^0.13.2",
     "eslint": "^3.13.1",
@@ -399,4 +403,4 @@
     "lint": "coffeelint src/ spec/",
     "code-docs": "codo && open docs/code/index.html"
   }
-}
\ No newline at end of file
+}
diff --git a/src/options.json b/src/options.json
index 7ead5ed68..8b026d41e 100644
--- a/src/options.json
+++ b/src/options.json
@@ -9037,7 +9037,7 @@
     "properties": {
       "padding": {
         "type": "integer",
-        "default": null,
+        "default": 0,
         "minimum": 0,
         "description": "The amount of padding to add next to each line. (Supported by align-yaml)",
         "title": "Padding",