From e6d82f8664ab7224f775575573f21946c0862d41 Mon Sep 17 00:00:00 2001 From: Alexander Goncharov Date: Sat, 28 Dec 2013 00:16:36 +0600 Subject: [PATCH 1/4] minor config changes Added sort-order for Sass & LESS specific stuff and updated some config with more default values. --- csscomb.json | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/csscomb.json b/csscomb.json index 2f3e7af..888504d 100644 --- a/csscomb.json +++ b/csscomb.json @@ -4,22 +4,27 @@ "node_modules/**" ], "always-semicolon": true, - "block-indent": " ", - "colon-space": ["", " "], + "block-indent": "\t", + "colon-space": [0, 1], "color-case": "lower", "color-shorthand": true, - "combinator-space": [" ", " "], + "combinator-space": [1, 1], "element-case": "lower", - "eof-newline": true, + "eof-newline": false, "leading-zero": false, "quotes": "single", - "remove-empty-rulesets": true, - "rule-indent": " ", - "stick-brace": "\n", + "remove-empty-rulesets": false, + "rule-indent": "\t", + "stick-brace": 1, "strip-spaces": true, "unitless-zero": true, "vendor-prefix-align": true, "sort-order": [ + [ + "$variable", + "$extend", + "$include" + ], [ "font", "font-family", From 0b6f3c91825bd7ef2aee143e88dde9ff1f3fd142 Mon Sep 17 00:00:00 2001 From: Alexander Goncharov Date: Sat, 28 Dec 2013 00:30:54 +0600 Subject: [PATCH 2/4] SMACSS inspired config changes Based on [Formatiing code](http://smacss.com/book/formatting) chapter from the SMACSS book. --- csscomb.json | 244 ++++++++++++++++++++++++++------------------------- 1 file changed, 123 insertions(+), 121 deletions(-) diff --git a/csscomb.json b/csscomb.json index 888504d..bb8070e 100644 --- a/csscomb.json +++ b/csscomb.json @@ -25,30 +25,6 @@ "$extend", "$include" ], - [ - "font", - "font-family", - "font-size", - "font-weight", - "font-style", - "font-variant", - "font-size-adjust", - "font-stretch", - "font-effect", - "font-emphasize", - "font-emphasize-position", - "font-emphasize-style", - "font-smooth", - "line-height" - ], - [ - "position", - "z-index", - "top", - "right", - "bottom", - "left" - ], [ "display", "visibility", @@ -66,6 +42,14 @@ "flex-pack", "flex-align" ], + [ + "position", + "z-index", + "top", + "right", + "bottom", + "left" + ], [ "-webkit-box-sizing", "-moz-box-sizing", @@ -87,6 +71,121 @@ "padding-bottom", "padding-left" ], + [ + "opacity", + "filter:progid:DXImageTransform.Microsoft.Alpha(Opacity", + "-ms-filter:\\'progid:DXImageTransform.Microsoft.Alpha", + "-ms-interpolation-mode", + "border", + "border-width", + "border-style", + "border-color", + "border-top", + "border-top-width", + "border-top-style", + "border-top-color", + "border-right", + "border-right-width", + "border-right-style", + "border-right-color", + "border-bottom", + "border-bottom-width", + "border-bottom-style", + "border-bottom-color", + "border-left", + "border-left-width", + "border-left-style", + "border-left-color", + "-webkit-border-radius", + "-moz-border-radius", + "border-radius", + "-webkit-border-top-left-radius", + "-moz-border-radius-topleft", + "border-top-left-radius", + "-webkit-border-top-right-radius", + "-moz-border-radius-topright", + "border-top-right-radius", + "-webkit-border-bottom-right-radius", + "-moz-border-radius-bottomright", + "border-bottom-right-radius", + "-webkit-border-bottom-left-radius", + "-moz-border-radius-bottomleft", + "border-bottom-left-radius", + "-webkit-border-image", + "-moz-border-image", + "-o-border-image", + "border-image", + "-webkit-border-image-source", + "-moz-border-image-source", + "-o-border-image-source", + "border-image-source", + "-webkit-border-image-slice", + "-moz-border-image-slice", + "-o-border-image-slice", + "border-image-slice", + "-webkit-border-image-width", + "-moz-border-image-width", + "-o-border-image-width", + "border-image-width", + "-webkit-border-image-outset", + "-moz-border-image-outset", + "-o-border-image-outset", + "border-image-outset", + "-webkit-border-image-repeat", + "-moz-border-image-repeat", + "-o-border-image-repeat", + "border-image-repeat", + "outline", + "outline-width", + "outline-style", + "outline-color", + "outline-offset" + ], + [ + "background", + "filter:progid:DXImageTransform.Microsoft.AlphaImageLoader", + "background-color", + "background-image", + "background-repeat", + "background-attachment", + "background-position", + "background-position-x", + "-ms-background-position-x", + "background-position-y", + "-ms-background-position-y", + "-webkit-background-clip", + "-moz-background-clip", + "background-clip", + "background-origin", + "-webkit-background-size", + "-moz-background-size", + "-o-background-size", + "background-size", + "box-decoration-break", + "-webkit-box-shadow", + "-moz-box-shadow", + "box-shadow", + "filter:progid:DXImageTransform.Microsoft.gradient", + "-ms-filter:\\'progid:DXImageTransform.Microsoft.gradient" + ], + [ + "color", + "font", + "font-family", + "font-size", + "font-weight", + "font-style", + "font-variant", + "font-size-adjust", + "font-stretch", + "font-effect", + "font-emphasize", + "font-emphasize-position", + "font-emphasize-style", + "font-smooth", + "line-height", + "text-shadow" + ], [ "table-layout", "empty-cells", @@ -225,103 +324,6 @@ "-moz-hyphens", "hyphens", "pointer-events" - ], - [ - "opacity", - "filter:progid:DXImageTransform.Microsoft.Alpha(Opacity", - "-ms-filter:\\'progid:DXImageTransform.Microsoft.Alpha", - "-ms-interpolation-mode", - "color", - "border", - "border-width", - "border-style", - "border-color", - "border-top", - "border-top-width", - "border-top-style", - "border-top-color", - "border-right", - "border-right-width", - "border-right-style", - "border-right-color", - "border-bottom", - "border-bottom-width", - "border-bottom-style", - "border-bottom-color", - "border-left", - "border-left-width", - "border-left-style", - "border-left-color", - "-webkit-border-radius", - "-moz-border-radius", - "border-radius", - "-webkit-border-top-left-radius", - "-moz-border-radius-topleft", - "border-top-left-radius", - "-webkit-border-top-right-radius", - "-moz-border-radius-topright", - "border-top-right-radius", - "-webkit-border-bottom-right-radius", - "-moz-border-radius-bottomright", - "border-bottom-right-radius", - "-webkit-border-bottom-left-radius", - "-moz-border-radius-bottomleft", - "border-bottom-left-radius", - "-webkit-border-image", - "-moz-border-image", - "-o-border-image", - "border-image", - "-webkit-border-image-source", - "-moz-border-image-source", - "-o-border-image-source", - "border-image-source", - "-webkit-border-image-slice", - "-moz-border-image-slice", - "-o-border-image-slice", - "border-image-slice", - "-webkit-border-image-width", - "-moz-border-image-width", - "-o-border-image-width", - "border-image-width", - "-webkit-border-image-outset", - "-moz-border-image-outset", - "-o-border-image-outset", - "border-image-outset", - "-webkit-border-image-repeat", - "-moz-border-image-repeat", - "-o-border-image-repeat", - "border-image-repeat", - "outline", - "outline-width", - "outline-style", - "outline-color", - "outline-offset", - "background", - "filter:progid:DXImageTransform.Microsoft.AlphaImageLoader", - "background-color", - "background-image", - "background-repeat", - "background-attachment", - "background-position", - "background-position-x", - "-ms-background-position-x", - "background-position-y", - "-ms-background-position-y", - "-webkit-background-clip", - "-moz-background-clip", - "background-clip", - "background-origin", - "-webkit-background-size", - "-moz-background-size", - "-o-background-size", - "background-size", - "box-decoration-break", - "-webkit-box-shadow", - "-moz-box-shadow", - "box-shadow", - "filter:progid:DXImageTransform.Microsoft.gradient", - "-ms-filter:\\'progid:DXImageTransform.Microsoft.gradient", - "text-shadow" ] ] } \ No newline at end of file From 78ac782d8ec658e8b56f67465a992e6870f709ad Mon Sep 17 00:00:00 2001 From: Alexander Goncharov Date: Sat, 28 Dec 2013 00:39:11 +0600 Subject: [PATCH 3/4] version # change According to semantic versioning (http://semver.org) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index db28895..0231e1c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "brackets-csscomb", "title": "CSScomb", - "version": "1.0.0", + "version": "1.1.0", "description": "Format CSS files with csscomb.js", "homepage": "https://github.com/i-akhmadullin/brackets-csscomb", "author": "Ilya Akhmadullin (https://github.com/i-akhmadullin/)", From f0e5011e6bac76a05575dddf48fde3cd7b0ea078 Mon Sep 17 00:00:00 2001 From: Alexander Goncharov Date: Sat, 28 Dec 2013 00:46:27 +0600 Subject: [PATCH 4/4] trying to fix nesting issue --- csscomb.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/csscomb.json b/csscomb.json index bb8070e..9461256 100644 --- a/csscomb.json +++ b/csscomb.json @@ -4,7 +4,7 @@ "node_modules/**" ], "always-semicolon": true, - "block-indent": "\t", + "block-indent": "", "colon-space": [0, 1], "color-case": "lower", "color-shorthand": true, @@ -14,7 +14,7 @@ "leading-zero": false, "quotes": "single", "remove-empty-rulesets": false, - "rule-indent": "\t", + "rule-indent": "", "stick-brace": 1, "strip-spaces": true, "unitless-zero": true,