summaryrefslogtreecommitdiffstats
path: root/WebContent/VAADIN/themes/base/label
diff options
context:
space:
mode:
authorJouni Koivuviita <jouni@vaadin.com>2012-08-13 08:54:54 +0300
committerJouni Koivuviita <jouni@vaadin.com>2012-08-13 08:54:54 +0300
commit6031735017cd2fad28cdf64f4246e6d9914cc3ad (patch)
tree7ce54cd9b21fd29b425e90833384e1f66f52aa0c /WebContent/VAADIN/themes/base/label
parent559775efaf0a8f0f9f1ad6246084667732b15a0f (diff)
parent1fd77ff0d5fc6dee010b5c83acfd5b87b6801264 (diff)
downloadvaadin-framework-6031735017cd2fad28cdf64f4246e6d9914cc3ad.tar.gz
vaadin-framework-6031735017cd2fad28cdf64f4246e6d9914cc3ad.zip
merge master (sass theme changes)
Diffstat (limited to 'WebContent/VAADIN/themes/base/label')
-rw-r--r--WebContent/VAADIN/themes/base/label/label.scss (renamed from WebContent/VAADIN/themes/base/label/label.css)4
1 files changed, 4 insertions, 0 deletions
diff --git a/WebContent/VAADIN/themes/base/label/label.css b/WebContent/VAADIN/themes/base/label/label.scss
index 953584ffd7..ae1539acc9 100644
--- a/WebContent/VAADIN/themes/base/label/label.css
+++ b/WebContent/VAADIN/themes/base/label/label.scss
@@ -1,7 +1,11 @@
+@mixin base-label {
+
.v-label {
overflow: hidden;
}
.v-label.v-has-width {
white-space: normal;
+}
+
} \ No newline at end of file