danog/dart-sass
1
0
Fork 0
mirror of https://github.com/danog/dart-sass.git synced 2024-11-30 04:39:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into fixes

Browse Source
This commit is contained in:
Natalie Weizenbaum 2017-02-02 14:48:15 -08:00
commit e1c0c95f3a
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@ -1,3 +1,10 @@
## 1.0.0-alpha.10
* Elements without a namespace (such as `div`) are no longer unified with
elements with the empty namespace (such as `|div`). This unification didn't
match the results returned by `is-superselector()`, and was not guaranteed to
be valid.
## 1.0.0-alpha.9
* Support `&` within `@at-root`.

4
lib/src/extend/functions.dart
View File

@ -93,9 +93,9 @@ SimpleSelector unifyUniversalAndElement(
}
String namespace;
if (namespace1 == namespace2 || namespace2 == null || namespace2 == '*') {
if (namespace1 == namespace2 || namespace2 == '*') {
namespace = namespace1;
} else if (namespace1 == null || namespace1 == '*') {
} else if (namespace1 == '*') {
namespace = namespace2;
} else {
return null;