aboutsummaryrefslogtreecommitdiffstats
path: root/themes
diff options
context:
space:
mode:
authorDenis Anisimov <denis@vaadin.com>2015-01-04 16:02:32 +0200
committerVaadin Code Review <review@vaadin.com>2016-05-13 11:25:45 +0000
commitc6f185a1c420af5ca67a5dc9200db15dcc8e2365 (patch)
tree13cf19c35b01c04a2c5863722f81b53f0e90cc0c /themes
parent2ac56631c0e30a07111ac01fa53b5665757f4131 (diff)
downloadvaadin-framework-c6f185a1c420af5ca67a5dc9200db15dcc8e2365.tar.gz
vaadin-framework-c6f185a1c420af5ca67a5dc9200db15dcc8e2365.zip
Fix opacity value for disabled label and non-collapsible column (#15489)
Change-Id: I0d669f1c85feebcaa01c58fb81b5e20802440ef2
Diffstat (limited to 'themes')
-rw-r--r--themes/src/main/themes/VAADIN/themes/valo/components/_label.scss4
-rw-r--r--themes/src/main/themes/VAADIN/themes/valo/components/_table.scss4
2 files changed, 8 insertions, 0 deletions
diff --git a/themes/src/main/themes/VAADIN/themes/valo/components/_label.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_label.scss
index 95500ceafe..3403260220 100644
--- a/themes/src/main/themes/VAADIN/themes/valo/components/_label.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_label.scss
@@ -109,6 +109,10 @@ $v-letter-spacing--h4: 0 !default;
.#{$primary-stylename} {
@include user-select(text);
+
+ &.v-disabled {
+ @include opacity($v-disabled-opacity);
+ }
}
.#{$primary-stylename}-undef-w {
diff --git a/themes/src/main/themes/VAADIN/themes/valo/components/_table.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_table.scss
index a832b3a4da..86efb96637 100644
--- a/themes/src/main/themes/VAADIN/themes/valo/components/_table.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_table.scss
@@ -456,6 +456,10 @@ $v-table-background-color: null !default;
div {
display: inline;
}
+
+ &.v-disabled {
+ @include opacity($v-disabled-opacity);
+ }
}
.v-off:before {
visibility: hidden;