Prefixed all Valo-specific 'property values' with 'v-'

Bevel and shadow substitute values 'hilite' and 'shade' are now
'v-hilite' and 'v-shade'.

'focus-color' is also now 'v-focus-color'.

Gradient style are now 'v-linear' and 'v-linear-reverse'

Change-Id: I003997d3fea076d7fec45cb95e70c27a81de625e

diff --git a/WebContent/VAADIN/themes/valo/components/_button.scss b/WebContent/VAADIN/themes/valo/components/_button.scss
index 878203b8780a599693381821f24956c4826f293c..660a988bb561a48f3e8980f7b3927a00d1473664 100644 (file)
--- a/WebContent/VAADIN/themes/valo/components/_button.scss
+++ b/WebContent/VAADIN/themes/valo/components/_button.scss
@@ -117,7 +117,7 @@ $v-button-disabled-opacity: $v-disabled-opacity !default;
   $border-color: if(color-luminance($background-color) < color-luminance($v-app-background-color), $background-color, $v-app-background-color);
   $border-color: blend-darken($border-color, scale-color($border-color, $lightness: max(-50%, -$bevel-depth/2)));
   $border-color: scale-color($border-color, $saturation: -$bevel-depth/2);
-  @if contains($bevel-style, shade, true) {
+  @if contains($bevel-style, v-shade, true) {
     $border-color: $border-color $border-color blend-multiply(transparentize(#000, max(0.8, 1-$bevel-depth/200%)), $border-color);
   }
 

diff --git a/WebContent/VAADIN/themes/valo/components/_panel.scss b/WebContent/VAADIN/themes/valo/components/_panel.scss
index 54c9df18baa5cf28b745ea9b73791fec1ed7b4d3..54fe31975af39921e4e97174357cc8caddecfe0d 100644 (file)
--- a/WebContent/VAADIN/themes/valo/components/_panel.scss
+++ b/WebContent/VAADIN/themes/valo/components/_panel.scss
@@ -76,7 +76,7 @@ $v-panel-caption-bevel-depth: $v-bevel-depth !default;
 @mixin v-valo-panel-well-style {
   $_bg: scale-color(adjust-color($v-app-background-color, $lightness: -2%), $saturation: -1.5%);
   background: $_bg;
-  box-shadow: v-valo-shadow($shadow-style: (0 1px 0 0 hilite, join(inset, $v-panel-shadow-style)));
+  box-shadow: v-valo-shadow($shadow-style: (0 1px 0 0 v-hilite, join(inset, $v-panel-shadow-style)));
   border-radius: $v-border-radius;
   border: $v-border-width solid v-valo-panel-border-color(v-valo-panel-background-color());
 

diff --git a/WebContent/VAADIN/themes/valo/components/_table.scss b/WebContent/VAADIN/themes/valo/components/_table.scss
index 58d96c688adb4aa0cf3ab95467b823d99359161d..59ad6069af7820fca0597b72deecc51abc125020 100644 (file)
--- a/WebContent/VAADIN/themes/valo/components/_table.scss
+++ b/WebContent/VAADIN/themes/valo/components/_table.scss
@@ -312,7 +312,6 @@ $v-table-background-color: null !default;
     @include transition-delay(100ms);
   }
 
-  /* row in column selector */
   .v-on,
   .v-off {
     &:before {

diff --git a/WebContent/VAADIN/themes/valo/components/_textfield.scss b/WebContent/VAADIN/themes/valo/components/_textfield.scss
index 14f9535d41592c8742676bf121c4ccdbd1aae66f..14735a4f9d8c3040c16e146d28a2554d05cf7c3d 100644 (file)
--- a/WebContent/VAADIN/themes/valo/components/_textfield.scss
+++ b/WebContent/VAADIN/themes/valo/components/_textfield.scss
@@ -1,4 +1,4 @@
-$v-textfield-bevel-style: inset 0 1px 0 shade, 0 1px 0 hilite !default;
+$v-textfield-bevel-style: inset 0 1px 0 v-shade, 0 1px 0 v-hilite !default;
 $v-textfield-bevel-depth: $v-bevel-depth !default;
 $v-textfield-shadow-style: none !default;
 $v-textfield-shadow-depth: $v-shadow-depth !default;

diff --git a/WebContent/VAADIN/themes/valo/shared/_overlay.scss b/WebContent/VAADIN/themes/valo/shared/_overlay.scss
index 87adb4dffdda6ce017cd638075f82e9caa1dbcf9..96aa05ac495ddf81f8c0de0307f24c381aaf0a64 100644 (file)
--- a/WebContent/VAADIN/themes/valo/shared/_overlay.scss
+++ b/WebContent/VAADIN/themes/valo/shared/_overlay.scss
@@ -6,7 +6,7 @@ $v-overlay-padding: round($v-unit-size/9) !default;
 $v-overlay-padding-vertical: $v-overlay-padding !default;
 $v-overlay-padding-horizontal: $v-overlay-padding !default;
 
-$v-overlay-shadow-style: 0 2px 4px 0 shade, 0 3px 5px 0 shade !default;
+$v-overlay-shadow-style: 0 2px 4px 0 v-shade, 0 3px 5px 0 v-shade !default;
 
 $v-selection-overlay-padding: $v-overlay-padding !default;
 $v-selection-overlay-padding-vertical: $v-selection-overlay-padding !default;

diff --git a/WebContent/VAADIN/themes/valo/shared/_tooltip.scss b/WebContent/VAADIN/themes/valo/shared/_tooltip.scss
index 9074fc69a70b2e26587f5c61d9f7f7ca3f19e3b1..dab8d5afeb1ffd524cd5dd4dc673f4efc3c21553 100644 (file)
--- a/WebContent/VAADIN/themes/valo/shared/_tooltip.scss
+++ b/WebContent/VAADIN/themes/valo/shared/_tooltip.scss
@@ -28,6 +28,11 @@ $v-tooltip-border-radius: $v-border-radius - 1px !default;
       max-height: 10em;
       overflow: auto;
       font-weight: $v-font-weight + 100;
+
+      h2:only-child {
+        font: inherit;
+        line-height: inherit;
+      }
     }
 
     .v-tooltip-text {

diff --git a/WebContent/VAADIN/themes/valo/shared/_variables.scss b/WebContent/VAADIN/themes/valo/shared/_variables.scss
index a0aabd959094b42a510eeda6bf47b972d9ac8c6c..19f5195acb3b2e3a0c6b0bdf4a7259e6b4ccf86e 100644 (file)
--- a/WebContent/VAADIN/themes/valo/shared/_variables.scss
+++ b/WebContent/VAADIN/themes/valo/shared/_variables.scss
@@ -98,16 +98,16 @@ $v-layout-spacing-horizontal:   round($v-unit-size/3)           !default;
 $v-border-width:                1px                             !default; // Must be specified in pixels
 $v-border-radius:               4px                             !default; // Must be specified in pixels
 
-$v-gradient-style:              linear                          !default;
+$v-gradient-style:              v-linear                        !default;
 $v-gradient-depth:              8%                              !default;
 
-$v-bevel-style:                 inset 0 1px 0 hilite, inset 0 -1px 0 shade !default;
+$v-bevel-style:                 inset 0 1px 0 v-hilite, inset 0 -1px 0 v-shade !default;
 $v-bevel-depth:                 25%                             !default;
 
-$v-shadow-style:                0 2px 3px shade                 !default;
+$v-shadow-style:                0 2px 3px v-shade               !default;
 $v-shadow-depth:                5%                              !default;
 
-$v-focus-style:                 0 0 0 2px focus-color           !default;
+$v-focus-style:                 0 0 0 2px v-focus-color         !default;
 $v-focus-color:                 null                            !default;
 
 $v-animations-enabled:          true                            !default;
@@ -137,4 +137,4 @@ $v-valo-include-common-stylenames: true                         !default;
 // @private
 // @variable  v-relative-paths
 // @default   false
-$v-relative-paths: false !default;
\ No newline at end of file
+$v-relative-paths: false !default;

diff --git a/WebContent/VAADIN/themes/valo/util/_bevel-and-shadow.scss b/WebContent/VAADIN/themes/valo/util/_bevel-and-shadow.scss
index 2b627df3e713e362328462eca6a9202541247857..f24a40f5b690a9bdac136009f9f3592044dc3d3a 100644 (file)
--- a/WebContent/VAADIN/themes/valo/util/_bevel-and-shadow.scss
+++ b/WebContent/VAADIN/themes/valo/util/_bevel-and-shadow.scss
@@ -42,10 +42,10 @@
 
   // If the shadow-list only contains one shadow
   // (we can't use the recursive replace function because that will mess up the list delimeters)
-  @if last($shadow-list) == hilite {
-    @return replace($shadow-list, hilite, $hilite);
-  } @else if last($shadow-list) == shade {
-    @return replace($shadow-list, shade, $shade);
+  @if last($shadow-list) == v-hilite {
+    @return replace($shadow-list, v-hilite, $hilite);
+  } @else if last($shadow-list) == v-shade {
+    @return replace($shadow-list, v-shade, $shade);
   }
   
   // If there are multiple shadows in a list, recurse and separate lists with a comma

diff --git a/WebContent/VAADIN/themes/valo/util/_color.scss b/WebContent/VAADIN/themes/valo/util/_color.scss
index 77fe0ed5c7f2418e963676aa25486feede65f1dd..c2fb9f1a1bdaae19bd039dc4e7b316a74efc5b4b 100644 (file)
--- a/WebContent/VAADIN/themes/valo/util/_color.scss
+++ b/WebContent/VAADIN/themes/valo/util/_color.scss
@@ -97,7 +97,7 @@ $v-luminance-threshold: 150 !default;
 
 @function v-valo-focus-box-shadow ($color: null, $focus-style: $v-focus-style) {
   $focus-color: v-valo-focus-color($color: $color);
-  @return replace($focus-style, focus-color, transparentize($focus-color, .5));
+  @return replace($focus-style, v-focus-color, transparentize($focus-color, .5));
 }
 
 

diff --git a/WebContent/VAADIN/themes/valo/util/_gradient.scss b/WebContent/VAADIN/themes/valo/util/_gradient.scss
index 6266fe9864137ec8df0c91a8f5d48e04581eaf1d..9c738edfe5d1a279c0702ea4a7052a9228f660bd 100644 (file)
--- a/WebContent/VAADIN/themes/valo/util/_gradient.scss
+++ b/WebContent/VAADIN/themes/valo/util/_gradient.scss
@@ -12,12 +12,12 @@
 @function v-valo-gradient-color-stops($color, $style: $v-gradient-style, $depth: $v-gradient-depth) {
   @if $depth > 0 {
     
-    @if $style == linear or $style == linear-reverse {
+    @if $style == v-linear or $style == v-linear-reverse {
       $start: blend-overlay(transparentize(#fff, 1-$depth/100%), $color);
       $end: blend-overlay(transparentize(#000, max(0, 1-$depth/100%)), $color);
       $end: blend-multiply(transparentize(#000, max(0, 1-$depth/200%)), $end);
       
-      @if $style == linear {
+      @if $style == v-linear {
         @return $start 2%, $end 98%;
       } @else {
         @return $end 2%, $start 98%;

diff --git a/WebContent/license.html b/WebContent/license.html
index d984717773353dea69ba761d956394dd1f47ca74..0bb3f70f01ba9d1bd79919074f472294bc280373 100644 (file)
--- a/WebContent/license.html
+++ b/WebContent/license.html
@@ -132,7 +132,7 @@
           </tr>
           <!-- Used by font icons -->
           <tr>
-            <td>FontAwesome</td>
+            <td title="Custom web font">FontAwesome</td>
             <td><a href="licenses/OFL.txt">SIL OFL 1.1</a></td>
           </tr>
                  <!-- The extracted vaadin-sass-compiler -->