diff options
| author | Marc Englund <marc@vaadin.com> | 2012-10-04 07:53:19 +0000 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2012-10-04 07:53:19 +0000 |
| commit | 31d542b4bf99ae3a3805b33db94d38b3f4b33d14 (patch) | |
| tree | 2ac8e7a13db80beb706e4257fb02d4f3d423a5c1 | |
| parent | daa5d9cbdf53e53b7a6d5d5def2fd3bd76c87b07 (diff) | |
| parent | af5bc86db9159bb59e74f593312642959f025876 (diff) | |
| download | vaadin-framework-31d542b4bf99ae3a3805b33db94d38b3f4b33d14.tar.gz vaadin-framework-31d542b4bf99ae3a3805b33db94d38b3f4b33d14.zip | |
Merge "Revert "FontFace nodes are created correctly, fixes #9611" Should not be in master yet."
| -rw-r--r-- | theme-compiler/src/com/vaadin/sass/handler/SCSSDocumentHandlerImpl.java | 7 | ||||
| -rw-r--r-- | theme-compiler/src/com/vaadin/sass/tree/FontFaceNode.java | 18 |
2 files changed, 2 insertions, 23 deletions
diff --git a/theme-compiler/src/com/vaadin/sass/handler/SCSSDocumentHandlerImpl.java b/theme-compiler/src/com/vaadin/sass/handler/SCSSDocumentHandlerImpl.java index 65ae3d5e93..c10d29aad9 100644 --- a/theme-compiler/src/com/vaadin/sass/handler/SCSSDocumentHandlerImpl.java +++ b/theme-compiler/src/com/vaadin/sass/handler/SCSSDocumentHandlerImpl.java @@ -31,7 +31,6 @@ import com.vaadin.sass.parser.LexicalUnitImpl; import com.vaadin.sass.tree.BlockNode; import com.vaadin.sass.tree.CommentNode; import com.vaadin.sass.tree.ExtendNode; -import com.vaadin.sass.tree.FontFaceNode; import com.vaadin.sass.tree.ForNode; import com.vaadin.sass.tree.ImportNode; import com.vaadin.sass.tree.ListRemoveNode; @@ -172,14 +171,12 @@ public class SCSSDocumentHandlerImpl implements SCSSDocumentHandler { @Override public void startFontFace() throws CSSException { - FontFaceNode node = new FontFaceNode(); - nodeStack.peek().appendChild(node); - nodeStack.push(node); + System.out.println("startFontFace()"); } @Override public void endFontFace() throws CSSException { - nodeStack.pop(); + System.out.println("endFontFace()"); } @Override diff --git a/theme-compiler/src/com/vaadin/sass/tree/FontFaceNode.java b/theme-compiler/src/com/vaadin/sass/tree/FontFaceNode.java deleted file mode 100644 index 3dab4df773..0000000000 --- a/theme-compiler/src/com/vaadin/sass/tree/FontFaceNode.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.vaadin.sass.tree; - -public class FontFaceNode extends Node { - - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append("@font-face {\n"); - - for (final Node child : children) { - builder.append("\t" + child.toString() + "\n"); - } - - builder.append("}"); - return builder.toString(); - } - -} |