Merge remote-tracking branch 'origin/master' into grid

Change-Id: I7462e5a6a902eb0c4396bc14216a6f323dd33b76

4 files changed, 39 insertions, 8 deletions

diff --git a/WebContent/VAADIN/themes/valo/components/_datefield.scss b/WebContent/VAADIN/themes/valo/components/_datefield.scss
index 48977d4d20..71b50b5a77 100644
--- a/WebContent/VAADIN/themes/valo/components/_datefield.scss
+++ b/WebContent/VAADIN/themes/valo/components/_datefield.scss
@@ -337,7 +337,10 @@
     @include valo-datefield-calendarpanel-day-focused-style;
   }
 
-
+  .#{$primary-stylename}-day.#{$primary-stylename}-day-outside-range,
+  .#{$primary-stylename}-day.#{$primary-stylename}-day-outside-range:hover {
+    @include valo-datefield-calendarpanel-outside-range-style;
+  }
 
   .#{$primary-stylename}-weekdays {
     height: round($v-unit-size * 0.7);
@@ -349,13 +352,12 @@
     }
   }
 
-
   .#{$primary-stylename}-header {
     white-space: nowrap;
   }
 
-  td[class$="year"],
-  td[class$="month"] {
+  td[class*="year"],
+  td[class*="month"] {
     button {
       @include appearance(none);
       border: none;
@@ -381,10 +383,16 @@
         }
       }
 
-      &:hover {
-        @include opacity(1);
-        &:before {
-          color: $v-focus-color;
+      &:hover:before {
+        color: $v-focus-color;
+      }
+
+      &.outside-range {
+        cursor: default;
+        @include opacity(.3);
+
+        &:hover:before {
+          color: mix($v-background-color, valo-font-color($v-background-color));
         }
       }
     }
@@ -500,6 +508,15 @@
   background: transparent;
 }
 
+/**
+ * Outputs the styles for an individual day element, which are outside available range.
+ *
+ * @group datefield
+ */
+@mixin valo-datefield-calendarpanel-outside-range-style {
+  color: mix(valo-font-color($v-background-color), $v-background-color);
+  cursor: not-allowed;
+}
 
 /**
  * Outputs the styles for todays day element in a calendar panel.
diff --git a/WebContent/VAADIN/themes/valo/components/_table.scss b/WebContent/VAADIN/themes/valo/components/_table.scss
index e040a62d0f..d8a673294d 100644
--- a/WebContent/VAADIN/themes/valo/components/_table.scss
+++ b/WebContent/VAADIN/themes/valo/components/_table.scss
@@ -191,7 +191,15 @@ $v-table-background-color: null !default;
   .#{$primary-stylename}-caption-container {
     overflow: hidden;
     line-height: 1;
+    min-height: $v-table-row-height;
     @include box-sizing(border-box);
+
+    .v-ie8 & {
+      // IE8 has issues with border-box and min-height
+      // -> custom calculations to subtract vertical padding from row height.
+      $vertical-padding: round(($v-table-row-height - $v-table-header-font-size)/2);
+      min-height: $v-table-row-height - ($vertical-padding - $v-table-border-width) - $vertical-padding;
+    }
   }
 
   .#{$primary-stylename}-footer-container {
diff --git a/WebContent/VAADIN/themes/valo/favicon.ico b/WebContent/VAADIN/themes/valo/favicon.ico
new file mode 100644
index 0000000000..ffb34a65c7
--- /dev/null
+++ b/WebContent/VAADIN/themes/valo/favicon.ico
diff --git a/WebContent/VAADIN/themes/valo/shared/_global.scss b/WebContent/VAADIN/themes/valo/shared/_global.scss
index 049518af73..4ce294b06a 100644
--- a/WebContent/VAADIN/themes/valo/shared/_global.scss
+++ b/WebContent/VAADIN/themes/valo/shared/_global.scss
@@ -121,6 +121,12 @@ $valo-global-included: false !default;
       -webkit-overflow-scrolling: none;
     }
 
+    //fix for #14813 - unable to scroll on iOS devices
+    .v-webkit.v-ios .v-browserframe {
+      -webkit-overflow-scrolling: touch;
+      overflow:auto;
+    }
+
     .v-assistive-device-only {
       position: absolute;
       top: -2000px;