Merge remote-tracking branch 'origin/grid-columnhiding' into grid-7.5

Change-Id: Ice80ed9d5a96d9de824cc932873b4e6a736459a8

1 files changed, 27 insertions, 0 deletions

diff --git a/WebContent/VAADIN/themes/base/grid/grid.scss b/WebContent/VAADIN/themes/base/grid/grid.scss
index 14de4a2447..87b936a1b9 100644
--- a/WebContent/VAADIN/themes/base/grid/grid.scss
+++ b/WebContent/VAADIN/themes/base/grid/grid.scss
@@ -52,6 +52,8 @@ $v-grid-editor-background-color: $v-grid-row-background-color !default;
   .#{$primaryStyleName}-tablewrapper {
     border: $v-grid-border;
   }
+  
+  // Column drag and drop elements
 
   .#{$primaryStyleName} .header-drag-table {
     border-spacing: 0;
@@ -76,6 +78,31 @@ $v-grid-editor-background-color: $v-grid-row-background-color !default;
       }
     }
   }
+  
+  // Sidebar
+  
+  .#{$primaryStyleName}-sidebar {
+    position: absolute;
+    top: 1px;
+    right : 0;
+    
+    background-color: $v-grid-header-background-color;
+    border-left: $v-grid-header-border;
+    border-bottom: $v-grid-header-border;    
+    z-index: 5;
+    
+    .#{$primaryStyleName}-sidebar-button {
+      height: $v-grid-header-row-height;
+      
+      &:after {
+        content: "\f0c9";
+        font-family: FontAwesome, sans-serif;
+        font-size: $v-grid-header-font-size;
+        line-height: $v-grid-header-row-height;
+        padding: 0 $v-grid-cell-padding-horizontal;
+      }
+    }
+  }
 
   // Common cell styles