diff options
Diffstat (limited to 'WebContent/VAADIN/themes/base')
| -rw-r--r-- | WebContent/VAADIN/themes/base/escalator/escalator.scss | 19 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/base/grid/grid.scss | 68 |
2 files changed, 87 insertions, 0 deletions
diff --git a/WebContent/VAADIN/themes/base/escalator/escalator.scss b/WebContent/VAADIN/themes/base/escalator/escalator.scss index 606dc6a7dd..bae95b299c 100644 --- a/WebContent/VAADIN/themes/base/escalator/escalator.scss +++ b/WebContent/VAADIN/themes/base/escalator/escalator.scss @@ -133,4 +133,23 @@ z-index: 1; } + .#{$primaryStyleName}-spacer { + position: absolute; + display: block; + + background-color: $background-color; + + > td { + width: 100%; + height: 100%; + } + + .v-ie8 &, .v-ie9 & { + // The inline style of margin-top from the <tbody> to offset the + // header's dimension is, for some strange reason, inherited into each + // contained <tr>. We need to cancel it: + + margin-top: 0; + } + } } diff --git a/WebContent/VAADIN/themes/base/grid/grid.scss b/WebContent/VAADIN/themes/base/grid/grid.scss index e4a4a1d920..ccb7043c50 100644 --- a/WebContent/VAADIN/themes/base/grid/grid.scss +++ b/WebContent/VAADIN/themes/base/grid/grid.scss @@ -14,6 +14,7 @@ $v-grid-row-focused-background-color: null !default; $v-grid-header-row-height: null !default; $v-grid-header-font-size: $v-font-size !default; $v-grid-header-background-color: $v-grid-row-background-color !default; +$v-grid-header-drag-marked-color: $v-grid-row-selected-background-color !default; $v-grid-footer-row-height: $v-grid-header-row-height !default; $v-grid-footer-font-size: $v-grid-header-font-size !default; @@ -51,6 +52,69 @@ $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; + position: relative; + table-layout: fixed; + width: inherit; // a decent default fallback + + .#{$primaryStyleName}-header { + position: absolute; + > .#{$primaryStyleName}-cell { + border: $v-grid-border; + margin-top: -10px; + opacity: 0.9; + filter: alpha(opacity=90); // IE8 + z-index: 30000; + } + + > .#{$primaryStyleName}-drop-marker { + background-color: $v-grid-header-drag-marked-color; + position: absolute; + width: 3px; + } + } + } + + // Sidebar + + .#{$primaryStyleName}-sidebar { + position: absolute; + top: 1px; + right : 1px; + + 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; + text-align: right; + + &: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; + } + } + + .#{$primaryStyleName}-sidebar-content { + + .column-hiding-panel { + display: block; + .column-hiding-toggle { + display: block; + padding: 3px 12px; + } + } + } + } // Common cell styles @@ -328,6 +392,10 @@ $v-grid-editor-background-color: $v-grid-row-background-color !default; .#{$primaryStyleName}-editor-save { margin-right: 4px; } + + .#{$primaryStyleName}-spacer { + border: $v-grid-border; + } // Renderers |