5 files changed, 16 insertions, 18 deletions
diff --git a/WebContent/VAADIN/themes/base/grid/grid.scss b/WebContent/VAADIN/themes/base/grid/grid.scss
index 4be0faecc6..79909a0b93 100644
--- a/WebContent/VAADIN/themes/base/grid/grid.scss
+++ b/WebContent/VAADIN/themes/base/grid/grid.scss
@@ -35,11 +35,19 @@ $v-grid-editor-row-background-color: $v-grid-row-background-color !default;
     outline: none;
   }
 
-  .#{$primaryStyleName}-scroller-vertical.
+  .#{$primaryStyleName}-scroller-vertical,
   .#{$primaryStyleName}-scroller-horizontal {
     border: $v-grid-border;
   }
 
+  .#{$primaryStyleName}-scroller-vertical {
+    border-left: none;
+  }
+
+  .#{$primaryStyleName}-scroller-horizontal {
+    border-top: none;
+  }
+
   .#{$primaryStyleName}-tablewrapper {
     border: $v-grid-border;
   }
diff --git a/WebContent/VAADIN/themes/reindeer/reindeer.scss b/WebContent/VAADIN/themes/reindeer/reindeer.scss
index 443f5cc7f3..cda571fda0 100644
--- a/WebContent/VAADIN/themes/reindeer/reindeer.scss
+++ b/WebContent/VAADIN/themes/reindeer/reindeer.scss
@@ -6,7 +6,7 @@ $line-height: normal !default;
 $v-grid-border: 1px solid #c2c3c4;
 $v-grid-cell-vertical-border: 1px solid #d4d4d4;
 $v-grid-cell-horizontal-border: none;
-$v-grid-cell-active-border: 1px solid #0f68ba;
+$v-grid-cell-focused-border: 1px solid #0f68ba;
 $v-grid-row-height: 20px;
 $v-grid-row-stripe-background-color: #eff0f1;
 $v-grid-row-selected-background-color: #4d749f;
diff --git a/WebContent/VAADIN/themes/runo/grid/grid.scss b/WebContent/VAADIN/themes/runo/grid/grid.scss
index 4d16c79fb8..a1081878cc 100644
--- a/WebContent/VAADIN/themes/runo/grid/grid.scss
+++ b/WebContent/VAADIN/themes/runo/grid/grid.scss
@@ -4,7 +4,7 @@
 
   .#{$primaryStyleName}-header,
   .#{$primaryStyleName}-footer {
-    > .#{$primaryStyleName}-cell {
+    .#{$primaryStyleName}-cell {
       background-image: url(img/header-bg.png);
       color: #393a3c;
       text-shadow: #fff 0 1px 0;
diff --git a/WebContent/VAADIN/themes/runo/runo.scss b/WebContent/VAADIN/themes/runo/runo.scss
index 92fed26267..73566be8c3 100644
--- a/WebContent/VAADIN/themes/runo/runo.scss
+++ b/WebContent/VAADIN/themes/runo/runo.scss
@@ -7,7 +7,7 @@ $v-grid-border: 1px solid #b6bbbc;
 $v-grid-cell-vertical-border: 1px solid #d4d4d4;
 $v-grid-cell-vertical-border: none;
 $v-grid-cell-horizontal-border: none;
-$v-grid-cell-active-border: 1px solid #57a7ed;
+$v-grid-cell-focused-border: 1px solid #57a7ed;
 $v-grid-row-height: 26px;
 $v-grid-header-row-height: 36px;
 $v-grid-row-background-color: #fff !default;
diff --git a/WebContent/VAADIN/themes/valo/components/_grid.scss b/WebContent/VAADIN/themes/valo/components/_grid.scss
index 4b2197f6a4..7e1882472a 100644
--- a/WebContent/VAADIN/themes/valo/components/_grid.scss
+++ b/WebContent/VAADIN/themes/valo/components/_grid.scss
@@ -87,22 +87,12 @@ $v-grid-cell-padding-horizontal: $v-table-cell-padding-horizontal !default;
     }
   }
 
-  .#{$primary-stylename}-scroller-vertical {
-    border: $v-grid-border;
-    border-left: none;
-
-    &::-webkit-scrollbar-thumb {
-      min-height: 30px;
-    }
+  .#{$primary-stylename}-scroller-vertical::-webkit-scrollbar-thumb {
+    min-height: 30px;
   }
 
-  .#{$primary-stylename}-scroller-horizontal {
-    border: $v-grid-border;
-    border-top: none;
-
-    &::-webkit-scrollbar-thumb {
-      min-width: 30px;
-    }
+  .#{$primary-stylename}-scroller-horizontal::-webkit-scrollbar-thumb {
+    min-width: 30px;
   }
 
 }