diff options
| author | Artur Signell <artur@vaadin.com> | 2013-11-11 16:33:27 +0200 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2013-11-11 16:33:27 +0200 |
| commit | dd7e6fee8c4717df59699f04f7e72a6f2e92008f (patch) | |
| tree | 1d1e4e074b006d53977b6e8a77c9926b30b504db /WebContent/VAADIN/themes/base | |
| parent | f51b8911ad7d9ee8f651cf037e30a09e09a5e530 (diff) | |
| parent | c308d8a949095ec49a6933d2d4424d078fb4e210 (diff) | |
| download | vaadin-framework-dd7e6fee8c4717df59699f04f7e72a6f2e92008f.tar.gz vaadin-framework-dd7e6fee8c4717df59699f04f7e72a6f2e92008f.zip | |
Merge changes from origin/7.1
30e9b7c Add a test for @mixin { @font-face {...} } (#11649)
0a2cf2c Prevent showing "Session Expired" notification if navigating away (#12298)
8efc385 Fixes NPE in TreeTable.setContainerDS(null) (#12928)
23815e6 Remove broken JSch check
c308d8a Fixes double scrollbar issue in browserframes (#11780) Fixed by adding font-size 0 to the base theme.
Change-Id: I64ae167e8e6b61205718998b80d534fb2cf0cb3d
Diffstat (limited to 'WebContent/VAADIN/themes/base')
| -rw-r--r-- | WebContent/VAADIN/themes/base/base.scss | 2 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/base/browserframe/browserframe.scss | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/WebContent/VAADIN/themes/base/base.scss b/WebContent/VAADIN/themes/base/base.scss index f22af7670e..c6760e1907 100644 --- a/WebContent/VAADIN/themes/base/base.scss +++ b/WebContent/VAADIN/themes/base/base.scss @@ -39,6 +39,7 @@ @import "widget/widget.scss"; @import "window/window.scss"; @import "debug/debug.scss"; +@import "browserframe/browserframe.scss"; .v-vaadin-version:after { content: "@version@"; @@ -64,6 +65,7 @@ $line-height: normal; @include base-absolutelayout; @include base-accordion; + @include base-browserframe; @include base-button; @include base-nativebutton; @include base-checkbox; diff --git a/WebContent/VAADIN/themes/base/browserframe/browserframe.scss b/WebContent/VAADIN/themes/base/browserframe/browserframe.scss new file mode 100644 index 0000000000..aa4225cf00 --- /dev/null +++ b/WebContent/VAADIN/themes/base/browserframe/browserframe.scss @@ -0,0 +1,7 @@ +@mixin base-browserframe { + + /* Removes duplicate scrollbars in some cases */ + .v-browserframe { + font-size: 0; + } +}
\ No newline at end of file |