mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-05 09:41:40 +09:00
Fix #1868 incorrect parsing of CSS/SCSS import containing special characters
This commit is contained in:
parent
7e922cf2bc
commit
cb9f3dd1db
9 changed files with 56 additions and 19 deletions
|
|
@ -1,3 +1,8 @@
|
|||
$setting: 5px;
|
||||
|
||||
@import url('//fonts.googleapis.com/css?family=Raleway:700,400');
|
||||
@import url('https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,400;0,700;1,400;1,700&display=swap');
|
||||
|
||||
@mixin mymixin($size) {
|
||||
margin: $size;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
@import 'scss/include1.scss';
|
||||
@import url('scss/include2.scss');
|
||||
@import 'scss/partial1', 'scss/partial2';
|
||||
|
||||
.rhymix {
|
||||
color: $foo;
|
||||
background: url('foo/bar.jpg');
|
||||
|
|
|
|||
|
|
@ -1,6 +1,20 @@
|
|||
@charset "UTF-8";
|
||||
/* Original file: tests/_data/formatter/scss.source1.scss */
|
||||
@import url("//fonts.googleapis.com/css?family=Raleway:700,400");
|
||||
@import url("https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,400;0,700;1,400;1,700&display=swap");
|
||||
/* Original file: tests/_data/formatter/scss.source2.scss */
|
||||
.inc1 {
|
||||
margin: 5px;
|
||||
}
|
||||
.inc2 {
|
||||
padding-left: 10px;
|
||||
}
|
||||
.partial1 {
|
||||
display: flex;
|
||||
}
|
||||
.partial2 {
|
||||
display: none;
|
||||
}
|
||||
.rhymix {
|
||||
color: #123456;
|
||||
background: url("../_data/formatter/foo/bar.jpg");
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
@charset "UTF-8";
|
||||
.rhymix{color:#123456;background:url("../_data/formatter/foo/bar.jpg")}.rhymix span{margin:320px}
|
||||
@import url("//fonts.googleapis.com/css?family=Raleway:700,400");@import url("https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,400;0,700;1,400;1,700&display=swap");.inc1{margin:5px}.inc2{padding-left:10px}.partial1{display:flex}.partial2{display:none}.rhymix{color:#123456;background:url("../_data/formatter/foo/bar.jpg")}.rhymix span{margin:320px}
|
||||
|
|
|
|||
3
tests/_data/formatter/scss/_partial1.scss
Normal file
3
tests/_data/formatter/scss/_partial1.scss
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
.partial1 {
|
||||
display: flex;
|
||||
}
|
||||
3
tests/_data/formatter/scss/_partial2.scss
Normal file
3
tests/_data/formatter/scss/_partial2.scss
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
.partial2 {
|
||||
display: none;
|
||||
}
|
||||
3
tests/_data/formatter/scss/include1.scss
Normal file
3
tests/_data/formatter/scss/include1.scss
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
.inc1 {
|
||||
margin: $setting;
|
||||
}
|
||||
3
tests/_data/formatter/scss/include2.scss
Normal file
3
tests/_data/formatter/scss/include2.scss
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
.inc2 {
|
||||
padding-left: $setting * 2;
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue