Merge branch 'sass'

37 files changed, 207 insertions, 5 deletions

diff --git a/shared/src/com/vaadin/shared/ComponentState.java b/shared/src/com/vaadin/shared/ComponentState.java
index 7d286f39a0..2ecf09b422 100644
--- a/shared/src/com/vaadin/shared/ComponentState.java
+++ b/shared/src/com/vaadin/shared/ComponentState.java
@@ -39,6 +39,7 @@ public class ComponentState extends SharedState {
     public String caption = null;
     public List<String> styles = null;
     public String id = null;
+    public String primaryStyleName = null;
     /**
      * A set of event identifiers with registered listeners.
      */
diff --git a/shared/src/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutState.java b/shared/src/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutState.java
index 283e827e6e..9a112dc763 100644
--- a/shared/src/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutState.java
+++ b/shared/src/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutState.java
@@ -21,6 +21,10 @@ import java.util.Map;
 import com.vaadin.shared.ui.AbstractLayoutState;
 
 public class AbsoluteLayoutState extends AbstractLayoutState {
+    {
+        primaryStyleName = "v-absolutelayout";
+    }
+
     // Maps each component to a position
     public Map<String, String> connectorToCssPosition = new HashMap<String, String>();
 }
\ No newline at end of file
diff --git a/shared/src/com/vaadin/shared/ui/browserframe/BrowserFrameState.java b/shared/src/com/vaadin/shared/ui/browserframe/BrowserFrameState.java
index 1c36420372..6f098e863e 100644
--- a/shared/src/com/vaadin/shared/ui/browserframe/BrowserFrameState.java
+++ b/shared/src/com/vaadin/shared/ui/browserframe/BrowserFrameState.java
@@ -3,5 +3,7 @@ package com.vaadin.shared.ui.browserframe;
 import com.vaadin.shared.ui.AbstractEmbeddedState;
 
 public class BrowserFrameState extends AbstractEmbeddedState {
-
+    {
+        primaryStyleName = "v-browserframe";
+    }
 }
diff --git a/shared/src/com/vaadin/shared/ui/button/ButtonState.java b/shared/src/com/vaadin/shared/ui/button/ButtonState.java
index c144a8124f..e7272379bb 100644
--- a/shared/src/com/vaadin/shared/ui/button/ButtonState.java
+++ b/shared/src/com/vaadin/shared/ui/button/ButtonState.java
@@ -28,6 +28,9 @@ import com.vaadin.shared.ui.TabIndexState;
  * @since 7.0
  */
 public class ButtonState extends TabIndexState {
+    {
+        primaryStyleName = "v-button";
+    }
     public boolean disableOnClick = false;
     public int clickShortcutKeyCode = 0;
     /**
diff --git a/shared/src/com/vaadin/shared/ui/button/NativeButtonState.java b/shared/src/com/vaadin/shared/ui/button/NativeButtonState.java
new file mode 100644
index 0000000000..bb7b535c02
--- /dev/null
+++ b/shared/src/com/vaadin/shared/ui/button/NativeButtonState.java
@@ -0,0 +1,7 @@
+package com.vaadin.shared.ui.button;
+
+public class NativeButtonState extends ButtonState {
+    {
+        primaryStyleName = "v-nativebutton";
+    }
+}
diff --git a/shared/src/com/vaadin/shared/ui/checkbox/CheckBoxState.java b/shared/src/com/vaadin/shared/ui/checkbox/CheckBoxState.java
index b89270bee2..9f7388e21c 100644
--- a/shared/src/com/vaadin/shared/ui/checkbox/CheckBoxState.java
+++ b/shared/src/com/vaadin/shared/ui/checkbox/CheckBoxState.java
@@ -18,6 +18,9 @@ package com.vaadin.shared.ui.checkbox;
 import com.vaadin.shared.AbstractFieldState;
 
 public class CheckBoxState extends AbstractFieldState {
-    public boolean checked = false;
+    {
+        primaryStyleName = "v-checkbox";
+    }
 
+    public boolean checked = false;
 }
\ No newline at end of file
diff --git a/shared/src/com/vaadin/shared/ui/combobox/ComboBoxState.java b/shared/src/com/vaadin/shared/ui/combobox/ComboBoxState.java
new file mode 100644
index 0000000000..a3c0c8e765
--- /dev/null
+++ b/shared/src/com/vaadin/shared/ui/combobox/ComboBoxState.java
@@ -0,0 +1,9 @@
+package com.vaadin.shared.ui.combobox;
+
+import com.vaadin.shared.AbstractFieldState;
+
+public class ComboBoxState extends AbstractFieldState {
+    {
+        primaryStyleName = "v-filterselect";
+    }
+}
diff --git a/shared/src/com/vaadin/shared/ui/csslayout/CssLayoutState.java b/shared/src/com/vaadin/shared/ui/csslayout/CssLayoutState.java
index 2fbc42ca0f..fa25f2840b 100644
--- a/shared/src/com/vaadin/shared/ui/csslayout/CssLayoutState.java
+++ b/shared/src/com/vaadin/shared/ui/csslayout/CssLayoutState.java
@@ -22,5 +22,8 @@ import com.vaadin.shared.Connector;
 import com.vaadin.shared.ui.AbstractLayoutState;
 
 public class CssLayoutState extends AbstractLayoutState {
+    {
+        primaryStyleName = "v-csslayout";
+    }
     public Map<Connector, String> childCss = new HashMap<Connector, String>();
 }
\ No newline at end of file
diff --git a/shared/src/com/vaadin/shared/ui/customlayout/CustomLayoutState.java b/shared/src/com/vaadin/shared/ui/customlayout/CustomLayoutState.java
index e77ea5c068..07f69b691e 100644
--- a/shared/src/com/vaadin/shared/ui/customlayout/CustomLayoutState.java
+++ b/shared/src/com/vaadin/shared/ui/customlayout/CustomLayoutState.java
@@ -22,6 +22,9 @@ import com.vaadin.shared.Connector;
 import com.vaadin.shared.ui.AbstractLayoutState;
 
 public class CustomLayoutState extends AbstractLayoutState {
+    {
+        primaryStyleName = "v-customlayout";
+    }
     public Map<Connector, String> childLocations = new HashMap<Connector, String>();
     public String templateContents;
     public String templateName;
diff --git a/shared/src/com/vaadin/shared/ui/datefield/InlineDateFieldState.java b/shared/src/com/vaadin/shared/ui/datefield/InlineDateFieldState.java
new file mode 100644
index 0000000000..879670effa
--- /dev/null
+++ b/shared/src/com/vaadin/shared/ui/datefield/InlineDateFieldState.java
@@ -0,0 +1,9 @@
+package com.vaadin.shared.ui.datefield;
+
+import com.vaadin.shared.AbstractFieldState;
+
+public class InlineDateFieldState extends AbstractFieldState {
+    {
+        primaryStyleName = "v-datefield";
+    }
+}
diff --git a/shared/src/com/vaadin/shared/ui/datefield/PopupDateFieldState.java b/shared/src/com/vaadin/shared/ui/datefield/PopupDateFieldState.java
new file mode 100644
index 0000000000..c0d3b20c28
--- /dev/null
+++ b/shared/src/com/vaadin/shared/ui/datefield/PopupDateFieldState.java
@@ -0,0 +1,7 @@
+package com.vaadin.shared.ui.datefield;
+
+public class PopupDateFieldState extends TextualDateFieldState {
+    {
+        primaryStyleName = "v-datefield";
+    }
+}
diff --git a/shared/src/com/vaadin/shared/ui/datefield/TextualDateFieldState.java b/shared/src/com/vaadin/shared/ui/datefield/TextualDateFieldState.java
new file mode 100644
index 0000000000..d7c98fa457
--- /dev/null
+++ b/shared/src/com/vaadin/shared/ui/datefield/TextualDateFieldState.java
@@ -0,0 +1,9 @@
+package com.vaadin.shared.ui.datefield;
+
+import com.vaadin.shared.AbstractFieldState;
+
+public class TextualDateFieldState extends AbstractFieldState {
+    {
+        primaryStyleName = "v-datefield";
+    }
+}
diff --git a/shared/src/com/vaadin/shared/ui/embedded/EmbeddedState.java b/shared/src/com/vaadin/shared/ui/embedded/EmbeddedState.java
new file mode 100644
index 0000000000..2a85197d0a
--- /dev/null
+++ b/shared/src/com/vaadin/shared/ui/embedded/EmbeddedState.java
@@ -0,0 +1,9 @@
+package com.vaadin.shared.ui.embedded;
+
+import com.vaadin.shared.ui.AbstractEmbeddedState;
+
+public class EmbeddedState extends AbstractEmbeddedState {
+    {
+        primaryStyleName = "v-embedded";
+    }
+}
diff --git a/shared/src/com/vaadin/shared/ui/flash/FlashState.java b/shared/src/com/vaadin/shared/ui/flash/FlashState.java
index 50f0d63733..0c94850da7 100644
--- a/shared/src/com/vaadin/shared/ui/flash/FlashState.java
+++ b/shared/src/com/vaadin/shared/ui/flash/FlashState.java
@@ -5,6 +5,9 @@ import java.util.Map;
 import com.vaadin.shared.ui.AbstractEmbeddedState;
 
 public class FlashState extends AbstractEmbeddedState {
+    {
+        primaryStyleName = "v-flash";
+    }
 
     public String classId;
 
diff --git a/shared/src/com/vaadin/shared/ui/form/FormState.java b/shared/src/com/vaadin/shared/ui/form/FormState.java
index f0e79ad38f..c48b68dd4a 100644
--- a/shared/src/com/vaadin/shared/ui/form/FormState.java
+++ b/shared/src/com/vaadin/shared/ui/form/FormState.java
@@ -19,6 +19,9 @@ import com.vaadin.shared.AbstractFieldState;
 import com.vaadin.shared.Connector;
 
 public class FormState extends AbstractFieldState {
+    {
+        primaryStyleName = "v-form";
+    }
     public Connector layout;
     public Connector footer;
 }
\ No newline at end of file
diff --git a/shared/src/com/vaadin/shared/ui/gridlayout/GridLayoutState.java b/shared/src/com/vaadin/shared/ui/gridlayout/GridLayoutState.java
index ae54dc3765..e8a90adcd5 100644
--- a/shared/src/com/vaadin/shared/ui/gridlayout/GridLayoutState.java
+++ b/shared/src/com/vaadin/shared/ui/gridlayout/GridLayoutState.java
@@ -18,6 +18,9 @@ package com.vaadin.shared.ui.gridlayout;
 import com.vaadin.shared.ui.AbstractLayoutState;
 
 public class GridLayoutState extends AbstractLayoutState {
+    {
+        primaryStyleName = "v-gridlayout";
+    }
     public boolean spacing = false;
     public int rows = 0;
     public int columns = 0;
diff --git a/shared/src/com/vaadin/shared/ui/image/ImageState.java b/shared/src/com/vaadin/shared/ui/image/ImageState.java
index 4296c76847..4e9fcf1d5e 100644
--- a/shared/src/com/vaadin/shared/ui/image/ImageState.java
+++ b/shared/src/com/vaadin/shared/ui/image/ImageState.java
@@ -3,5 +3,7 @@ package com.vaadin.shared.ui.image;
 import com.vaadin.shared.ui.AbstractEmbeddedState;
 
 public class ImageState extends AbstractEmbeddedState {
-
+    {
+        primaryStyleName = "v-image";
+    }
 }
diff --git a/shared/src/com/vaadin/shared/ui/label/LabelState.java b/shared/src/com/vaadin/shared/ui/label/LabelState.java
index a91aeb0aa1..2cccc310aa 100644
--- a/shared/src/com/vaadin/shared/ui/label/LabelState.java
+++ b/shared/src/com/vaadin/shared/ui/label/LabelState.java
@@ -18,6 +18,9 @@ package com.vaadin.shared.ui.label;
 import com.vaadin.shared.ComponentState;
 
 public class LabelState extends ComponentState {
+    {
+        primaryStyleName = "v-label";
+    }
     public ContentMode contentMode = ContentMode.TEXT;
     public String text = "";
 }
diff --git a/shared/src/com/vaadin/shared/ui/link/LinkState.java b/shared/src/com/vaadin/shared/ui/link/LinkState.java
new file mode 100644
index 0000000000..96b4600000
--- /dev/null
+++ b/shared/src/com/vaadin/shared/ui/link/LinkState.java
@@ -0,0 +1,9 @@
+package com.vaadin.shared.ui.link;
+
+import com.vaadin.shared.ComponentState;
+
+public class LinkState extends ComponentState {
+    {
+        primaryStyleName = "v-link";
+    }
+}
diff --git a/shared/src/com/vaadin/shared/ui/menubar/MenuBarState.java b/shared/src/com/vaadin/shared/ui/menubar/MenuBarState.java
new file mode 100644
index 0000000000..cf1ef99c06
--- /dev/null
+++ b/shared/src/com/vaadin/shared/ui/menubar/MenuBarState.java
@@ -0,0 +1,9 @@
+package com.vaadin.shared.ui.menubar;
+
+import com.vaadin.shared.ComponentState;
+
+public class MenuBarState extends ComponentState {
+    {
+        primaryStyleName = "v-menubar";
+    }
+}
diff --git a/shared/src/com/vaadin/shared/ui/optiongroup/OptionGroupState.java b/shared/src/com/vaadin/shared/ui/optiongroup/OptionGroupState.java
new file mode 100644
index 0000000000..855a0a3c08
--- /dev/null
+++ b/shared/src/com/vaadin/shared/ui/optiongroup/OptionGroupState.java
@@ -0,0 +1,9 @@
+package com.vaadin.shared.ui.optiongroup;
+
+import com.vaadin.shared.AbstractFieldState;
+
+public class OptionGroupState extends AbstractFieldState {
+    {
+        primaryStyleName = "v-select-optiongroup";
+    }
+}
diff --git a/shared/src/com/vaadin/shared/ui/orderedlayout/HorizontalLayoutState.java b/shared/src/com/vaadin/shared/ui/orderedlayout/HorizontalLayoutState.java
new file mode 100644
index 0000000000..6af6f1c040
--- /dev/null
+++ b/shared/src/com/vaadin/shared/ui/orderedlayout/HorizontalLayoutState.java
@@ -0,0 +1,8 @@
+package com.vaadin.shared.ui.orderedlayout;
+
+
+public class HorizontalLayoutState extends AbstractOrderedLayoutState {
+    {
+        primaryStyleName = "v-horizontallayout";
+    }
+}
diff --git a/shared/src/com/vaadin/shared/ui/orderedlayout/VerticalLayoutState.java b/shared/src/com/vaadin/shared/ui/orderedlayout/VerticalLayoutState.java
new file mode 100644
index 0000000000..a7054f683f
--- /dev/null
+++ b/shared/src/com/vaadin/shared/ui/orderedlayout/VerticalLayoutState.java
@@ -0,0 +1,7 @@
+package com.vaadin.shared.ui.orderedlayout;
+
+public class VerticalLayoutState extends AbstractOrderedLayoutState {
+    {
+        primaryStyleName = "v-verticallayout";
+    }
+}
diff --git a/shared/src/com/vaadin/shared/ui/panel/PanelState.java b/shared/src/com/vaadin/shared/ui/panel/PanelState.java
index 878b921d55..9d502df8fe 100644
--- a/shared/src/com/vaadin/shared/ui/panel/PanelState.java
+++ b/shared/src/com/vaadin/shared/ui/panel/PanelState.java
@@ -18,6 +18,9 @@ package com.vaadin.shared.ui.panel;
 import com.vaadin.shared.ComponentState;
 
 public class PanelState extends ComponentState {
+    {
+        primaryStyleName = "v-panel";
+    }
     public int tabIndex;
     public int scrollLeft, scrollTop;
 }
\ No newline at end of file
diff --git a/shared/src/com/vaadin/shared/ui/slider/SliderState.java b/shared/src/com/vaadin/shared/ui/slider/SliderState.java
index ca18f72b7a..481ee58855 100644
--- a/shared/src/com/vaadin/shared/ui/slider/SliderState.java
+++ b/shared/src/com/vaadin/shared/ui/slider/SliderState.java
@@ -3,6 +3,9 @@ package com.vaadin.shared.ui.slider;
 import com.vaadin.shared.AbstractFieldState;
 
 public class SliderState extends AbstractFieldState {
+    {
+        primaryStyleName = "v-slider";
+    }
 
     public double value;
 
diff --git a/shared/src/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelState.java b/shared/src/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelState.java
index 733f032726..8bddffdfd6 100644
--- a/shared/src/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelState.java
+++ b/shared/src/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelState.java
@@ -21,7 +21,6 @@ import com.vaadin.shared.ComponentState;
 import com.vaadin.shared.Connector;
 
 public class AbstractSplitPanelState extends ComponentState {
-
     public Connector firstChild = null;
     public Connector secondChild = null;
     public SplitterState splitterState = new SplitterState();
diff --git a/shared/src/com/vaadin/shared/ui/splitpanel/HorizontalSplitPanelState.java b/shared/src/com/vaadin/shared/ui/splitpanel/HorizontalSplitPanelState.java
new file mode 100644
index 0000000000..4824f63838
--- /dev/null
+++ b/shared/src/com/vaadin/shared/ui/splitpanel/HorizontalSplitPanelState.java
@@ -0,0 +1,8 @@
+package com.vaadin.shared.ui.splitpanel;
+
+
+public class HorizontalSplitPanelState extends AbstractSplitPanelState {
+    {
+        primaryStyleName = "v-splitpanel-horizontal";
+    }
+}
diff --git a/shared/src/com/vaadin/shared/ui/splitpanel/VerticalSplitPanelState.java b/shared/src/com/vaadin/shared/ui/splitpanel/VerticalSplitPanelState.java
new file mode 100644
index 0000000000..901914cdea
--- /dev/null
+++ b/shared/src/com/vaadin/shared/ui/splitpanel/VerticalSplitPanelState.java
@@ -0,0 +1,7 @@
+package com.vaadin.shared.ui.splitpanel;
+
+public class VerticalSplitPanelState extends AbstractSplitPanelState {
+    {
+        primaryStyleName = "v-splitpanel-vertical";
+    }
+}
diff --git a/shared/src/com/vaadin/shared/ui/table/TableState.java b/shared/src/com/vaadin/shared/ui/table/TableState.java
new file mode 100644
index 0000000000..8e772b7c92
--- /dev/null
+++ b/shared/src/com/vaadin/shared/ui/table/TableState.java
@@ -0,0 +1,9 @@
+package com.vaadin.shared.ui.table;
+
+import com.vaadin.shared.AbstractFieldState;
+
+public class TableState extends AbstractFieldState {
+    {
+        primaryStyleName = "v-table";
+    }
+}
diff --git a/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetState.java b/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetState.java
new file mode 100644
index 0000000000..a36acca9dc
--- /dev/null
+++ b/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetState.java
@@ -0,0 +1,9 @@
+package com.vaadin.shared.ui.tabsheet;
+
+import com.vaadin.shared.ComponentState;
+
+public class TabsheetState extends ComponentState {
+    {
+        primaryStyleName = "v-tabsheet";
+    }
+}
diff --git a/shared/src/com/vaadin/shared/ui/textarea/TextAreaState.java b/shared/src/com/vaadin/shared/ui/textarea/TextAreaState.java
index a562c607b0..0b87f5293c 100644
--- a/shared/src/com/vaadin/shared/ui/textarea/TextAreaState.java
+++ b/shared/src/com/vaadin/shared/ui/textarea/TextAreaState.java
@@ -19,6 +19,9 @@ import com.vaadin.shared.annotations.DelegateToWidget;
 import com.vaadin.shared.ui.textfield.AbstractTextFieldState;
 
 public class TextAreaState extends AbstractTextFieldState {
+    {
+        primaryStyleName = "v-textarea";
+    }
 
     /**
      * Number of visible rows in the text area. The default is 5.
diff --git a/shared/src/com/vaadin/shared/ui/textfield/AbstractTextFieldState.java b/shared/src/com/vaadin/shared/ui/textfield/AbstractTextFieldState.java
index 39265c516f..9ea8ded0a7 100644
--- a/shared/src/com/vaadin/shared/ui/textfield/AbstractTextFieldState.java
+++ b/shared/src/com/vaadin/shared/ui/textfield/AbstractTextFieldState.java
@@ -18,6 +18,10 @@ package com.vaadin.shared.ui.textfield;
 import com.vaadin.shared.AbstractFieldState;
 
 public class AbstractTextFieldState extends AbstractFieldState {
+    {
+        primaryStyleName = "v-textfield";
+    }
+
     /**
      * Maximum character count in text field.
      */
diff --git a/shared/src/com/vaadin/shared/ui/tree/TreeState.java b/shared/src/com/vaadin/shared/ui/tree/TreeState.java
new file mode 100644
index 0000000000..d2d09d41a3
--- /dev/null
+++ b/shared/src/com/vaadin/shared/ui/tree/TreeState.java
@@ -0,0 +1,9 @@
+package com.vaadin.shared.ui.tree;
+
+import com.vaadin.shared.AbstractFieldState;
+
+public class TreeState extends AbstractFieldState {
+    {
+        primaryStyleName = "v-tree";
+    }
+}
diff --git a/shared/src/com/vaadin/shared/ui/treetable/TreeTableState.java b/shared/src/com/vaadin/shared/ui/treetable/TreeTableState.java
new file mode 100644
index 0000000000..c8ab3371d3
--- /dev/null
+++ b/shared/src/com/vaadin/shared/ui/treetable/TreeTableState.java
@@ -0,0 +1,9 @@
+package com.vaadin.shared.ui.treetable;
+
+import com.vaadin.shared.ui.table.TableState;
+
+public class TreeTableState extends TableState {
+    {
+        primaryStyleName = "v-table";
+    }
+}
diff --git a/shared/src/com/vaadin/shared/ui/twincolselect/TwinColSelectState.java b/shared/src/com/vaadin/shared/ui/twincolselect/TwinColSelectState.java
new file mode 100644
index 0000000000..933c1812a0
--- /dev/null
+++ b/shared/src/com/vaadin/shared/ui/twincolselect/TwinColSelectState.java
@@ -0,0 +1,9 @@
+package com.vaadin.shared.ui.twincolselect;
+
+import com.vaadin.shared.AbstractFieldState;
+
+public class TwinColSelectState extends AbstractFieldState {
+    {
+        primaryStyleName = "v-select-twincol";
+    }
+}
diff --git a/shared/src/com/vaadin/shared/ui/video/VideoState.java b/shared/src/com/vaadin/shared/ui/video/VideoState.java
index 2e6e24a743..8d0bc7d8dd 100644
--- a/shared/src/com/vaadin/shared/ui/video/VideoState.java
+++ b/shared/src/com/vaadin/shared/ui/video/VideoState.java
@@ -18,5 +18,7 @@ package com.vaadin.shared.ui.video;
 import com.vaadin.shared.ui.AbstractMediaState;
 
 public class VideoState extends AbstractMediaState {
-
+    {
+        primaryStyleName = "v-video";
+    }
 }
diff --git a/shared/src/com/vaadin/shared/ui/window/WindowState.java b/shared/src/com/vaadin/shared/ui/window/WindowState.java
index c86b6cb187..7cac98584c 100644
--- a/shared/src/com/vaadin/shared/ui/window/WindowState.java
+++ b/shared/src/com/vaadin/shared/ui/window/WindowState.java
@@ -18,6 +18,9 @@ package com.vaadin.shared.ui.window;
 import com.vaadin.shared.ui.panel.PanelState;
 
 public class WindowState extends PanelState {
+    {
+        primaryStyleName = "v-window";
+    }
     public boolean modal = false;
     public boolean resizable = true;
     public boolean resizeLazy = false;