Merge branch 'sass'

diff --cc WebContent/VAADIN/themes/base/datefield/datefield.scss
index 8877c986a06b12cc1132bbe555df686d7287df9d,a2975a2c0696a30173eb123cd8231293e58651cf..f7d71a576b81891dc31c8c9cc049a6ed028ec1d7
--- 1/WebContent/VAADIN/themes/base/datefield/datefield.scss
--- 2/WebContent/VAADIN/themes/base/datefield/datefield.scss
+++ b/WebContent/VAADIN/themes/base/datefield/datefield.scss
@@@ -1,17 -1,16 +1,17 @@@
- @mixin base-datefield {
+ @mixin base-datefield($name : v-datefield) {
  
- .v-datefield {
+ .#{$name} {
        white-space: nowrap;
        display: inline-block; /* Force minimum width */
 +      line-height:0; /* Force minimum height */
  }
- .v-datefield-textfield {
+ .#{$name}-textfield {
        vertical-align: top;
  }
- .v-datefield-button {
+ .#{$name}-button {
        cursor: pointer;
  }
- .v-datefield-prompt .v-datefield-textfield {
+ .#{$name}-prompt .#{$name}-textfield {
        color: #999;
        font-style: italic;
  }

diff --cc WebContent/VAADIN/themes/base/splitpanel/splitpanel.scss
Simple merge