diff options
author | Henrik Paul <henrik@vaadin.com> | 2013-12-04 15:36:52 +0200 |
---|---|---|
committer | Henrik Paul <henrik@vaadin.com> | 2013-12-04 15:37:32 +0200 |
commit | c99e575653b78a324737d489709f3c68fbfba2d4 (patch) | |
tree | 086f2f42388e1767093d09e1002ea5ee157cd3c2 /WebContent | |
parent | 428c5801da9f2d9248ad35c385b329a2f80c33b9 (diff) | |
parent | 8d6256e98a63222f4b4969612d8d777a31974613 (diff) | |
download | vaadin-framework-c99e575653b78a324737d489709f3c68fbfba2d4.tar.gz vaadin-framework-c99e575653b78a324737d489709f3c68fbfba2d4.zip |
Merge branch 'master' into grid-merge
Change-Id: I2502ed31f81326b2e32a03ad34c289a5bf7bd2b5
Diffstat (limited to 'WebContent')
-rw-r--r-- | WebContent/VAADIN/themes/base/browserframe/browserframe.scss | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/WebContent/VAADIN/themes/base/browserframe/browserframe.scss b/WebContent/VAADIN/themes/base/browserframe/browserframe.scss index aa4225cf00..149e38a744 100644 --- a/WebContent/VAADIN/themes/base/browserframe/browserframe.scss +++ b/WebContent/VAADIN/themes/base/browserframe/browserframe.scss @@ -4,4 +4,8 @@ .v-browserframe { font-size: 0; } + /* Some times a browser frame can contain a span with altenate text */ + .v-browserframe > span { + font-size: $font-size; + } }
\ No newline at end of file |