2 files changed, 51 insertions, 46 deletions
diff --git a/WebContent/VAADIN/themes/base/base.scss b/WebContent/VAADIN/themes/base/base.scss
index dae1d0eef3..87f9119168 100644
--- a/WebContent/VAADIN/themes/base/base.scss
+++ b/WebContent/VAADIN/themes/base/base.scss
@@ -33,3 +33,53 @@
 @import "upload/upload.scss";
 @import "widget/widget.scss";
 @import "window/window.scss";
+
+
+@mixin base {
+	// @include base-app;
+	
+	// everything included from base theme
+	// other themes should enclose corresponding definitions in theme selectors
+	
+	@include base-widget;
+	
+	@include base-absolutelayout;
+	@include base-accordion;
+	@include base-button;
+	@include base-caption;
+	
+	// here for now to preserve old semantics
+	@include base-common;
+	
+	@include base-layout;
+	@include base-csslayout;
+	@include base-customcomponent;
+	@include base-customlayout;
+	@include base-datefield;
+	@include base-dragwrapper;
+	@include base-embedded;
+	@include base-formlayout;
+	@include base-gridlayout;
+	@include base-label;
+	@include base-link;
+	@include base-loginform;
+	@include base-menubar;
+	@include base-notification;
+	@include base-orderedlayout;
+	@include base-panel;
+	@include base-popupview;
+	@include base-progressindicator;
+	@include base-select;
+	@include base-shadow;
+	@include base-slider;
+	@include base-splitpanel;
+	@include base-table;
+	@include base-tabsheet;
+	@include base-textfield;
+	@include base-richtextarea;
+	@include base-tree;
+	@include base-treetable;
+	@include base-upload;
+	@include base-window;
+}
+
diff --git a/WebContent/VAADIN/themes/base/styles.scss b/WebContent/VAADIN/themes/base/styles.scss
index 7ca27280bc..40990f2c31 100644
--- a/WebContent/VAADIN/themes/base/styles.scss
+++ b/WebContent/VAADIN/themes/base/styles.scss
@@ -1,47 +1,2 @@
 @import "base.scss";
-
-// @include base-app;
-
-// everything included from base theme
-// other themes should enclose corresponding definitions in theme selectors
-
-@include base-widget;
-
-@include base-absolutelayout;
-@include base-accordion;
-@include base-button;
-@include base-caption;
-
-// here for now to preserve old semantics
-@include base-common;
-
-@include base-layout;
-@include base-csslayout;
-@include base-customcomponent;
-@include base-customlayout;
-@include base-datefield;
-@include base-dragwrapper;
-@include base-embedded;
-@include base-formlayout;
-@include base-gridlayout;
-@include base-label;
-@include base-link;
-@include base-loginform;
-@include base-menubar;
-@include base-notification;
-@include base-orderedlayout;
-@include base-panel;
-@include base-popupview;
-@include base-progressindicator;
-@include base-select;
-@include base-shadow;
-@include base-slider;
-@include base-splitpanel;
-@include base-table;
-@include base-tabsheet;
-@include base-textfield;
-@include base-richtextarea;
-@include base-tree;
-@include base-treetable;
-@include base-upload;
-@include base-window;
+@include base;