summaryrefslogtreecommitdiffstats
path: root/WebContent/VAADIN
diff options
context:
space:
mode:
authorTeppo Kurki <teppo.kurki@vaadin.com>2015-07-03 15:52:06 +0300
committerTeemu Suo-Anttila <teemusa@vaadin.com>2015-08-11 14:20:45 +0300
commit554bdab01e987b09a78b23d049c0f9f9b2a2ec72 (patch)
tree6c11fef9e15cb72fa88ef77b806aede5e600f92d /WebContent/VAADIN
parent20f6053dc199d5dd7dde071dfdd9b37ea8f85e36 (diff)
downloadvaadin-framework-554bdab01e987b09a78b23d049c0f9f9b2a2ec72.tar.gz
vaadin-framework-554bdab01e987b09a78b23d049c0f9f9b2a2ec72.zip
Keep non-editable & selection columns visible in editor
Change-Id: Ib3090d43e97667707590a2bca5f4641b72d7cd7f
Diffstat (limited to 'WebContent/VAADIN')
-rw-r--r--WebContent/VAADIN/themes/base/grid/grid.scss4
-rw-r--r--WebContent/VAADIN/themes/valo/components/_grid.scss4
2 files changed, 8 insertions, 0 deletions
diff --git a/WebContent/VAADIN/themes/base/grid/grid.scss b/WebContent/VAADIN/themes/base/grid/grid.scss
index f587dfef4f..6b3b017070 100644
--- a/WebContent/VAADIN/themes/base/grid/grid.scss
+++ b/WebContent/VAADIN/themes/base/grid/grid.scss
@@ -396,6 +396,10 @@ $v-grid-details-border-bottom-stripe: 1px solid darken($v-grid-row-background-co
min-width: 100%;
max-width: 100%;
}
+
+ &.not-editable.#{$primaryStyleName}-cell {
+ float: none;
+ }
}
.error::before {
diff --git a/WebContent/VAADIN/themes/valo/components/_grid.scss b/WebContent/VAADIN/themes/valo/components/_grid.scss
index d00ddf30a4..11134262eb 100644
--- a/WebContent/VAADIN/themes/valo/components/_grid.scss
+++ b/WebContent/VAADIN/themes/valo/components/_grid.scss
@@ -119,6 +119,10 @@ $v-grid-details-border-bottom-stripe: $v-grid-cell-horizontal-border !default;
vertical-align: middle;
}
+ &.not-editable.#{$primary-stylename}-cell {
+ float: none;
+ }
+
.error::before {
border-top: round($v-unit-size / 4) solid $v-error-indicator-color;
border-right: round($v-unit-size / 4) solid transparent;