diff options
author | Build Agent <build@vaadin.com> | 2014-03-05 16:43:08 +0200 |
---|---|---|
committer | Build Agent <build@vaadin.com> | 2014-03-05 16:43:08 +0200 |
commit | f18a47438f6b2e8de0a94852d6ae0e63b3d2d8fb (patch) | |
tree | e2ca0f1bfe6713993f08784fced64f3b4d9f9032 /WebContent/VAADIN | |
parent | b80f345a616eae1e9662016792d58f99c7188f6f (diff) | |
parent | 024692835d1e2af1a4053821959f03f8d5eb4fcb (diff) | |
download | vaadin-framework-f18a47438f6b2e8de0a94852d6ae0e63b3d2d8fb.tar.gz vaadin-framework-f18a47438f6b2e8de0a94852d6ae0e63b3d2d8fb.zip |
Merge changes from origin/7.1
372b64b Add javadoc for @DelegateToWidget (#10980)
db79438 Refactored TB3 test ip address whitelisting.
bc80f83 Refactored VerifyJreVersion test to TB3.
4667566 Fix displaced TabSheet caption icon in Chrome
0246928 Fixes a memory leak on IE8 in LayoutManagerIE8 (#12688)
Change-Id: I697900c560266cdb422ae536fe32c267e29adba8
Diffstat (limited to 'WebContent/VAADIN')
-rw-r--r-- | WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.scss | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.scss b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.scss index b62791e4ce..e6b1a669c6 100644 --- a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.scss +++ b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.scss @@ -143,6 +143,7 @@ } .v-sa & .#{$primaryStyleName}-tabs .v-captiontext { display: inline-block; + vertical-align: middle; } .#{$primaryStyleName}-tabs .v-icon { width: 16px !important; |