merge master (sass theme changes)

1 files changed, 34 insertions, 0 deletions

diff --git a/WebContent/VAADIN/themes/base/base.scss b/WebContent/VAADIN/themes/base/base.scss
new file mode 100644
index 0000000000..58f0c32af7
--- /dev/null
+++ b/WebContent/VAADIN/themes/base/base.scss
@@ -0,0 +1,34 @@
+@import "absolutelayout/absolutelayout.scss";
+@import "accordion/accordion.scss";
+@import "button/button.scss";
+@import "caption/caption.scss";
+@import "common/common.scss";
+@import "csslayout/csslayout.scss";
+@import "customcomponent/customcomponent.scss";
+@import "customlayout/customlayout.scss";
+@import "datefield/datefield.scss";
+@import "dragwrapper/dragwrapper.scss";
+@import "embedded/embedded.scss";
+@import "formlayout/formlayout.scss";
+@import "gridlayout/gridlayout.scss";
+@import "label/label.scss";
+@import "link/link.scss";
+@import "loginform/loginform.scss";
+@import "menubar/menubar.scss";
+@import "notification/notification.scss";
+@import "orderedlayout/orderedlayout.scss";
+@import "paintable/paintable.scss";
+@import "panel/panel.scss";
+@import "popupview/popupview.scss";
+@import "progressindicator/progressindicator.scss";
+@import "select/select.scss";
+@import "shadow/shadow.scss";
+@import "slider/slider.scss";
+@import "splitpanel/splitpanel.scss";
+@import "table/table.scss";
+@import "tabsheet/tabsheet.scss";
+@import "textfield/textfield.scss";
+@import "tree/tree.scss";
+@import "treetable/treetable.scss";
+@import "upload/upload.scss";
+@import "window/window.scss";