diff options
| author | Leif Åstrand <leif@vaadin.com> | 2013-01-04 07:49:16 +0000 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2013-01-04 07:49:16 +0000 |
| commit | 26ef9666577a625aa91669136b47c1c1c9787ce0 (patch) | |
| tree | 31c1f01b30fa3a5f839d37422443ea17a87df648 /WebContent | |
| parent | 95d0495225c395e16081578c0d45e675aa2b751e (diff) | |
| parent | 85207146612bf6bb181330288453a6c9aacc18dc (diff) | |
| download | vaadin-framework-26ef9666577a625aa91669136b47c1c1c9787ce0.tar.gz vaadin-framework-26ef9666577a625aa91669136b47c1c1c9787ce0.zip | |
Merge "Added override for font-sizes which used em in base theme (#10606, #10587)"
Diffstat (limited to 'WebContent')
8 files changed, 14 insertions, 2 deletions
diff --git a/WebContent/VAADIN/themes/chameleon/components/datefield/datefield.scss b/WebContent/VAADIN/themes/chameleon/components/datefield/datefield.scss index e63e96417c..3d550c8690 100644 --- 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 b2cba85067..0531d0c9b5 100644 --- 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 608b4504b0..c9ef7180a5 100644 --- 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 71891ff059..448d7569c8 100644 --- 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 83761ba1ff..20bc1fe478 100644 --- 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 277fb1732d..0b1672dab1 100644 --- 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 f007810750..2f9fe19cc0 100644 --- 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 51efc6f28f..d4cb22794b 100644 --- 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 |