diff options
| author | Pekka Hyvönen <pekka@vaadin.com> | 2015-03-19 08:29:00 +0200 |
|---|---|---|
| committer | Pekka Hyvönen <pekka@vaadin.com> | 2015-03-19 08:29:31 +0200 |
| commit | 4d5f6cf73f84bd0f68f05eb534699bddb898f9f1 (patch) | |
| tree | 3bd75f12598d8598963d94b97c5cb8e30a6808a5 /WebContent | |
| parent | 7a0be4e8e71df51f6fe49d2651f05e9430e307e1 (diff) | |
| parent | 4e26f150752d29a015dec71dfcba186b19b7506a (diff) | |
| download | vaadin-framework-4d5f6cf73f84bd0f68f05eb534699bddb898f9f1.tar.gz vaadin-framework-4d5f6cf73f84bd0f68f05eb534699bddb898f9f1.zip | |
Merge remote-tracking branch 'origin/grid-columnhiding' into grid-7.5
Change-Id: Ice80ed9d5a96d9de824cc932873b4e6a736459a8
Diffstat (limited to 'WebContent')
| -rw-r--r-- | WebContent/VAADIN/themes/base/grid/grid.scss | 27 |
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 |