summaryrefslogtreecommitdiffstats
path: root/WebContent/VAADIN/themes/liferay
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2013-01-08 08:52:48 +0000
committerVaadin Code Review <review@vaadin.com>2013-01-08 08:52:48 +0000
commit7e68ddca0a90eda227d0f15831a15a016c0d7675 (patch)
treefe55311f06c5aaa5efed38ddf0b278b9e341b956 /WebContent/VAADIN/themes/liferay
parent81a16d4a746dc128073200b52f30851a259281bc (diff)
parente14cfb6d8a3f0a86f8392e831e3dd6a1e385d859 (diff)
downloadvaadin-framework-7e68ddca0a90eda227d0f15831a15a016c0d7675.tar.gz
vaadin-framework-7e68ddca0a90eda227d0f15831a15a016c0d7675.zip
Merge "Ensure correct font-size is used for nativebutton in Liferay (#10587)"
Diffstat (limited to 'WebContent/VAADIN/themes/liferay')
-rw-r--r--WebContent/VAADIN/themes/liferay/button/button.scss4
1 files changed, 3 insertions, 1 deletions
diff --git a/WebContent/VAADIN/themes/liferay/button/button.scss b/WebContent/VAADIN/themes/liferay/button/button.scss
index c604f26af9..85c1eb4094 100644
--- a/WebContent/VAADIN/themes/liferay/button/button.scss
+++ b/WebContent/VAADIN/themes/liferay/button/button.scss
@@ -24,7 +24,9 @@
overflow: hidden;
}
-
+.v-nativebutton {
+ font-size: $font-size;
+}
.v-button .v-button-wrap,
.v-disabled.v-button .v-button-wrap {
display: block;