From 8ca203ca29543429425823c0f547ddf4140f6991 Mon Sep 17 00:00:00 2001
From: Marc Englund <marc@vaadin.com>
Date: Fri, 28 Sep 2012 10:02:50 +0300
Subject: Sass restructure: need to disable .themename{} -wrapping until we get
 overlay-container.

---
 WebContent/VAADIN/themes/liferay/liferay.scss | 5 ++++-
 WebContent/VAADIN/themes/liferay/styles.scss  | 5 +----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'WebContent/VAADIN/themes/liferay')

diff --git a/WebContent/VAADIN/themes/liferay/liferay.scss b/WebContent/VAADIN/themes/liferay/liferay.scss
index d024dc2553..7ec561ffc9 100644
--- a/WebContent/VAADIN/themes/liferay/liferay.scss
+++ b/WebContent/VAADIN/themes/liferay/liferay.scss
@@ -1,4 +1,4 @@
-@import "../base/styles.scss";
+@import "../base/base.scss";
 
 @import "accordion/accordion.scss";
 @import "button/button.scss";
@@ -23,6 +23,9 @@
 @import "window/window.scss";
 	
 @mixin liferay {
+	// TODO move?
+	@include base;
+	// TODO @each
 	@include liferay-accordion;
 	@include liferay-button;
 	
diff --git a/WebContent/VAADIN/themes/liferay/styles.scss b/WebContent/VAADIN/themes/liferay/styles.scss
index d518071249..030602a8b6 100644
--- a/WebContent/VAADIN/themes/liferay/styles.scss
+++ b/WebContent/VAADIN/themes/liferay/styles.scss
@@ -1,6 +1,3 @@
 @import "liferay.scss";
 
-.liferay {
-	@include liferay;
-}
-
+@include liferay;
-- 
cgit v1.2.3