From: Jouni Koivuviita <jouni@vaadin.com>
Date: Thu, 21 Aug 2014 12:16:49 +0000 (+0300)
Subject: Bugfixes to Valo (#14490)
X-Git-Tag: 7.4.0.beta1~298
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a5052720216baeb5014a4e3b0027367c8ab7ed67;p=vaadin-framework.git

Bugfixes to Valo (#14490)

valo-component-group mixin doesn’t have any parameters. Ruby compiler
produces an error, but Java compiler works anyway (#14479).

Missing semicolon after a line before @include produces an error with
the Ruby compiler, but passes compilation with the Java compiler
(#14480).

Change-Id: If6fa2b5039f4d9daa7ee73380f089b533c2cce0f
---

diff --git a/WebContent/VAADIN/themes/valo/components/_csslayout.scss b/WebContent/VAADIN/themes/valo/components/_csslayout.scss
index 95bdcc5a3a..b0fa4362e7 100644
--- a/WebContent/VAADIN/themes/valo/components/_csslayout.scss
+++ b/WebContent/VAADIN/themes/valo/components/_csslayout.scss
@@ -14,7 +14,7 @@ $v-component-group-spacing: null !default;
     }
 
     .#{$primary-stylename}-v-component-group {
-      @include valo-component-group($primary-stylename);
+      @include valo-component-group;
     }
   }
 }
diff --git a/WebContent/VAADIN/themes/valo/components/_label.scss b/WebContent/VAADIN/themes/valo/components/_label.scss
index 655ef6e1cc..7f4fef58d9 100644
--- a/WebContent/VAADIN/themes/valo/components/_label.scss
+++ b/WebContent/VAADIN/themes/valo/components/_label.scss
@@ -79,7 +79,7 @@ $v-letter-spacing--h4:    0               !default;
    > h4
    > .#{$primary-stylename}-h1,
    > .#{$primary-stylename}-h2,
-   > .#{$primary-stylename}-h3
+   > .#{$primary-stylename}-h3,
    > .#{$primary-stylename}-h4 {
       &:first-child {
         margin-top: $v-font-size;
@@ -91,7 +91,7 @@ $v-letter-spacing--h4:    0               !default;
   .v-verticallayout > div > .v-slot:first-child {
     h1, .#{$primary-stylename}-h1,
     h2, .#{$primary-stylename}-h2,
-    h3, .#{$primary-stylename}-h3
+    h3, .#{$primary-stylename}-h3,
     h4, .#{$primary-stylename}-h4 {
       margin-top: $v-font-size;
     }
diff --git a/WebContent/VAADIN/themes/valo/components/_textfield.scss b/WebContent/VAADIN/themes/valo/components/_textfield.scss
index f0b0ec2532..c194bd715f 100644
--- a/WebContent/VAADIN/themes/valo/components/_textfield.scss
+++ b/WebContent/VAADIN/themes/valo/components/_textfield.scss
@@ -199,7 +199,7 @@ $v-textfield-disabled-opacity: $v-disabled-opacity !default;
 
 @mixin valo-textfield-readonly-style {
   background: $v-textfield-background-color--readonly;
-  color: valo-font-color($v-textfield-background-color--readonly)
+  color: valo-font-color($v-textfield-background-color--readonly);
   @include box-shadow(none);
   &:focus {
     box-shadow: none;