diff options
| author | Build Agent <build@vaadin.com> | 2014-03-10 08:27:54 +0200 |
|---|---|---|
| committer | Build Agent <build@vaadin.com> | 2014-03-10 08:27:54 +0200 |
| commit | d05c628d6162dbaff32e5f779fac5b36171c6028 (patch) | |
| tree | 6f32b0ce2e4d47e91c97532d79931466ba763564 /WebContent | |
| parent | 876672ed5781ab8e6778faf43e5b0de331fa54f6 (diff) | |
| parent | 1e22aaf4df18413e537731f6b2bac249022cb72e (diff) | |
| download | vaadin-framework-d05c628d6162dbaff32e5f779fac5b36171c6028.tar.gz vaadin-framework-d05c628d6162dbaff32e5f779fac5b36171c6028.zip | |
Merge changes from origin/7.1
dd5698f Revert "Fix displaced TabSheet caption icon in Chrome"
2d8ec53 Fix TabSheet caption icon alignment on Chrome and Safari (#13077)
1e22aaf Added nojavadoc parameter, test-server, test-tb2, test-tb3 targets.
Change-Id: Ibc8421d3e3c037c01f31e168ce79baf20ef61684
Diffstat (limited to 'WebContent')
| -rw-r--r-- | WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.scss | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.scss b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.scss index e6b1a669c6..a2091130a1 100644 --- a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.scss +++ b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.scss @@ -143,8 +143,13 @@ } .v-sa & .#{$primaryStyleName}-tabs .v-captiontext { display: inline-block; - vertical-align: middle; } + +/* Align TabSheet icons differently on Chromes and Safaris #13077 */ +.v-sa & .#{$primaryStyleName}-tabs .v-icon { + vertical-align: top; +} + .#{$primaryStyleName}-tabs .v-icon { width: 16px !important; height: 16px !important; @@ -160,4 +165,4 @@ display: inline-block; } -}
\ No newline at end of file +} |