diff options
author | Artur Signell <artur@vaadin.com> | 2013-01-02 15:17:06 +0200 |
---|---|---|
committer | Artur Signell <artur@vaadin.com> | 2013-01-02 15:20:29 +0200 |
commit | eb9238a0a9984e05d1378978c4f89533436e96a8 (patch) | |
tree | 81bedf7715ebb73293c16c5a2e87421a536226e6 /WebContent/VAADIN/themes/runo | |
parent | cc26765c48ca63542389ae5f6045017876f26620 (diff) | |
download | vaadin-framework-eb9238a0a9984e05d1378978c4f89533436e96a8.tar.gz vaadin-framework-eb9238a0a9984e05d1378978c4f89533436e96a8.zip |
Fixed font-size issues in Chameleon, Runo and Liferay (#10606, #10587)
Change-Id: Iaaa626553030af44eaab57067acf9f022dc75e6b
Diffstat (limited to 'WebContent/VAADIN/themes/runo')
-rw-r--r-- | WebContent/VAADIN/themes/runo/common/common.scss | 6 | ||||
-rw-r--r-- | WebContent/VAADIN/themes/runo/label/label.scss | 2 | ||||
-rw-r--r-- | WebContent/VAADIN/themes/runo/notification/notification.scss | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/WebContent/VAADIN/themes/runo/common/common.scss b/WebContent/VAADIN/themes/runo/common/common.scss index 9d4b4a4858..36447d9593 100644 --- a/WebContent/VAADIN/themes/runo/common/common.scss +++ b/WebContent/VAADIN/themes/runo/common/common.scss @@ -4,8 +4,8 @@ background: #e9eced url(img/main-bg.png) repeat-x; font-family: "Trebuchet MS", "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", geneva, helvetica, arial, tahoma, verdana, sans-serif; color: #464f52; - font-size: 13px; - line-height: 18px; + font-size: $font-size; + line-height: $line-height; } /* Global font styles */ &.v-app, @@ -32,7 +32,7 @@ .v-drag-element { font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif; color: #464f52; - font-size: 13px; + font-size: $font-size; } &.v-app select, .v-window select { diff --git a/WebContent/VAADIN/themes/runo/label/label.scss b/WebContent/VAADIN/themes/runo/label/label.scss index 926f1d2cc3..50792d61a1 100644 --- a/WebContent/VAADIN/themes/runo/label/label.scss +++ b/WebContent/VAADIN/themes/runo/label/label.scss @@ -47,7 +47,7 @@ } .#{$primaryStyleName}-small { - font-size: .87em; + font-size: 11.31px; line-height: 1.4; color: #707679; } diff --git a/WebContent/VAADIN/themes/runo/notification/notification.scss b/WebContent/VAADIN/themes/runo/notification/notification.scss index af0a2edc32..b8ffecf243 100644 --- a/WebContent/VAADIN/themes/runo/notification/notification.scss +++ b/WebContent/VAADIN/themes/runo/notification/notification.scss @@ -10,7 +10,7 @@ -webkit-border-radius: 3px; border-radius: 3px; overflow: hidden; - font-size: 1.2em; + font-size: 15.6px; -webkit-box-shadow: 0 3px 10px rgba(0,0,0,.3); -moz-box-shadow: 0 3px 10px rgba(0,0,0,.3); margin: 10px; @@ -46,7 +46,7 @@ .#{$primaryStyleName}-tray h1 { display: block; font-weight: bold; - font-size: 0.9em; + font-size: 11.7px; line-height: 1; background: #3b4245; padding: 2px 10px; @@ -57,14 +57,14 @@ } .#{$primaryStyleName}-tray p { display: block; - font-size: 0.8em; + font-size: 10.4px; line-height: 1.2; margin: 4px 10px 5px 10px; color: #e4e7ea; } .#{$primaryStyleName}-system { background-color: #ff0a0a; - font-size: .9em; + font-size: 11.7px; padding: 14px 32px; } |