diff options
| author | Leif Åstrand <leif@vaadin.com> | 2013-10-22 09:12:59 +0300 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2013-10-22 09:12:59 +0300 |
| commit | d70961ff2539aabe99eea22683a8ae77efdc81e5 (patch) | |
| tree | c3876e2266ace7e90d8dc82e35f22631e2ce29e5 /theme-compiler/tests/resources/automatic/scss/nested-import.scss | |
| parent | a48370a761a6d0b6c54196da0defdb30b47a5bb1 (diff) | |
| parent | ee809e5985d7a438e031c40bed160ac78ae8d0bc (diff) | |
| download | vaadin-framework-d70961ff2539aabe99eea22683a8ae77efdc81e5.tar.gz vaadin-framework-d70961ff2539aabe99eea22683a8ae77efdc81e5.zip | |
Merge changes from origin/7.1
c7ae45c Validate that the connector is enabled before triggering actions for it (#12743)
ce89a75 Created constants for tested browser versions (#12786)
f9ea9b3 Allow running tests locally by overriding runLocally() (#12786)
e70ba25 Added liferay module for building liferay.zip #12748
7c12694 Add sub directory support to sass test scanner (#12790)
39fdf66 Handle numbers in the same way if they do not have a unit (#12732)
6155d61 Disable fallback in a way compatible with Atmosphere JS 2.0.3 (#12241)
f401595 Test for pushing large chunks of data (#12567)
d41967d Skip compilation of TB2 tests if tests.tb2.skip is set
6c1ba81 Reverted button click() logic check (#12743)
779c8a0 Disable automated testing on Opera until issues are resolved (#12487, #12367, #12800)
962c1c3 Fix compilation error
7ee11a7 Remove unused test super class (#12786)
a4211dc Resolve concurrency issue in running TB3 tests
20c28aa Fixed javadoc
0d36896 Add more hax to make test work with new Atmosphere JS (#12241)
ed50200 Fix serialization issue (#12703)
dd51b7f Added more exception handling to PushHandler (#12578, #11882)
6f76840 Sass variables can now start with underscore (#12716)
ab5b20c Ticket #12727 - Panels get unnecessary scroll bars in WebKit when content is 100% wide.
361ad17 Fixed focus issue in TableMoveFocusWithSelectionTest (#12540)
ee809e5 Revert broken fix and test (#12446)
Change-Id: I71b6e3c2dc6b02845794df0934ba807d7ccac784
Diffstat (limited to 'theme-compiler/tests/resources/automatic/scss/nested-import.scss')
| -rw-r--r-- | theme-compiler/tests/resources/automatic/scss/nested-import.scss | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/theme-compiler/tests/resources/automatic/scss/nested-import.scss b/theme-compiler/tests/resources/automatic/scss/nested-import.scss index 605d64a13a..df720a5584 100644 --- a/theme-compiler/tests/resources/automatic/scss/nested-import.scss +++ b/theme-compiler/tests/resources/automatic/scss/nested-import.scss @@ -1,3 +1,3 @@ .foo { - @import "foo/bar.scss"; + @import "foo/_bar.scss"; }
\ No newline at end of file |