Added override for font-sizes which used em in base theme (#10606, #10587)

Change-Id: I556137c307bdacdb22cbd2abb4461268997ff53d

diff --git a/WebContent/VAADIN/themes/chameleon/components/datefield/datefield.scss b/WebContent/VAADIN/themes/chameleon/components/datefield/datefield.scss
index e63e96417c431ae8a0af3984b673cb95c5fec3da..3d550c86902a3182f4431e2a355007993fbb57d2 100644 (file)
--- a/WebContent/VAADIN/themes/chameleon/components/datefield/datefield.scss
+++ b/WebContent/VAADIN/themes/chameleon/components/datefield/datefield.scss
@@ -237,6 +237,7 @@ td.#{$primaryStyleName}-calendarpanel-nextyear {
 
 .#{$primaryStyleName}-calendarpanel-weeknumber {
        padding: .5em .5em .35em 0;
+       font-size: 11.7px;
        }
 
 .#{$primaryStyleName}-calendarpanel-day,

diff --git a/WebContent/VAADIN/themes/chameleon/components/menubar/menubar.scss b/WebContent/VAADIN/themes/chameleon/components/menubar/menubar.scss
index b2cba85067e88590ec8ea474be7a050c0fec5191..0531d0c9b579d9323e927bbbd7cc2f18e421fb1f 100644 (file)
--- a/WebContent/VAADIN/themes/chameleon/components/menubar/menubar.scss
+++ b/WebContent/VAADIN/themes/chameleon/components/menubar/menubar.scss
@@ -18,6 +18,7 @@
 
 .#{$primaryStyleName}-submenu .#{$primaryStyleName}-submenu-indicator {
        margin-top: .1em;
+       font-size: 11.7px;
        }
 
 .#{$primaryStyleName}-submenu .#{$primaryStyleName}-menuitem-selected {

diff --git a/WebContent/VAADIN/themes/liferay/datefield/datefield.scss b/WebContent/VAADIN/themes/liferay/datefield/datefield.scss
index 608b4504b0c52abfb192ed715e68fd5278b38ec8..c9ef7180a57d32df4a4e42ad9eee2a531397844c 100644 (file)
--- a/WebContent/VAADIN/themes/liferay/datefield/datefield.scss
+++ b/WebContent/VAADIN/themes/liferay/datefield/datefield.scss
@@ -160,6 +160,7 @@ span.#{$primaryStyleName}-calendarpanel-month {
        border: none;
        padding: 2px 0 2px 0;
        margin: 0;
+       font-size: 9.9px;
 }
 
 .#{$primaryStyleName}-calendarpanel-body table {

diff --git a/WebContent/VAADIN/themes/liferay/menubar/menubar.scss b/WebContent/VAADIN/themes/liferay/menubar/menubar.scss
index 71891ff05970dab5da7f321b06cb6c277abbc1fb..448d7569c80cedcf4a1379483bc8db3b4fabb830 100644 (file)
--- a/WebContent/VAADIN/themes/liferay/menubar/menubar.scss
+++ b/WebContent/VAADIN/themes/liferay/menubar/menubar.scss
@@ -31,7 +31,9 @@
        border-radius: 0 0 4px 4px;
        padding: 2px 0;
 }
-
+.v-menubar-submenu .v-menubar-submenu-indicator {
+       font-size: 9.9px;
+}
 .v-menubar-submenu .v-menubar-menuitem {
        color: #2c2f34;
        font-weight: bold;

diff --git a/WebContent/VAADIN/themes/reindeer/datefield/datefield.scss b/WebContent/VAADIN/themes/reindeer/datefield/datefield.scss
index 83761ba1ff8cfb3585608efd554eff194e9346f5..20bc1fe4784d79f022919c2862a64a98f061c4d0 100644 (file)
--- a/WebContent/VAADIN/themes/reindeer/datefield/datefield.scss
+++ b/WebContent/VAADIN/themes/reindeer/datefield/datefield.scss
@@ -203,6 +203,7 @@ td.#{$primaryStyleName}-calendarpanel-nextyear {
        margin: 0;
        padding-top: 4px;
        padding-bottom: 3px;
+       font-size: 10.8px;
 }
 .#{$primaryStyleName}-calendarpanel-day-today {
        color: #4095d1;

diff --git a/WebContent/VAADIN/themes/reindeer/menubar/menubar.scss b/WebContent/VAADIN/themes/reindeer/menubar/menubar.scss
index 277fb1732dc5fd7b741c6c7b9790b33c8a5d692a..0b1672dab1d5d902ebd5800ec6eefdf4ac2a7b19 100644 (file)
--- a/WebContent/VAADIN/themes/reindeer/menubar/menubar.scss
+++ b/WebContent/VAADIN/themes/reindeer/menubar/menubar.scss
@@ -48,6 +48,7 @@
        width: 26px;
        height: 16px;
        text-indent: -9999px;
+       font-size: 10.8px;
 }
 .#{$primaryStyleName}-submenu .#{$primaryStyleName}-menuitem-selected .#{$primaryStyleName}-submenu-indicator {
        background-image: url(img/submenu-icon-hover.png);

diff --git a/WebContent/VAADIN/themes/runo/datefield/datefield.scss b/WebContent/VAADIN/themes/runo/datefield/datefield.scss
index f0078107507f25c2689865201fd9035d0d80126c..2f9fe19cc0dc09781a9fd487c5b3eb05f7e55139 100644 (file)
--- a/WebContent/VAADIN/themes/runo/datefield/datefield.scss
+++ b/WebContent/VAADIN/themes/runo/datefield/datefield.scss
@@ -106,6 +106,9 @@ td.#{$primaryStyleName}-calendarpanel-month {
        width: 14px;
        height: 16px;
 }
+.#{$primaryStyleName}-calendarpanel-weeknumber {
+       font-size: 11.7px;
+}
 .#{$primaryStyleName}-calendarpanel-day-today {
        border: 1px solid #429ce9;
        width: 12px;

diff --git a/WebContent/VAADIN/themes/runo/menubar/menubar.scss b/WebContent/VAADIN/themes/runo/menubar/menubar.scss
index 51efc6f28feb01100ad7eff3c01fb54416f4809d..d4cb22794bca27410619cc3e81889cfb1f3f0230 100644 (file)
--- a/WebContent/VAADIN/themes/runo/menubar/menubar.scss
+++ b/WebContent/VAADIN/themes/runo/menubar/menubar.scss
@@ -35,5 +35,7 @@
 .#{$primaryStyleName}-submenu .#{$primaryStyleName}-menuitem-caption .v-icon { 
        vertical-align: middle;
 }
-
+.#{$primaryStyleName}-submenu .#{$primaryStyleName}-submenu-indicator {
+       font-size: 11.7px;
+}
 }
\ No newline at end of file