diff options
author | Johannes Dahlström <johannesd@vaadin.com> | 2013-11-29 11:34:00 +0200 |
---|---|---|
committer | Johannes Dahlström <johannesd@vaadin.com> | 2013-11-29 11:34:01 +0200 |
commit | de1c343ea9079f74276484c7d5f1623b5391eaba (patch) | |
tree | 4088497665be64b9b907ddeb4e30de7e807757c2 /WebContent | |
parent | dd7e6fee8c4717df59699f04f7e72a6f2e92008f (diff) | |
parent | 012e649775e7efbcbbdd9d1c3ef4edd9c9acb71a (diff) | |
download | vaadin-framework-de1c343ea9079f74276484c7d5f1623b5391eaba.tar.gz vaadin-framework-de1c343ea9079f74276484c7d5f1623b5391eaba.zip |
Merge changes from origin/7.1
84521fa Use correct type for UIDL value to avoid development mode problems (#12545)
3680505 Ensure generated parser is re-generated during build (#12937)
f3fa6af Regenerated parser files (#12937)
011a2a0 Do not generate ParseException as it has been customized (#12937)
9be3b40 Workaround for missing value change event in chrome (#10109)
48034f6 Ensure alternate text is still visible (#11780)
cbc9949 Added test case for #12726
07b1a9d Prevents accidental selection of window caption or content. (#12726)
e05e10e Added extra asserts to make test more safer to blind refactorings
33e5897 Use localhost when running locally to avoid potential network issues
642818f Allow using @RunLocally to run on a local Firefox/Chrome/Safari
81a1c29 Revert "Fixed lost scrollLeft when row count changed in Table (#12652)."
dde6a48 Output test results in XML reports instead of to standard output
012e649 Fix TB3 local testing and occasionally failing SliderDisableTest.
Change-Id: I4f4e44e887e7e90dd04e6d7381280a997e9527cc
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 |