From: Marc Englund Date: Thu, 4 Oct 2012 07:17:38 +0000 (+0300) Subject: FontFace nodes are created correctly, fixes #9611 X-Git-Tag: 7.0.0.beta6~103^2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f310829d004443b40d32698bd46c9c7db8ba187a;p=vaadin-framework.git FontFace nodes are created correctly, fixes #9611 Change-Id: I4ac14c512b7585979f3e88126a7106e469d29f7f --- diff --git a/theme-compiler/src/com/vaadin/sass/handler/SCSSDocumentHandlerImpl.java b/theme-compiler/src/com/vaadin/sass/handler/SCSSDocumentHandlerImpl.java index c10d29aad9..65ae3d5e93 100644 --- a/theme-compiler/src/com/vaadin/sass/handler/SCSSDocumentHandlerImpl.java +++ b/theme-compiler/src/com/vaadin/sass/handler/SCSSDocumentHandlerImpl.java @@ -31,6 +31,7 @@ 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; @@ -171,12 +172,14 @@ public class SCSSDocumentHandlerImpl implements SCSSDocumentHandler { @Override public void startFontFace() throws CSSException { - System.out.println("startFontFace()"); + FontFaceNode node = new FontFaceNode(); + nodeStack.peek().appendChild(node); + nodeStack.push(node); } @Override public void endFontFace() throws CSSException { - System.out.println("endFontFace()"); + nodeStack.pop(); } @Override diff --git a/theme-compiler/src/com/vaadin/sass/tree/FontFaceNode.java b/theme-compiler/src/com/vaadin/sass/tree/FontFaceNode.java new file mode 100644 index 0000000000..3dab4df773 --- /dev/null +++ b/theme-compiler/src/com/vaadin/sass/tree/FontFaceNode.java @@ -0,0 +1,18 @@ +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(); + } + +}