diff options
| author | Jonatan Kronqvist <jonatan@vaadin.com> | 2014-02-10 13:14:12 +0200 |
|---|---|---|
| committer | Jonatan Kronqvist <jonatan@vaadin.com> | 2014-02-10 13:14:12 +0200 |
| commit | 4f4ac0276b999d22a6e6b57d6073d6a643dd8c66 (patch) | |
| tree | afcb8307b5739fbf66c82117a7af29dc564c0481 /theme-compiler/src/com/vaadin/sass/internal/parser/SCSSLexicalUnit.java | |
| parent | a5b079d1defa45b790a183bbc63dd1154ec0168c (diff) | |
| parent | 915c37b569600a8d37db2a0800a30474da49e255 (diff) | |
| download | vaadin-framework-4f4ac0276b999d22a6e6b57d6073d6a643dd8c66.tar.gz vaadin-framework-4f4ac0276b999d22a6e6b57d6073d6a643dd8c66.zip | |
Merge commit '915c37b569600a8d37db2a0800a30474da49e255' into master
915c37b Sass compiler now treats null-valued variables as unassigned (#12430).
Conflicts:
theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java
Change-Id: If9789f8d0638377d27e77ec4be0fdf0f96e4b1af
Diffstat (limited to 'theme-compiler/src/com/vaadin/sass/internal/parser/SCSSLexicalUnit.java')
| -rw-r--r-- | theme-compiler/src/com/vaadin/sass/internal/parser/SCSSLexicalUnit.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/theme-compiler/src/com/vaadin/sass/internal/parser/SCSSLexicalUnit.java b/theme-compiler/src/com/vaadin/sass/internal/parser/SCSSLexicalUnit.java index 709d1d3576..84b0563493 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/parser/SCSSLexicalUnit.java +++ b/theme-compiler/src/com/vaadin/sass/internal/parser/SCSSLexicalUnit.java @@ -22,6 +22,8 @@ public interface SCSSLexicalUnit extends LexicalUnit { static final short SCSS_OPERATOR_LEFT_PAREN = 101; static final short SCSS_OPERATOR_RIGHT_PAREN = 102; + static final short SCSS_NULL = 110; + static final short SAC_LEM = 200; static final short SAC_REM = 201; |