summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerman M. Bravo <german.mb@deipi.com>2013-10-05 09:05:00 -0500
committerGerman M. Bravo <german.mb@deipi.com>2013-10-05 09:05:00 -0500
commit0352cf6f90d34554eb7b89cc44eb5836105a6e4b (patch)
treeafbb1c94c367d7914d34bf52c84a72a757ad0724
parent9185c19cfd7c12d11926a56dacb1342c4f93701e (diff)
downloadpyscss-0352cf6f90d34554eb7b89cc44eb5836105a6e4b.tar.gz
compress option is deprecated (use style instead)
-rw-r--r--scss/__init__.py9
-rw-r--r--scss/tests/files/bugs/argspec-named-arguments.scss2
-rw-r--r--scss/tests/files/bugs/argspec-slurpy-arguments.scss2
-rw-r--r--scss/tests/files/bugs/at-rules-1.scss2
-rw-r--r--scss/tests/files/bugs/at-rules-2.scss2
-rw-r--r--scss/tests/files/bugs/at-rules-compressed-semicolon.scss2
-rw-r--r--scss/tests/files/bugs/at-rules-duplicate-media-queries.scss2
-rw-r--r--scss/tests/files/bugs/at-rules-interpolation.scss2
-rw-r--r--scss/tests/files/bugs/colors-preserve-names.scss2
-rw-r--r--scss/tests/files/bugs/division-in-assignment.scss2
-rw-r--r--scss/tests/files/bugs/division-vs-literal-slash.scss2
-rw-r--r--scss/tests/files/bugs/extend-common-prefix-complex.scss2
-rw-r--r--scss/tests/files/bugs/extend-common-prefix.scss2
-rw-r--r--scss/tests/files/bugs/names-equivalence.scss2
-rw-r--r--scss/tests/files/bugs/selectors-adjacent-is-not-include.scss2
-rw-r--r--scss/tests/files/bugs/variables-font-face-default.scss2
-rw-r--r--scss/tests/files/compass/gradients.scss2
-rw-r--r--scss/tests/files/general/000-smoketest.scss2
-rw-r--r--scss/tests/files/general/each-destructuring-2.scss2
-rw-r--r--scss/tests/files/general/each-destructuring-3.scss2
-rw-r--r--scss/tests/files/general/each-destructuring.scss2
-rw-r--r--scss/tests/files/general/interpolation-mixin-name.scss2
-rw-r--r--scss/tests/files/general/maps-example-lists.scss2
-rw-r--r--scss/tests/files/general/maps-example.scss2
-rw-r--r--scss/tests/files/general/names-loop-variable.scss2
-rw-r--r--scss/tests/files/general/scoping-mixin-2.scss2
-rw-r--r--scss/tests/files/general/scoping-mixin.scss2
-rw-r--r--scss/tests/files/general/scoping-nested.scss2
-rw-r--r--scss/tests/files/kronuz/args.scss2
-rw-r--r--scss/tests/files/kronuz/functions-context.scss2
-rw-r--r--scss/tests/files/kronuz/image-colors.scss2
-rw-r--r--scss/tests/files/kronuz/imports-unused.scss2
-rw-r--r--scss/tests/files/kronuz/linear-gradient.scss2
-rw-r--r--scss/tests/files/kronuz/menu.scss3
-rw-r--r--scss/tests/files/kronuz/mixins-context.scss2
-rw-r--r--scss/tests/files/kronuz/mul-em.scss2
-rw-r--r--scss/tests/files/kronuz/mul-list.scss2
-rw-r--r--scss/tests/files/kronuz/order-test-each.scss2
-rw-r--r--scss/tests/files/kronuz/order-test-for.scss2
-rw-r--r--scss/tests/files/kronuz/order-test.scss2
-rw-r--r--scss/tests/files/kronuz/rgba-colors.scss2
-rw-r--r--scss/tests/files/kronuz/scope-loop-variables.scss2
-rw-r--r--scss/tests/files/kronuz/sprite-map.scss2
-rw-r--r--scss/tests/files/kronuz/variables_scope.scss2
-rw-r--r--scss/tests/files/original-doctests/000-general.scss2
-rw-r--r--scss/tests/files/original-doctests/001-variables.scss2
-rw-r--r--scss/tests/files/original-doctests/002-nesting-children.scss2
-rw-r--r--scss/tests/files/original-doctests/003-nesting-children-2.scss2
-rw-r--r--scss/tests/files/original-doctests/004-nesting-children-3.scss2
-rw-r--r--scss/tests/files/original-doctests/005-extends.scss2
-rw-r--r--scss/tests/files/original-doctests/006-extends-2.scss2
-rw-r--r--scss/tests/files/original-doctests/007-extends-3.scss2
-rw-r--r--scss/tests/files/original-doctests/008-extends-4.scss2
-rw-r--r--scss/tests/files/original-doctests/009-extends-5.scss2
-rw-r--r--scss/tests/files/original-doctests/010-math.scss2
-rw-r--r--scss/tests/files/original-doctests/011-math-2.scss2
-rw-r--r--scss/tests/files/original-doctests/012-math-3.scss2
-rw-r--r--scss/tests/files/original-doctests/013-nesting.scss2
-rw-r--r--scss/tests/files/original-doctests/014-nesting-2.scss2
-rw-r--r--scss/tests/files/original-doctests/015-nesting-3.scss2
-rw-r--r--scss/tests/files/original-doctests/016-variables.scss2
-rw-r--r--scss/tests/files/original-doctests/017-interpolation.scss2
-rw-r--r--scss/tests/files/original-doctests/018-mixins.scss2
-rw-r--r--scss/tests/files/original-doctests/019-mixins-2.scss2
-rw-r--r--scss/tests/files/original-doctests/020-mixins-3.scss2
-rw-r--r--scss/tests/files/original-doctests/021-extend.scss2
-rw-r--r--scss/tests/files/original-doctests/022-extend-multiple.scss2
-rw-r--r--scss/tests/files/original-doctests/023-extend-multiple-2.scss2
-rw-r--r--scss/tests/files/original-doctests/024-extend-placeholder.scss2
-rw-r--r--scss/tests/files/original-doctests/025-forum.scss2
-rw-r--r--scss/tests/files/original-doctests/026-forum-2.scss2
-rw-r--r--scss/tests/files/original-doctests/027-forum-3.scss2
-rw-r--r--scss/tests/files/original-doctests/028-errors.scss2
-rw-r--r--scss/tests/files/original-doctests/029-errors-2.scss2
-rw-r--r--scss/tests/files/original-doctests/030-errors-3.scss2
-rw-r--r--scss/tests/files/original-doctests/031-test.scss2
-rw-r--r--scss/tests/files/original-doctests/032-test-2.scss2
-rw-r--r--scss/tests/files/original-doctests/033-test-3.scss2
-rw-r--r--scss/tests/files/original-doctests/034-test-4.scss2
-rw-r--r--scss/tests/files/original-doctests/035-test-5.scss2
-rw-r--r--scss/tests/files/original-doctests/036-test-6.scss2
-rw-r--r--scss/tests/files/original-doctests/037-test-7.scss2
-rw-r--r--scss/tests/files/original-doctests/038-test-8.scss2
-rw-r--r--scss/tests/files/original-doctests/039-hover-extend.scss2
-rw-r--r--scss/tests/files/original-doctests/039-math-4.scss2
-rw-r--r--scss/tests/files/original-doctests/040-complex-sequence-extend.scss2
-rw-r--r--scss/tests/files/original-doctests/041-another-extend.scss2
-rw-r--r--scss/tests/files/regressions/args-vars.scss2
-rw-r--r--scss/tests/files/regressions/argspec-default-arguments.scss2
-rw-r--r--scss/tests/files/regressions/argspec-no-arguments.scss2
-rw-r--r--scss/tests/files/regressions/argspec-trailing-comma.scss2
-rw-r--r--scss/tests/files/regressions/interpolation-2.scss2
-rw-r--r--scss/tests/files/regressions/interpolation.scss2
-rw-r--r--scss/tests/files/regressions/issue-10.scss2
-rw-r--r--scss/tests/files/regressions/issue-110.scss2
-rw-r--r--scss/tests/files/regressions/issue-2.scss2
-rw-r--r--scss/tests/files/regressions/issue-21.scss2
-rw-r--r--scss/tests/files/regressions/issue-32.scss2
-rw-r--r--scss/tests/files/regressions/issue-4.scss2
-rw-r--r--scss/tests/files/regressions/issue-40.scss2
-rw-r--r--scss/tests/files/regressions/issue-5.scss2
-rw-r--r--scss/tests/files/regressions/issue-52.scss2
-rw-r--r--scss/tests/files/regressions/issue-6.scss2
-rw-r--r--scss/tests/files/regressions/issue-7.scss2
-rw-r--r--scss/tests/test_misc.py4
105 files changed, 109 insertions, 111 deletions
diff --git a/scss/__init__.py b/scss/__init__.py
index be13975..a159e25 100644
--- a/scss/__init__.py
+++ b/scss/__init__.py
@@ -614,6 +614,7 @@ class Scss(object):
option = option.replace('-', '_')
if option == 'compress':
option = 'style'
+ log.warn("The option 'compress' is deprecated. Please use 'style' instead.")
rule.options[option] = value
def _get_funct_def(self, rule, calculator, argument):
@@ -1425,14 +1426,12 @@ class Scss(object):
style = self.scss_opts.get('style', config.STYLE)
debug_info = self.scss_opts.get('debug_info', False)
- if style is True:
- sc, sp, tb, nst, srnl, nl, rnl, lnl, dbg = False, '', '', False, '', '', '', '', False
- elif style is False:
+ if style == 'legacy' or style is False:
sc, sp, tb, nst, srnl, nl, rnl, lnl, dbg = True, ' ', ' ', False, '', '\n', '\n', '\n', debug_info
+ elif style == 'compressed' or style is True:
+ sc, sp, tb, nst, srnl, nl, rnl, lnl, dbg = False, '', '', False, '', '', '', '', False
elif style == 'compact':
sc, sp, tb, nst, srnl, nl, rnl, lnl, dbg = True, ' ', '', False, '\n', ' ', '\n', ' ', debug_info
- elif style == 'compressed':
- sc, sp, tb, nst, srnl, nl, rnl, lnl, dbg = False, '', '', False, '', '', '', '', False
elif style == 'expanded':
sc, sp, tb, nst, srnl, nl, rnl, lnl, dbg = True, ' ', ' ', False, '\n', '\n', '\n', '\n', debug_info
else: # if style == 'nested':
diff --git a/scss/tests/files/bugs/argspec-named-arguments.scss b/scss/tests/files/bugs/argspec-named-arguments.scss
index 4f219a2..1afc11d 100644
--- a/scss/tests/files/bugs/argspec-named-arguments.scss
+++ b/scss/tests/files/bugs/argspec-named-arguments.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
@function calculate($foo: 1, $bar: 2) {
@return $foo * $bar;
diff --git a/scss/tests/files/bugs/argspec-slurpy-arguments.scss b/scss/tests/files/bugs/argspec-slurpy-arguments.scss
index a9e2f7c..ab82c63 100644
--- a/scss/tests/files/bugs/argspec-slurpy-arguments.scss
+++ b/scss/tests/files/bugs/argspec-slurpy-arguments.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
@mixin box-shadow($shadows...) {
box-shadow: $shadows;
diff --git a/scss/tests/files/bugs/at-rules-1.scss b/scss/tests/files/bugs/at-rules-1.scss
index 81347d7..b71997b 100644
--- a/scss/tests/files/bugs/at-rules-1.scss
+++ b/scss/tests/files/bugs/at-rules-1.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
p {
color: #f00;
diff --git a/scss/tests/files/bugs/at-rules-2.scss b/scss/tests/files/bugs/at-rules-2.scss
index 7798479..f226237 100644
--- a/scss/tests/files/bugs/at-rules-2.scss
+++ b/scss/tests/files/bugs/at-rules-2.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
h1 {
color: #f00;
diff --git a/scss/tests/files/bugs/at-rules-compressed-semicolon.scss b/scss/tests/files/bugs/at-rules-compressed-semicolon.scss
index 9b1d741..56b3f09 100644
--- a/scss/tests/files/bugs/at-rules-compressed-semicolon.scss
+++ b/scss/tests/files/bugs/at-rules-compressed-semicolon.scss
@@ -1,4 +1,4 @@
-@option compress: true;
+@option style:compressed;
@charset "utf8";
diff --git a/scss/tests/files/bugs/at-rules-duplicate-media-queries.scss b/scss/tests/files/bugs/at-rules-duplicate-media-queries.scss
index 6fb0454..ef099ee 100644
--- a/scss/tests/files/bugs/at-rules-duplicate-media-queries.scss
+++ b/scss/tests/files/bugs/at-rules-duplicate-media-queries.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
// https://github.com/Kronuz/pyScss/issues/69
p {
diff --git a/scss/tests/files/bugs/at-rules-interpolation.scss b/scss/tests/files/bugs/at-rules-interpolation.scss
index 1c2e6ff..b318edb 100644
--- a/scss/tests/files/bugs/at-rules-interpolation.scss
+++ b/scss/tests/files/bugs/at-rules-interpolation.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
$width: 900px;
diff --git a/scss/tests/files/bugs/colors-preserve-names.scss b/scss/tests/files/bugs/colors-preserve-names.scss
index d03f3ab..207bb65 100644
--- a/scss/tests/files/bugs/colors-preserve-names.scss
+++ b/scss/tests/files/bugs/colors-preserve-names.scss
@@ -1,4 +1,4 @@
-@option compress: true;
+@option style:compressed;
div.black p[color=black] {
content: 'black';
diff --git a/scss/tests/files/bugs/division-in-assignment.scss b/scss/tests/files/bugs/division-in-assignment.scss
index f29a9dd..6490014 100644
--- a/scss/tests/files/bugs/division-in-assignment.scss
+++ b/scss/tests/files/bugs/division-in-assignment.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
$em-scale: 12px / 1em;
diff --git a/scss/tests/files/bugs/division-vs-literal-slash.scss b/scss/tests/files/bugs/division-vs-literal-slash.scss
index f003f28..fac5e35 100644
--- a/scss/tests/files/bugs/division-vs-literal-slash.scss
+++ b/scss/tests/files/bugs/division-vs-literal-slash.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
// http://sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#division-and-slash
diff --git a/scss/tests/files/bugs/extend-common-prefix-complex.scss b/scss/tests/files/bugs/extend-common-prefix-complex.scss
index 7fc675c..f2df677 100644
--- a/scss/tests/files/bugs/extend-common-prefix-complex.scss
+++ b/scss/tests/files/bugs/extend-common-prefix-complex.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
#one #two #three a {
key: value;
diff --git a/scss/tests/files/bugs/extend-common-prefix.scss b/scss/tests/files/bugs/extend-common-prefix.scss
index 33dbaee..10d7590 100644
--- a/scss/tests/files/bugs/extend-common-prefix.scss
+++ b/scss/tests/files/bugs/extend-common-prefix.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
#content {
.error {
diff --git a/scss/tests/files/bugs/names-equivalence.scss b/scss/tests/files/bugs/names-equivalence.scss
index 2ed75bc..e57d812 100644
--- a/scss/tests/files/bugs/names-equivalence.scss
+++ b/scss/tests/files/bugs/names-equivalence.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
$foo_bar: 1em;
diff --git a/scss/tests/files/bugs/selectors-adjacent-is-not-include.scss b/scss/tests/files/bugs/selectors-adjacent-is-not-include.scss
index c1b2157..12c9e21 100644
--- a/scss/tests/files/bugs/selectors-adjacent-is-not-include.scss
+++ b/scss/tests/files/bugs/selectors-adjacent-is-not-include.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
p {
+ h4 {
diff --git a/scss/tests/files/bugs/variables-font-face-default.scss b/scss/tests/files/bugs/variables-font-face-default.scss
index 799f647..f4ca5d3 100644
--- a/scss/tests/files/bugs/variables-font-face-default.scss
+++ b/scss/tests/files/bugs/variables-font-face-default.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
$helvetica-font-fallbacks: "Helvetica Neue", Arial, Helvetica, sans-serif !default;
diff --git a/scss/tests/files/compass/gradients.scss b/scss/tests/files/compass/gradients.scss
index 7e7fa73..9951e75 100644
--- a/scss/tests/files/compass/gradients.scss
+++ b/scss/tests/files/compass/gradients.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
// Borrowed from Compass's actual test suite, but cut down to just the gradient
// calls, and with some editing to e.g. preserve color formatting:
diff --git a/scss/tests/files/general/000-smoketest.scss b/scss/tests/files/general/000-smoketest.scss
index c0824b1..84085ac 100644
--- a/scss/tests/files/general/000-smoketest.scss
+++ b/scss/tests/files/general/000-smoketest.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
@import "lib";
@import "part";
diff --git a/scss/tests/files/general/each-destructuring-2.scss b/scss/tests/files/general/each-destructuring-2.scss
index e644481..93def43 100644
--- a/scss/tests/files/general/each-destructuring-2.scss
+++ b/scss/tests/files/general/each-destructuring-2.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
a {
@each $name, $number in (foo: 1px, bar: 2px, baz: 3px) {
diff --git a/scss/tests/files/general/each-destructuring-3.scss b/scss/tests/files/general/each-destructuring-3.scss
index 57ffabb..6340d03 100644
--- a/scss/tests/files/general/each-destructuring-3.scss
+++ b/scss/tests/files/general/each-destructuring-3.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
@each $animal, $color, $cursor in (puma, black, default),
(sea-slug, blue, pointer),
diff --git a/scss/tests/files/general/each-destructuring.scss b/scss/tests/files/general/each-destructuring.scss
index ff64403..540cb6c 100644
--- a/scss/tests/files/general/each-destructuring.scss
+++ b/scss/tests/files/general/each-destructuring.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
@each $header, $size in (h1: 2em, h2: 1.5em, h3: 1.2em) {
#{$header} {
diff --git a/scss/tests/files/general/interpolation-mixin-name.scss b/scss/tests/files/general/interpolation-mixin-name.scss
index 0881907..dcc087c 100644
--- a/scss/tests/files/general/interpolation-mixin-name.scss
+++ b/scss/tests/files/general/interpolation-mixin-name.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
@mixin _menu-horizontal($level) {
ul.l#{$level} {
diff --git a/scss/tests/files/general/maps-example-lists.scss b/scss/tests/files/general/maps-example-lists.scss
index 4813865..00cf9ba 100644
--- a/scss/tests/files/general/maps-example-lists.scss
+++ b/scss/tests/files/general/maps-example-lists.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
// Taken from the Ruby CHANGELOG
$themes: (
diff --git a/scss/tests/files/general/maps-example.scss b/scss/tests/files/general/maps-example.scss
index a767776..f64ee85 100644
--- a/scss/tests/files/general/maps-example.scss
+++ b/scss/tests/files/general/maps-example.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
// Taken from the Ruby documentation
$themes: (
diff --git a/scss/tests/files/general/names-loop-variable.scss b/scss/tests/files/general/names-loop-variable.scss
index 44d64f5..10364de 100644
--- a/scss/tests/files/general/names-loop-variable.scss
+++ b/scss/tests/files/general/names-loop-variable.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
a {
@each $link_color in red, blue {
diff --git a/scss/tests/files/general/scoping-mixin-2.scss b/scss/tests/files/general/scoping-mixin-2.scss
index e8fb892..3e567d1 100644
--- a/scss/tests/files/general/scoping-mixin-2.scss
+++ b/scss/tests/files/general/scoping-mixin-2.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
$a: original;
$b: original;
diff --git a/scss/tests/files/general/scoping-mixin.scss b/scss/tests/files/general/scoping-mixin.scss
index 4c1b027..8b22048 100644
--- a/scss/tests/files/general/scoping-mixin.scss
+++ b/scss/tests/files/general/scoping-mixin.scss
@@ -1,4 +1,4 @@
-@option compress: no, reverse-colors: yes;
+@option style:legacy, reverse-colors:yes;
$global: blue;
diff --git a/scss/tests/files/general/scoping-nested.scss b/scss/tests/files/general/scoping-nested.scss
index 8d8fe8e..e21c9c6 100644
--- a/scss/tests/files/general/scoping-nested.scss
+++ b/scss/tests/files/general/scoping-nested.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
$color: black;
.scoped {
diff --git a/scss/tests/files/kronuz/args.scss b/scss/tests/files/kronuz/args.scss
index 13b9e49..610d033 100644
--- a/scss/tests/files/kronuz/args.scss
+++ b/scss/tests/files/kronuz/args.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
$legacy-support-for-ie6: true;
diff --git a/scss/tests/files/kronuz/functions-context.scss b/scss/tests/files/kronuz/functions-context.scss
index 5280ae1..8c66dc0 100644
--- a/scss/tests/files/kronuz/functions-context.scss
+++ b/scss/tests/files/kronuz/functions-context.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
@import "functions-context";
diff --git a/scss/tests/files/kronuz/image-colors.scss b/scss/tests/files/kronuz/image-colors.scss
index ee18bde..ed39624 100644
--- a/scss/tests/files/kronuz/image-colors.scss
+++ b/scss/tests/files/kronuz/image-colors.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
.mod {
background: inline-image("squares/ten-by-ten.png", $src-color: #c4c4c4, $dst-color: green);
}
diff --git a/scss/tests/files/kronuz/imports-unused.scss b/scss/tests/files/kronuz/imports-unused.scss
index e5c3a07..f6e5a4a 100644
--- a/scss/tests/files/kronuz/imports-unused.scss
+++ b/scss/tests/files/kronuz/imports-unused.scss
@@ -1,4 +1,4 @@
-@option compress:no, warn_unused:yes;
+@option style:legacy, warn_unused:yes;
@import "functions-context";
diff --git a/scss/tests/files/kronuz/linear-gradient.scss b/scss/tests/files/kronuz/linear-gradient.scss
index f7f05c8..471d3e4 100644
--- a/scss/tests/files/kronuz/linear-gradient.scss
+++ b/scss/tests/files/kronuz/linear-gradient.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
div {
background: linear-gradient(top, #4d4d4d 0%,#3f3f3f 50%,#333333 50%,#252525 100%);
diff --git a/scss/tests/files/kronuz/menu.scss b/scss/tests/files/kronuz/menu.scss
index 92e3325..a1c7123 100644
--- a/scss/tests/files/kronuz/menu.scss
+++ b/scss/tests/files/kronuz/menu.scss
@@ -1,5 +1,4 @@
-@option compress:no;
-@option legacy-scoping: yes;
+@option style:legacy, legacy-scoping:yes;
@import "menu";
diff --git a/scss/tests/files/kronuz/mixins-context.scss b/scss/tests/files/kronuz/mixins-context.scss
index 704ad9f..775ed19 100644
--- a/scss/tests/files/kronuz/mixins-context.scss
+++ b/scss/tests/files/kronuz/mixins-context.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
@import "mixins-context";
diff --git a/scss/tests/files/kronuz/mul-em.scss b/scss/tests/files/kronuz/mul-em.scss
index 46e6df4..0de1bd4 100644
--- a/scss/tests/files/kronuz/mul-em.scss
+++ b/scss/tests/files/kronuz/mul-em.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
div {
$approximate_em_value: 12px / 1em;
diff --git a/scss/tests/files/kronuz/mul-list.scss b/scss/tests/files/kronuz/mul-list.scss
index 57ac6cd..7cccc01 100644
--- a/scss/tests/files/kronuz/mul-list.scss
+++ b/scss/tests/files/kronuz/mul-list.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
div {
margin: (1em 0 3em) * 0.6;
diff --git a/scss/tests/files/kronuz/order-test-each.scss b/scss/tests/files/kronuz/order-test-each.scss
index 52a577c..1b391d5 100644
--- a/scss/tests/files/kronuz/order-test-each.scss
+++ b/scss/tests/files/kronuz/order-test-each.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
div {
@each $i in 1 2 3 {
diff --git a/scss/tests/files/kronuz/order-test-for.scss b/scss/tests/files/kronuz/order-test-for.scss
index 9d371dc..a309bbc 100644
--- a/scss/tests/files/kronuz/order-test-for.scss
+++ b/scss/tests/files/kronuz/order-test-for.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
div {
@for $i from 1 through 3 {
diff --git a/scss/tests/files/kronuz/order-test.scss b/scss/tests/files/kronuz/order-test.scss
index ca0fea3..dcae94c 100644
--- a/scss/tests/files/kronuz/order-test.scss
+++ b/scss/tests/files/kronuz/order-test.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
$col: red;
diff --git a/scss/tests/files/kronuz/rgba-colors.scss b/scss/tests/files/kronuz/rgba-colors.scss
index e14da44..fb0ff45 100644
--- a/scss/tests/files/kronuz/rgba-colors.scss
+++ b/scss/tests/files/kronuz/rgba-colors.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
div {
color: rgba(black, 60%);
diff --git a/scss/tests/files/kronuz/scope-loop-variables.scss b/scss/tests/files/kronuz/scope-loop-variables.scss
index ebe2a57..f04ba62 100644
--- a/scss/tests/files/kronuz/scope-loop-variables.scss
+++ b/scss/tests/files/kronuz/scope-loop-variables.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
@option legacy-scoping: yes;
div {
diff --git a/scss/tests/files/kronuz/sprite-map.scss b/scss/tests/files/kronuz/sprite-map.scss
index a1f6bc0..fb43688 100644
--- a/scss/tests/files/kronuz/sprite-map.scss
+++ b/scss/tests/files/kronuz/sprite-map.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
$images: sprite-map("squares/*.png", $cache-buster: false);
diff --git a/scss/tests/files/kronuz/variables_scope.scss b/scss/tests/files/kronuz/variables_scope.scss
index dbdaece..2fbec15 100644
--- a/scss/tests/files/kronuz/variables_scope.scss
+++ b/scss/tests/files/kronuz/variables_scope.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
@option legacy-scoping: yes;
div {
diff --git a/scss/tests/files/original-doctests/000-general.scss b/scss/tests/files/original-doctests/000-general.scss
index 70ef515..edd741e 100644
--- a/scss/tests/files/original-doctests/000-general.scss
+++ b/scss/tests/files/original-doctests/000-general.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
p {
span {
diff --git a/scss/tests/files/original-doctests/001-variables.scss b/scss/tests/files/original-doctests/001-variables.scss
index 7e2edc1..847bf8c 100644
--- a/scss/tests/files/original-doctests/001-variables.scss
+++ b/scss/tests/files/original-doctests/001-variables.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors:yes, reverse_colors:yes;
+@option style:legacy, short_colors:yes, reverse_colors:yes;
@variables {
$path = ../img/tmpl1/png;
$color1 = #FF00FF;
diff --git a/scss/tests/files/original-doctests/002-nesting-children.scss b/scss/tests/files/original-doctests/002-nesting-children.scss
index 9113e93..bbc8a8f 100644
--- a/scss/tests/files/original-doctests/002-nesting-children.scss
+++ b/scss/tests/files/original-doctests/002-nesting-children.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors:yes, reverse_colors:yes;
+@option style:legacy, short_colors:yes, reverse_colors:yes;
.selector {
a {
display: block;
diff --git a/scss/tests/files/original-doctests/003-nesting-children-2.scss b/scss/tests/files/original-doctests/003-nesting-children-2.scss
index 818f21f..7670dc4 100644
--- a/scss/tests/files/original-doctests/003-nesting-children-2.scss
+++ b/scss/tests/files/original-doctests/003-nesting-children-2.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors:yes, reverse_colors:yes;
+@option style:legacy, short_colors:yes, reverse_colors:yes;
.selector {
self {
margin: 20px;
diff --git a/scss/tests/files/original-doctests/004-nesting-children-3.scss b/scss/tests/files/original-doctests/004-nesting-children-3.scss
index ebbb581..1dd1fc9 100644
--- a/scss/tests/files/original-doctests/004-nesting-children-3.scss
+++ b/scss/tests/files/original-doctests/004-nesting-children-3.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors:yes, reverse_colors:yes;
+@option style:legacy, short_colors:yes, reverse_colors:yes;
.selector {
self {
margin: 20px;
diff --git a/scss/tests/files/original-doctests/005-extends.scss b/scss/tests/files/original-doctests/005-extends.scss
index 9741b1f..a11f28b 100644
--- a/scss/tests/files/original-doctests/005-extends.scss
+++ b/scss/tests/files/original-doctests/005-extends.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors:yes, reverse_colors:yes;
+@option style:legacy, short_colors:yes, reverse_colors:yes;
.basicClass {
padding: 20px;
background-color: #FF0000;
diff --git a/scss/tests/files/original-doctests/006-extends-2.scss b/scss/tests/files/original-doctests/006-extends-2.scss
index 29c7403..c23e818 100644
--- a/scss/tests/files/original-doctests/006-extends-2.scss
+++ b/scss/tests/files/original-doctests/006-extends-2.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors:yes, reverse_colors:yes;
+@option style:legacy, short_colors:yes, reverse_colors:yes;
.basicClass {
padding: 20px;
background-color: #FF0000;
diff --git a/scss/tests/files/original-doctests/007-extends-3.scss b/scss/tests/files/original-doctests/007-extends-3.scss
index a9b1d5c..debfda6 100644
--- a/scss/tests/files/original-doctests/007-extends-3.scss
+++ b/scss/tests/files/original-doctests/007-extends-3.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors:yes, reverse_colors:yes;
+@option style:legacy, short_colors:yes, reverse_colors:yes;
.specialClass extends .basicClass {
padding: 10px;
font-size: 14px;
diff --git a/scss/tests/files/original-doctests/008-extends-4.scss b/scss/tests/files/original-doctests/008-extends-4.scss
index 2d5f8b8..7ff4ecc 100644
--- a/scss/tests/files/original-doctests/008-extends-4.scss
+++ b/scss/tests/files/original-doctests/008-extends-4.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors:yes, reverse_colors:yes;
+@option style:legacy, short_colors:yes, reverse_colors:yes;
.basicList {
li {
padding: 5px 10px;
diff --git a/scss/tests/files/original-doctests/009-extends-5.scss b/scss/tests/files/original-doctests/009-extends-5.scss
index 74bfb31..cefcbb2 100644
--- a/scss/tests/files/original-doctests/009-extends-5.scss
+++ b/scss/tests/files/original-doctests/009-extends-5.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors:yes, reverse_colors:yes;
+@option style:legacy, short_colors:yes, reverse_colors:yes;
.basicList {
li {
padding: 5px 10px;
diff --git a/scss/tests/files/original-doctests/010-math.scss b/scss/tests/files/original-doctests/010-math.scss
index 3fbb3ef..cc65b60 100644
--- a/scss/tests/files/original-doctests/010-math.scss
+++ b/scss/tests/files/original-doctests/010-math.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors:yes, reverse_colors:yes;
+@option style:legacy, short_colors:yes, reverse_colors:yes;
@variables {
$color = #FFF555;
}
diff --git a/scss/tests/files/original-doctests/011-math-2.scss b/scss/tests/files/original-doctests/011-math-2.scss
index 0676938..ac77762 100644
--- a/scss/tests/files/original-doctests/011-math-2.scss
+++ b/scss/tests/files/original-doctests/011-math-2.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors:yes, reverse_colors:yes;
+@option style:legacy, short_colors:yes, reverse_colors:yes;
.selector {
padding: (5px - 3) * (5px - 3) / 1px;
}
diff --git a/scss/tests/files/original-doctests/012-math-3.scss b/scss/tests/files/original-doctests/012-math-3.scss
index 17456fd..ff13888 100644
--- a/scss/tests/files/original-doctests/012-math-3.scss
+++ b/scss/tests/files/original-doctests/012-math-3.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors:yes, reverse_colors:yes;
+@option style:legacy, short_colors:yes, reverse_colors:yes;
.selector {
padding: [5em - 3em + 1em];
margin: [20 - 10] [30% - 10];
diff --git a/scss/tests/files/original-doctests/013-nesting.scss b/scss/tests/files/original-doctests/013-nesting.scss
index 06906f9..11725cc 100644
--- a/scss/tests/files/original-doctests/013-nesting.scss
+++ b/scss/tests/files/original-doctests/013-nesting.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors:yes, reverse_colors:yes;
+@option style:legacy, short_colors:yes, reverse_colors:yes;
/* style.scss */
#navbar {
width: 80%;
diff --git a/scss/tests/files/original-doctests/014-nesting-2.scss b/scss/tests/files/original-doctests/014-nesting-2.scss
index ee5d339..cab0ff1 100644
--- a/scss/tests/files/original-doctests/014-nesting-2.scss
+++ b/scss/tests/files/original-doctests/014-nesting-2.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors:yes, reverse_colors:yes;
+@option style:legacy, short_colors:yes, reverse_colors:yes;
/* style.scss */
.fakeshadow {
border: {
diff --git a/scss/tests/files/original-doctests/015-nesting-3.scss b/scss/tests/files/original-doctests/015-nesting-3.scss
index 4ac63f8..94690b2 100644
--- a/scss/tests/files/original-doctests/015-nesting-3.scss
+++ b/scss/tests/files/original-doctests/015-nesting-3.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors:yes, reverse_colors:yes;
+@option style:legacy, short_colors:yes, reverse_colors:yes;
/* style.scss */
a {
color: #ce4dd6;
diff --git a/scss/tests/files/original-doctests/016-variables.scss b/scss/tests/files/original-doctests/016-variables.scss
index 1515043..1557817 100644
--- a/scss/tests/files/original-doctests/016-variables.scss
+++ b/scss/tests/files/original-doctests/016-variables.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors:yes, reverse_colors:yes;
+@option style:legacy, short_colors:yes, reverse_colors:yes;
/* style.scss */
$main-color: #ce4dd6;
$style: solid;
diff --git a/scss/tests/files/original-doctests/017-interpolation.scss b/scss/tests/files/original-doctests/017-interpolation.scss
index 799ecc3..6cadbdc 100644
--- a/scss/tests/files/original-doctests/017-interpolation.scss
+++ b/scss/tests/files/original-doctests/017-interpolation.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors:yes, reverse_colors:yes;
+@option style:legacy, short_colors:yes, reverse_colors:yes;
/* style.scss */
$side: top;
$radius: 10px;
diff --git a/scss/tests/files/original-doctests/018-mixins.scss b/scss/tests/files/original-doctests/018-mixins.scss
index 4e9afb7..248739e 100644
--- a/scss/tests/files/original-doctests/018-mixins.scss
+++ b/scss/tests/files/original-doctests/018-mixins.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors:yes, reverse_colors:yes;
+@option style:legacy, short_colors:yes, reverse_colors:yes;
/* style.scss */
@mixin rounded-top {
diff --git a/scss/tests/files/original-doctests/019-mixins-2.scss b/scss/tests/files/original-doctests/019-mixins-2.scss
index 44e011b..2e6b92b 100644
--- a/scss/tests/files/original-doctests/019-mixins-2.scss
+++ b/scss/tests/files/original-doctests/019-mixins-2.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors:yes, reverse_colors:yes;
+@option style:legacy, short_colors:yes, reverse_colors:yes;
/* style.scss */
@mixin rounded($side, $radius: 10px) {
diff --git a/scss/tests/files/original-doctests/020-mixins-3.scss b/scss/tests/files/original-doctests/020-mixins-3.scss
index 8b2611c..233e5ed 100644
--- a/scss/tests/files/original-doctests/020-mixins-3.scss
+++ b/scss/tests/files/original-doctests/020-mixins-3.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors:yes, reverse_colors:yes;
+@option style:legacy, short_colors:yes, reverse_colors:yes;
@mixin iphone {
@media only screen and (max-width: 480px) {
@content;
diff --git a/scss/tests/files/original-doctests/021-extend.scss b/scss/tests/files/original-doctests/021-extend.scss
index d19fb86..ca7fe68 100644
--- a/scss/tests/files/original-doctests/021-extend.scss
+++ b/scss/tests/files/original-doctests/021-extend.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors:yes, reverse_colors:yes;
+@option style:legacy, short_colors:yes, reverse_colors:yes;
.error {
border: 1px #f00;
background-color: #fdd;
diff --git a/scss/tests/files/original-doctests/022-extend-multiple.scss b/scss/tests/files/original-doctests/022-extend-multiple.scss
index 1d9fc2b..4fa0d7a 100644
--- a/scss/tests/files/original-doctests/022-extend-multiple.scss
+++ b/scss/tests/files/original-doctests/022-extend-multiple.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors:yes, reverse_colors:yes;
+@option style:legacy, short_colors:yes, reverse_colors:yes;
.error {
border: 1px #f00;
background-color: #fdd;
diff --git a/scss/tests/files/original-doctests/023-extend-multiple-2.scss b/scss/tests/files/original-doctests/023-extend-multiple-2.scss
index c1c5929..216aaf1 100644
--- a/scss/tests/files/original-doctests/023-extend-multiple-2.scss
+++ b/scss/tests/files/original-doctests/023-extend-multiple-2.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors:yes, reverse_colors:yes;
+@option style:legacy, short_colors:yes, reverse_colors:yes;
.bad {
color: red !important;
}
diff --git a/scss/tests/files/original-doctests/024-extend-placeholder.scss b/scss/tests/files/original-doctests/024-extend-placeholder.scss
index a8d8b5f..54a76a4 100644
--- a/scss/tests/files/original-doctests/024-extend-placeholder.scss
+++ b/scss/tests/files/original-doctests/024-extend-placeholder.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors:yes, reverse_colors:yes;
+@option style:legacy, short_colors:yes, reverse_colors:yes;
// This ruleset won't be rendered on its own.
#context a%extreme {
color: blue;
diff --git a/scss/tests/files/original-doctests/025-forum.scss b/scss/tests/files/original-doctests/025-forum.scss
index 1af413f..45d7f68 100644
--- a/scss/tests/files/original-doctests/025-forum.scss
+++ b/scss/tests/files/original-doctests/025-forum.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors:yes, reverse_colors:yes;
+@option style:legacy, short_colors:yes, reverse_colors:yes;
body {
_width: expression(document.body.clientWidth > 1440? "1440px" : "auto");
} \ No newline at end of file
diff --git a/scss/tests/files/original-doctests/026-forum-2.scss b/scss/tests/files/original-doctests/026-forum-2.scss
index b243093..d2a5e18 100644
--- a/scss/tests/files/original-doctests/026-forum-2.scss
+++ b/scss/tests/files/original-doctests/026-forum-2.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors:yes, reverse_colors:yes;
+@option style:legacy, short_colors:yes, reverse_colors:yes;
@variables {
$ie6 = *html;
$ie7 = *:first-child+html;
diff --git a/scss/tests/files/original-doctests/027-forum-3.scss b/scss/tests/files/original-doctests/027-forum-3.scss
index 29c7403..c23e818 100644
--- a/scss/tests/files/original-doctests/027-forum-3.scss
+++ b/scss/tests/files/original-doctests/027-forum-3.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors:yes, reverse_colors:yes;
+@option style:legacy, short_colors:yes, reverse_colors:yes;
.basicClass {
padding: 20px;
background-color: #FF0000;
diff --git a/scss/tests/files/original-doctests/028-errors.scss b/scss/tests/files/original-doctests/028-errors.scss
index 08f0f9e..1ac2234 100644
--- a/scss/tests/files/original-doctests/028-errors.scss
+++ b/scss/tests/files/original-doctests/028-errors.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors:yes, reverse_colors:yes;
+@option style:legacy, short_colors:yes, reverse_colors:yes;
.some-selector { some:prop; }
.some-selector-more { some:proop; }
.parent {
diff --git a/scss/tests/files/original-doctests/029-errors-2.scss b/scss/tests/files/original-doctests/029-errors-2.scss
index 4ea7f6c..5cbcab2 100644
--- a/scss/tests/files/original-doctests/029-errors-2.scss
+++ b/scss/tests/files/original-doctests/029-errors-2.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors:yes, reverse_colors:yes;
+@option style:legacy, short_colors:yes, reverse_colors:yes;
.noticeBox {
self {
background-color:red;
diff --git a/scss/tests/files/original-doctests/030-errors-3.scss b/scss/tests/files/original-doctests/030-errors-3.scss
index 7e1019f..0df1fff 100644
--- a/scss/tests/files/original-doctests/030-errors-3.scss
+++ b/scss/tests/files/original-doctests/030-errors-3.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors:yes, reverse_colors:yes;
+@option style:legacy, short_colors:yes, reverse_colors:yes;
.mod {
self {
margin: 10px;
diff --git a/scss/tests/files/original-doctests/031-test.scss b/scss/tests/files/original-doctests/031-test.scss
index c583c54..8d9b731 100644
--- a/scss/tests/files/original-doctests/031-test.scss
+++ b/scss/tests/files/original-doctests/031-test.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors:yes, reverse_colors:yes;
+@option style:legacy, short_colors:yes, reverse_colors:yes;
@function percent-width(
$t,
$c
diff --git a/scss/tests/files/original-doctests/032-test-2.scss b/scss/tests/files/original-doctests/032-test-2.scss
index 83a5efb..3d89d22 100644
--- a/scss/tests/files/original-doctests/032-test-2.scss
+++ b/scss/tests/files/original-doctests/032-test-2.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors:yes, reverse_colors:yes;
+@option style:legacy, short_colors:yes, reverse_colors:yes;
a {
$color: rgba(0.872536*255, 0.48481984*255, 0.375464*255, 1);
color: $color;
diff --git a/scss/tests/files/original-doctests/033-test-3.scss b/scss/tests/files/original-doctests/033-test-3.scss
index 297d731..51db3c8 100644
--- a/scss/tests/files/original-doctests/033-test-3.scss
+++ b/scss/tests/files/original-doctests/033-test-3.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors:yes, reverse_colors:yes;
+@option style:legacy, short_colors:yes, reverse_colors:yes;
.functions {
opacify1: opacify(rgba(0, 0, 0, 0.5), 0.1); // rgba(0, 0, 0, 0.6)
opacify2: opacify(rgba(0, 0, 17, 0.8), 0.2); // #001
diff --git a/scss/tests/files/original-doctests/034-test-4.scss b/scss/tests/files/original-doctests/034-test-4.scss
index b3b441a..84e6e6b 100644
--- a/scss/tests/files/original-doctests/034-test-4.scss
+++ b/scss/tests/files/original-doctests/034-test-4.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors:yes, reverse_colors:yes;
+@option style:legacy, short_colors:yes, reverse_colors:yes;
.coloredClass {
$mycolor: green;
padding: 20px;
diff --git a/scss/tests/files/original-doctests/035-test-5.scss b/scss/tests/files/original-doctests/035-test-5.scss
index 3f84268..a6073d1 100644
--- a/scss/tests/files/original-doctests/035-test-5.scss
+++ b/scss/tests/files/original-doctests/035-test-5.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors:yes, reverse_colors:yes;
+@option style:legacy, short_colors:yes, reverse_colors:yes;
a, button {
color: blue;
&:hover, .some & {
diff --git a/scss/tests/files/original-doctests/036-test-6.scss b/scss/tests/files/original-doctests/036-test-6.scss
index a8c4a46..45dbdb0 100644
--- a/scss/tests/files/original-doctests/036-test-6.scss
+++ b/scss/tests/files/original-doctests/036-test-6.scss
@@ -1,3 +1,3 @@
-@option compress:no, short_colors:yes, reverse_colors:yes;
+@option style:legacy, short_colors:yes, reverse_colors:yes;
a:hover { text-decoration: underline }
.hoverlink { @extend a:hover } \ No newline at end of file
diff --git a/scss/tests/files/original-doctests/037-test-7.scss b/scss/tests/files/original-doctests/037-test-7.scss
index 3c5c81c..04f5be3 100644
--- a/scss/tests/files/original-doctests/037-test-7.scss
+++ b/scss/tests/files/original-doctests/037-test-7.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors:yes, reverse_colors:yes;
+@option style:legacy, short_colors:yes, reverse_colors:yes;
#fake-links .link {@extend a}
a {
diff --git a/scss/tests/files/original-doctests/038-test-8.scss b/scss/tests/files/original-doctests/038-test-8.scss
index 38be5d2..5b3d089 100644
--- a/scss/tests/files/original-doctests/038-test-8.scss
+++ b/scss/tests/files/original-doctests/038-test-8.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors:yes, reverse_colors:yes;
+@option style:legacy, short_colors:yes, reverse_colors:yes;
@each $animal in puma, sea-slug, egret, salamander {
.#{$animal}-icon {
background-image: url(/images/#{$animal}.png);
diff --git a/scss/tests/files/original-doctests/039-hover-extend.scss b/scss/tests/files/original-doctests/039-hover-extend.scss
index 2366433..4c1deb3 100644
--- a/scss/tests/files/original-doctests/039-hover-extend.scss
+++ b/scss/tests/files/original-doctests/039-hover-extend.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
.comment a.user:hover { font-weight: bold }
.hoverlink { @extend a:hover }
diff --git a/scss/tests/files/original-doctests/039-math-4.scss b/scss/tests/files/original-doctests/039-math-4.scss
index 93eae0d..f6dbff9 100644
--- a/scss/tests/files/original-doctests/039-math-4.scss
+++ b/scss/tests/files/original-doctests/039-math-4.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors:yes, reverse_colors:yes;
+@option style:legacy, short_colors:yes, reverse_colors:yes;
.selector {
padding: [4em / 2em];
margin: [4em / 2em] * 1em;
diff --git a/scss/tests/files/original-doctests/040-complex-sequence-extend.scss b/scss/tests/files/original-doctests/040-complex-sequence-extend.scss
index 8d5e295..0ce85ff 100644
--- a/scss/tests/files/original-doctests/040-complex-sequence-extend.scss
+++ b/scss/tests/files/original-doctests/040-complex-sequence-extend.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
// From the docs:
// Sometimes a selector sequence extends another selector that appears in
diff --git a/scss/tests/files/original-doctests/041-another-extend.scss b/scss/tests/files/original-doctests/041-another-extend.scss
index 6a3f622..3a37d3b 100644
--- a/scss/tests/files/original-doctests/041-another-extend.scss
+++ b/scss/tests/files/original-doctests/041-another-extend.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
.mod {
margin: 10px;
diff --git a/scss/tests/files/regressions/args-vars.scss b/scss/tests/files/regressions/args-vars.scss
index d0dda05..8a18a42 100644
--- a/scss/tests/files/regressions/args-vars.scss
+++ b/scss/tests/files/regressions/args-vars.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
@mixin col($color, $background: $color, $border: undefined) {
a {
diff --git a/scss/tests/files/regressions/argspec-default-arguments.scss b/scss/tests/files/regressions/argspec-default-arguments.scss
index 31e02ed..5ca4b22 100644
--- a/scss/tests/files/regressions/argspec-default-arguments.scss
+++ b/scss/tests/files/regressions/argspec-default-arguments.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
@mixin color-me($color: white) {
color: $color;
diff --git a/scss/tests/files/regressions/argspec-no-arguments.scss b/scss/tests/files/regressions/argspec-no-arguments.scss
index 2155195..6db0ce1 100644
--- a/scss/tests/files/regressions/argspec-no-arguments.scss
+++ b/scss/tests/files/regressions/argspec-no-arguments.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
@function get-a-number() {
@return 5;
diff --git a/scss/tests/files/regressions/argspec-trailing-comma.scss b/scss/tests/files/regressions/argspec-trailing-comma.scss
index a58a59b..cacfef8 100644
--- a/scss/tests/files/regressions/argspec-trailing-comma.scss
+++ b/scss/tests/files/regressions/argspec-trailing-comma.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
@function no-op($foo,) {
@return $foo;
diff --git a/scss/tests/files/regressions/interpolation-2.scss b/scss/tests/files/regressions/interpolation-2.scss
index dbfa832..dad8436 100644
--- a/scss/tests/files/regressions/interpolation-2.scss
+++ b/scss/tests/files/regressions/interpolation-2.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors: no;
+@option style:legacy, short_colors:no;
a {
@each $a in '', '_a' {
@each $b in '', '_b' {
diff --git a/scss/tests/files/regressions/interpolation.scss b/scss/tests/files/regressions/interpolation.scss
index 1df340d..78d39cf 100644
--- a/scss/tests/files/regressions/interpolation.scss
+++ b/scss/tests/files/regressions/interpolation.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors: no;
+@option style:legacy, short_colors:no;
// DEVIATION: We preserve the same type of quotes when interpolating. Ruby
// always produces double quotes.
a {
diff --git a/scss/tests/files/regressions/issue-10.scss b/scss/tests/files/regressions/issue-10.scss
index 863e60b..5519a58 100644
--- a/scss/tests/files/regressions/issue-10.scss
+++ b/scss/tests/files/regressions/issue-10.scss
@@ -1,4 +1,4 @@
-@option compress: no, short_colors: no;
+@option style:legacy, short_colors:no;
.yellow {
color: yelow;
} \ No newline at end of file
diff --git a/scss/tests/files/regressions/issue-110.scss b/scss/tests/files/regressions/issue-110.scss
index 5c22b33..cdcf7e5 100644
--- a/scss/tests/files/regressions/issue-110.scss
+++ b/scss/tests/files/regressions/issue-110.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors: no;
+@option style:legacy, short_colors:no;
$global: blue;
diff --git a/scss/tests/files/regressions/issue-2.scss b/scss/tests/files/regressions/issue-2.scss
index f6f378d..4439654 100644
--- a/scss/tests/files/regressions/issue-2.scss
+++ b/scss/tests/files/regressions/issue-2.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors:yes, reverse_colors:yes;
+@option style:legacy, short_colors:yes, reverse_colors:yes;
#{enumerate(".pull", 1, 24)} {
display: inline;
float: left;
diff --git a/scss/tests/files/regressions/issue-21.scss b/scss/tests/files/regressions/issue-21.scss
index 18b0ebd..d85a0ad 100644
--- a/scss/tests/files/regressions/issue-21.scss
+++ b/scss/tests/files/regressions/issue-21.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors: no;
+@option style:legacy, short_colors:no;
h2 {
background: green;
@media screen{
diff --git a/scss/tests/files/regressions/issue-32.scss b/scss/tests/files/regressions/issue-32.scss
index d9ea75d..690b63b 100644
--- a/scss/tests/files/regressions/issue-32.scss
+++ b/scss/tests/files/regressions/issue-32.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors: no;
+@option style:legacy, short_colors:no;
@media (max-width:1024px) {
.wrap {
padding: 10px 0;
diff --git a/scss/tests/files/regressions/issue-4.scss b/scss/tests/files/regressions/issue-4.scss
index 38131fd..b4a5946 100644
--- a/scss/tests/files/regressions/issue-4.scss
+++ b/scss/tests/files/regressions/issue-4.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors:yes, reverse_colors:yes;
+@option style:legacy, short_colors:yes, reverse_colors:yes;
$width: 150px;
@mixin foo($width) {
width: $width;
diff --git a/scss/tests/files/regressions/issue-40.scss b/scss/tests/files/regressions/issue-40.scss
index 618e859..076da44 100644
--- a/scss/tests/files/regressions/issue-40.scss
+++ b/scss/tests/files/regressions/issue-40.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors: no;
+@option style:legacy, short_colors:no;
a {
background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwA...");
} \ No newline at end of file
diff --git a/scss/tests/files/regressions/issue-5.scss b/scss/tests/files/regressions/issue-5.scss
index db372d9..c9b7cf7 100644
--- a/scss/tests/files/regressions/issue-5.scss
+++ b/scss/tests/files/regressions/issue-5.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors:yes, reverse_colors:yes;
+@option style:legacy, short_colors:yes, reverse_colors:yes;
$width: 1px;
foo {
border: $width solid red;
diff --git a/scss/tests/files/regressions/issue-52.scss b/scss/tests/files/regressions/issue-52.scss
index b0941fc..8c37758 100644
--- a/scss/tests/files/regressions/issue-52.scss
+++ b/scss/tests/files/regressions/issue-52.scss
@@ -1,4 +1,4 @@
-@option compress:no;
+@option style:legacy;
h1 {
background: url(//example.com/image.png);
} \ No newline at end of file
diff --git a/scss/tests/files/regressions/issue-6.scss b/scss/tests/files/regressions/issue-6.scss
index e4ca644..2e1112c 100644
--- a/scss/tests/files/regressions/issue-6.scss
+++ b/scss/tests/files/regressions/issue-6.scss
@@ -1,4 +1,4 @@
-@option compress:no, short_colors:yes, reverse_colors:yes;
+@option style:legacy, short_colors:yes, reverse_colors:yes;
$type: monster;
p {
@if $type == ocean {
diff --git a/scss/tests/files/regressions/issue-7.scss b/scss/tests/files/regressions/issue-7.scss
index 41df101..307f834 100644
--- a/scss/tests/files/regressions/issue-7.scss
+++ b/scss/tests/files/regressions/issue-7.scss
@@ -1,4 +1,4 @@
-@option compress: no, short_colors: no;
+@option style:legacy, short_colors:no;
a.button:hover {
color: #000000;
}
diff --git a/scss/tests/test_misc.py b/scss/tests/test_misc.py
index d19ab18..2975a75 100644
--- a/scss/tests/test_misc.py
+++ b/scss/tests/test_misc.py
@@ -68,14 +68,14 @@ def test_extend_across_files():
compiler = Scss(scss_opts=dict(compress=0))
compiler._scss_files = {}
compiler._scss_files['first.css'] = '''
- @option compress:no, short_colors:yes, reverse_colors:yes;
+ @option style:legacy, short_colors:yes, reverse_colors:yes;
.specialClass extends .basicClass {
padding: 10px;
font-size: 14px;
}
'''
compiler._scss_files['second.css'] = '''
- @option compress:no, short_colors:yes, reverse_colors:yes;
+ @option style:legacy, short_colors:yes, reverse_colors:yes;
.basicClass {
padding: 20px;
background-color: #FF0000;