summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Koivuviita <jouni@vaadin.com>2014-08-05 23:08:10 +0300
committerJouni Koivuviita <jouni@vaadin.com>2014-08-07 17:51:13 +0000
commitadf1586875cdf2d2b0e31d9ed2bfc7054395d381 (patch)
tree89021d5e0f1777eacb24140fbe0ea1ba32cd88d9
parentdee87e1172cee9be7c4d2b22e3974babecc30906 (diff)
downloadvaadin-framework-adf1586875cdf2d2b0e31d9ed2bfc7054395d381.tar.gz
vaadin-framework-adf1586875cdf2d2b0e31d9ed2bfc7054395d381.zip
Fix color picker button for IE8
The selected color hex value is no longer overlapping with the color square. But now when there’s no hex value as the button caption, there’s extra white space on the right edge of the button, which is unavoidable. This is a lesser evil. Change-Id: I9c7e36fdf22f63c9cad6972f0f2038513f841d6b
-rw-r--r--WebContent/VAADIN/themes/valo/components/_colorpicker.scss17
1 files changed, 17 insertions, 0 deletions
diff --git a/WebContent/VAADIN/themes/valo/components/_colorpicker.scss b/WebContent/VAADIN/themes/valo/components/_colorpicker.scss
index 4509c23f15..4460aafb21 100644
--- a/WebContent/VAADIN/themes/valo/components/_colorpicker.scss
+++ b/WebContent/VAADIN/themes/valo/components/_colorpicker.scss
@@ -203,6 +203,23 @@
+ .v-button-caption:not(:empty) {
margin-left: round($v-unit-size/2);
}
+
+ .v-ie8 & {
+ position: relative;
+ top: auto;
+ right: auto;
+ bottom: auto;
+ left: auto;
+ width: $v-font-size;
+ height: $v-font-size;
+ display: inline-block;
+ vertical-align: middle;
+ margin: 0 round($v-font-size / -2);
+
+ + .v-button-caption {
+ margin-left: round($v-unit-size/2);
+ }
+ }
}
}