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 /theme-compiler | |
| 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 'theme-compiler')
| -rw-r--r-- | theme-compiler/tests/resources/automatic/css/fontface-in-mixin_new.css | 9 | ||||
| -rw-r--r-- | theme-compiler/tests/resources/automatic/scss/fontface-in-mixin_new.scss | 17 |
2 files changed, 26 insertions, 0 deletions
diff --git a/theme-compiler/tests/resources/automatic/css/fontface-in-mixin_new.css b/theme-compiler/tests/resources/automatic/css/fontface-in-mixin_new.css new file mode 100644 index 0000000000..cb842a647d --- /dev/null +++ b/theme-compiler/tests/resources/automatic/css/fontface-in-mixin_new.css @@ -0,0 +1,9 @@ +p { + @font-face { + font-family: "vdebugfont"; + src: url('fonts/font.eot'); + src: url('fonts/font.eot?#iefix') format("embedded-opentype"), url('fonts/font.woff') format("woff"), url('fonts/font.ttf') format("truetype"), url('fonts/font.svg#fontawesome') format("svg"); + font-weight: normal; + font-style: normal; +} +} diff --git a/theme-compiler/tests/resources/automatic/scss/fontface-in-mixin_new.scss b/theme-compiler/tests/resources/automatic/scss/fontface-in-mixin_new.scss new file mode 100644 index 0000000000..22356f724e --- /dev/null +++ b/theme-compiler/tests/resources/automatic/scss/fontface-in-mixin_new.scss @@ -0,0 +1,17 @@ +@mixin debug-globals { + @font-face { + font-family: 'vdebugfont'; + src:url('fonts/font.eot'); + src:url('fonts/font.eot?#iefix') format('embedded-opentype'), + url('fonts/font.woff') format('woff'), + url('fonts/font.ttf') format('truetype'), + url('fonts/font.svg#fontawesome') format('svg'); + font-weight: normal; + font-style: normal; + } + +} + +p { + @include debug-globals; +} |