Merge branch 'sass'

1 files changed, 9 insertions, 11 deletions

diff --git a/theme-compiler/src/com/vaadin/sass/handler/SCSSDocumentHandlerImpl.java b/theme-compiler/src/com/vaadin/sass/handler/SCSSDocumentHandlerImpl.java
index c10d29aad9..4acbc8d4d6 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
@@ -211,12 +214,6 @@ public class SCSSDocumentHandlerImpl implements SCSSDocumentHandler {
     }
 
     @Override
-    public MixinDefNode mixinDirective(String name, String args, String body) {
-        MixinDefNode node = new MixinDefNode(name, args, body);
-        return node;
-    }
-
-    @Override
     public void startNestedProperties(String name) {
         NestPropertiesNode node = new NestPropertiesNode(name);
         nodeStack.peek().appendChild(node);
@@ -307,9 +304,10 @@ public class SCSSDocumentHandlerImpl implements SCSSDocumentHandler {
     }
 
     @Override
-    public void removeDirective(ArrayList<String> list,
-            ArrayList<String> remove, String separator) {
-        ListRemoveNode node = new ListRemoveNode(list, remove, separator);
+    public void removeDirective(String variable, String list, String remove,
+            String separator) {
+        ListRemoveNode node = new ListRemoveNode(variable, list, remove,
+                separator);
         nodeStack.peek().appendChild(node);
     }
 }