Remove deprecated options

Skip integral tests
csscomb · Jun 9, 2014 · 241c168 · 241c168
1 parent a460e04
commit 241c168
Show file tree

Hide file tree

Showing 16 changed files with 6 additions and 1,211 deletions.
diff --git a/config/csscomb.json b/config/csscomb.json
@@ -4,18 +4,13 @@
         "node_modules/**"
     ],
     "always-semicolon": true,
-    "block-indent": "    ",
-    "colon-space": ["", " "],
     "color-case": "lower",
     "color-shorthand": true,
-    "combinator-space": [" ", " "],
     "element-case": "lower",
     "eof-newline": true,
     "leading-zero": false,
     "quotes": "single",
     "remove-empty-rulesets": true,
-    "rule-indent": "    ",
-    "stick-brace": "\n",
     "strip-spaces": true,
     "unitless-zero": true,
     "vendor-prefix-align": true,

diff --git a/doc/configuration.md b/doc/configuration.md
@@ -39,17 +39,13 @@ Here is an example:
     "verbose": true,
 
     "always-semicolon": true,
-    "block-indent": "    ",
-    "colon-space": ["", " "],
     "color-case": "lower",
     "color-shorthand": true,
     "element-case": "lower",
     "eof-newline": true,
     "leading-zero": false,
     "quotes": "single",
     "remove-empty-rulesets": true,
-    "rule-indent": "    ",
-    "stick-brace": "\n",
     "strip-spaces": true,
     "unitless-zero": true,
     "vendor-prefix-align": true
@@ -111,13 +107,7 @@ Generated config wiil then look this way:
     "color-case": "lower",
     "color-shorthand": true,
     "strip-spaces": true,
-    "eof-newline": true,
-    "stick-brace": "\n",
-    "colon-space": [
-        "",
-        " "
-    ],
-    "rule-indent": "    "
+    "eof-newline": true
 }
 ```
 

diff --git a/doc/options.md b/doc/options.md
@@ -46,82 +46,6 @@ div {
     }
 ```
 
-## block-indent
-
-**Note**: This option should be used together with [rule-indent](#rule-indent).
-
-Acceptable values:
-
-* `{Number}` of spaces;
-* `{String}` of whitespaces or tabs. If there is any other character in the
-   string, the value will not be set.
-
-Example: `{ "block-indent": 2 }`
-
-```css
-/* before */
-  a { color: red }
-  @media all { a { color: green } }
-
-/* after */
-a { color: red
-}
-@media all {
-  a { color: green
-  }
-}
-```
-
-Example: `{ "block-indent": "  " }`
-
-```css
-/* before */
-  a { color: red }
-  @media all { a { color: green } }
-
-/* after */
-a { color: red
-}
-@media all {
-  a { color: green
-  }
-}
-```
-
-## colon-space
-
-Set spaces around `:`.
-
-Acceptable value is `{Array}` with 2 elements of the following types:
-
-* `{Number}` of spaces;
-* `{String}` of whitespaces or tabs. If there is any other character in the
-   string, the value will not be set.
-
-The first element of the array sets spaces before colon, and the second one sets
-spaces after colon.
-
-Example: `{ "colon-space": ["\t", "\t"] }`
-
-```css
-/* before */
-a { color: red }
-
-/* after */
-a { color	:	red }
-```
-
-Example: `{ "colon-space": [0, 1] }`
-
-```css
-/* before */
-a { color:red }
-
-/* after */
-a { color: red }
-```
-
-
 ## color-case
 
 Unify case of hexadecimal colors.
@@ -170,41 +94,6 @@ b { color: #fc0 }
 b { color: #ffcc00 }
 ```
 
-## combinator-space
-
-Set spaces around combinator.
-
-Acceptable value is `{Array}` with 2 elements of the following types:
-
-* `{Number}` of spaces;
-* `{String}` of whitespaces, tabs or new lines. If there is any other
-   character in the string, the value will not be set.
-
-The first element of the array sets spaces before combinator, and the second
-one sets spaces after combinator.
-
-Example: `{ "combinator-space": [" ", "\n"] }`
-
-```css
-/* before */
-a>b { color: red }
-
-/* after */
-a >
-b { color: red }
-```
-
-Example: `{ "combinator-space": [1, 1] }`
-
-```css
-/* before */
-a>b { color: red }
-
-/* after */
-a > b { color: red }
-```
-
-
 ## element-case
 
 Unify case of element selectors.
@@ -301,40 +190,6 @@ Example: `{ "remove-empty-rulesets": true }`.
 
 `a { color: red; } p { /* hey */ } b { }` &rarr; `a { color: red; } p { /* hey */ } `
 
-## rule-indent
-
-**Note**: This option should be used together with [block-indent](#block-indent).
-
-Acceptable values:
-
-* `{Number}` of spaces;
-* `{String}` of whitespaces or tabs. If there is any other character in the
-   string, the value will not be set.
-
-Example: `{ "rule-indent": 2 }`
-
-```css
-/* before */
-a { color:red; margin:0 }
-
-/* after */
-a {
-  color:red;
-  margin:0 }
-```
-
-Example: `{ "rule-indent": "  " }`
-
-```css
-/* before */
-a { color:red; margin:0 }
-
-/* after */
-a {
-  color:red;
-  margin:0 }
-```
-
 ## sort-order
 
 Set sort order.
@@ -417,37 +272,6 @@ p {
 }
 ```
 
-## stick-brace
-
-Set spaces before `{`.
-
-Acceptable values:
-
-* `{Number}` of spaces;
-* `{String}` of whitespaces, tabs or newlines. If there is any other
-   character in the string, the value will not be set.
-
-Example: `{ "stick-brace": "\n" }`
-
-```css
-/* before */
-a { color:red }
-
-/* after */
-a
-{ color:red }
-```
-
-Example: `{ "stick-brace": 1 }`
-
-```css
-/* before */
-a{ color:red }
-
-/* after */
-a { color:red }
-```
-
 ## strip-spaces
 
 Whether to trim trailing spaces.

diff --git a/lib/csscomb.js b/lib/csscomb.js
@@ -23,11 +23,6 @@ var Comb = function(config) {
         'quotes',
         'strip-spaces',
         'eof-newline',
-        'stick-brace',
-        'colon-space',
-        'combinator-space',
-        'rule-indent',
-        'block-indent',
         'unitless-zero',
         'sort-order',
         'vendor-prefix-align'

diff --git a/lib/options/block-indent.js b/lib/options/block-indent.js