Fixed diff with upstream
This commit is contained in:
@@ -1,15 +1,6 @@
|
||||
CHANGELOG
|
||||
---------
|
||||
|
||||
1.0.2 - 2014-08-04
|
||||
==================
|
||||
|
||||
* Fix import conflicts with directory and scss stylesheet of the same name. [Radomir Dopieralski]
|
||||
|
||||
1.0.1 - 2014-06-04
|
||||
==================
|
||||
|
||||
* Fix compatibility with django-compressor. [Gavin Wahl]
|
||||
|
||||
2.0.2 (2015-04-29)
|
||||
==================
|
||||
|
||||
@@ -56,10 +56,6 @@ class ImportTestMixin(CompilerTestMixin):
|
||||
actual = self.compiler.compile_string('@import "/css_prefix/baz.scss";')
|
||||
self.assertEqual(clean_css(actual), clean_css(FOO_CONTENTS))
|
||||
|
||||
def test_import_from_staticfiles_dirs_prefixed(self):
|
||||
actual = self.compiler.compile(scss_string='@import "/css_prefix/baz.scss";')
|
||||
self.assertEqual(clean_css(actual), clean_css(FOO_CONTENTS))
|
||||
|
||||
def test_import_from_staticfiles_dirs_relative(self):
|
||||
actual = self.compiler.compile_string('@import "css/foo.scss";')
|
||||
self.assertEqual(clean_css(actual), clean_css(FOO_CONTENTS))
|
||||
|
||||
Reference in New Issue
Block a user