diff --git a/frameworks/compass/stylesheets/compass/css3/_columns.scss b/frameworks/compass/stylesheets/compass/css3/_columns.scss index f08cae3e..f425a68b 100644 --- a/frameworks/compass/stylesheets/compass/css3/_columns.scss +++ b/frameworks/compass/stylesheets/compass/css3/_columns.scss @@ -7,35 +7,35 @@ // @include columns(20em 2) @mixin columns($width-and-count) { @include experimental(columns, $width-and-count, - -moz, -webkit, -o, -ms, not -khtml, official + -moz, -webkit, not -o, -ms, not -khtml, official ); } // Specify the number of columns @mixin column-count($count) { @include experimental(column-count, $count, - -moz, -webkit, -o, -ms, not -khtml, official + -moz, -webkit, not -o, -ms, not -khtml, official ); } // Specify the gap between columns e.g. `20px` @mixin column-gap($width) { @include experimental(column-gap, $width, - -moz, -webkit, -o, -ms, not -khtml, official + -moz, -webkit, not -o, -ms, not -khtml, official ); } // Specify the width of columns e.g. `100px` @mixin column-width($width) { @include experimental(column-width, $width, - -moz, -webkit, -o, -ms, not -khtml, official + -moz, -webkit, not -o, -ms, not -khtml, official ); } // Specify the width of the rule between columns e.g. `1px` @mixin column-rule-width($width) { @include experimental(rule-width, $width, - -moz, -webkit, -o, -ms, not -khtml, official + -moz, -webkit, not -o, -ms, not -khtml, official ); } @@ -43,7 +43,7 @@ // This works like border-style. @mixin column-rule-style($style) { @include experimental(rule-style, unquote($style), - -moz, -webkit, -o, -ms, not -khtml, official + -moz, -webkit, not -o, -ms, not -khtml, official ); } @@ -51,7 +51,7 @@ // This works like border-color. @mixin column-rule-color($color) { @include experimental(rule-color, $color, - -moz, -webkit, -o, -ms, not -khtml, official + -moz, -webkit, not -o, -ms, not -khtml, official ); } @@ -66,6 +66,6 @@ @mixin column-rule($width, $style: false, $color: false) { $full : -compass-space-list(compact($width, $style, $color)); @include experimental(column-rule, $full, - -moz, -webkit, -o, -ms, not -khtml, official + -moz, -webkit, not -o, -ms, not -khtml, official ); } diff --git a/test/fixtures/stylesheets/compass/css/columns.css b/test/fixtures/stylesheets/compass/css/columns.css index 3ec721db..7b011b83 100644 --- a/test/fixtures/stylesheets/compass/css/columns.css +++ b/test/fixtures/stylesheets/compass/css/columns.css @@ -2,61 +2,52 @@ -webkit-columns: 20em 5; -moz-columns: 20em 5; -ms-columns: 20em 5; - -o-columns: 20em 5; columns: 20em 5; } .column-count { -webkit-column-count: 5; -moz-column-count: 5; -ms-column-count: 5; - -o-column-count: 5; column-count: 5; } .column-gap { -webkit-column-gap: 10px; -moz-column-gap: 10px; -ms-column-gap: 10px; - -o-column-gap: 10px; column-gap: 10px; } .column-width { -webkit-column-width: 90px; -moz-column-width: 90px; -ms-column-width: 90px; - -o-column-width: 90px; column-width: 90px; } .column-rule-width { -webkit-rule-width: 1px; -moz-rule-width: 1px; -ms-rule-width: 1px; - -o-rule-width: 1px; rule-width: 1px; } .column-rule-style { -webkit-rule-style: dotted; -moz-rule-style: dotted; -ms-rule-style: dotted; - -o-rule-style: dotted; rule-style: dotted; } .column-rule-color { -webkit-rule-color: blue; -moz-rule-color: blue; -ms-rule-color: blue; - -o-rule-color: blue; rule-color: blue; } .column-rule { -webkit-column-rule: 1px solid blue; -moz-column-rule: 1px solid blue; -ms-column-rule: 1px solid blue; - -o-column-rule: 1px solid blue; column-rule: 1px solid blue; } .column-rule-spaced { -webkit-column-rule: 1px solid blue; -moz-column-rule: 1px solid blue; -ms-column-rule: 1px solid blue; - -o-column-rule: 1px solid blue; column-rule: 1px solid blue; }