diff --git a/.gitignore b/.gitignore
index 0414de0317..85fecee050 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
/venv
/node_modules/
npm-debug.log
+/*.egg/
diff --git a/docs/getting_started/installation.rst b/docs/getting_started/installation.rst
index 294f8310ca..74d07d7825 100644
--- a/docs/getting_started/installation.rst
+++ b/docs/getting_started/installation.rst
@@ -20,7 +20,6 @@ Wagtail is based on the Django web framework and various other Python libraries.
Most of Wagtail's dependencies are pure Python and will install automatically using ``pip``, but there are a few native-code components that require further attention:
- * libsass-python (for compiling SASS stylesheets) - requires a C++ compiler and the Python development headers.
* Pillow (for image processing) - additionally requires libjpeg and zlib.
On Debian or Ubuntu, these can be installed with the command::
diff --git a/docs/howto/settings.rst b/docs/howto/settings.rst
index f04c9d9c32..ae8791c706 100644
--- a/docs/howto/settings.rst
+++ b/docs/howto/settings.rst
@@ -450,11 +450,6 @@ These two files should reside in your project directory (``myproject/myproject/`
INTERNAL_IPS = ('127.0.0.1', '10.0.2.2')
- # django-compressor settings
- COMPRESS_PRECOMPILERS = (
- ('text/x-scss', 'django_libsass.SassCompiler'),
- )
-
# A sample logging configuration. The only tangible logging
# performed by this configuration is to send an email to
# the site admins on every HTTP 500 error when DEBUG=False.
diff --git a/gulpfile.js b/gulpfile.js
new file mode 100644
index 0000000000..8406102483
--- /dev/null
+++ b/gulpfile.js
@@ -0,0 +1,84 @@
+var gulp = require('gulp');
+var gutil = require('gulp-util');
+var rename = require('gulp-rename');
+var path = require('path');
+var join = path.join;
+
+
+gulp.task('default', ['watch']);
+gulp.task('build', ['styles']);
+
+var scssFiles = {
+ 'wagtail/wagtailadmin/static': [
+ 'wagtailadmin/scss/core.scss',
+ 'wagtailadmin/scss/layouts/login.scss',
+ 'wagtailadmin/scss/layouts/home.scss',
+ 'wagtailadmin/scss/layouts/page-editor.scss',
+ 'wagtailadmin/scss/layouts/preview.scss',
+ 'wagtailadmin/scss/panels/rich-text.scss',
+ 'wagtailadmin/scss/userbar.scss',
+ 'wagtailadmin/scss/normalize.scss',
+ 'wagtailadmin/scss/userbar_embed.scss',
+ ],
+ 'wagtail/wagtailimages/static': [
+ 'wagtailimages/scss/add-multiple.scss',
+ 'wagtailimages/scss/focal-point-chooser.scss',
+ ],
+ 'wagtail/wagtailusers/static': [
+ 'wagtailusers/scss/groups_edit.scss',
+ ],
+ 'wagtail/contrib/wagtailstyleguide/static': [
+ 'wagtailstyleguide/scss/styleguide.scss',
+ ],
+};
+
+
+/*
+ * Watch - Watch files, trigger tasks when they are modified
+ */
+gulp.task('watch', ['build'], function () {
+ for (var appPath in scssFiles) {
+ gulp.watch(join(appPath, '*/scss/**'), ['styles']);
+ }
+});
+
+
+/*
+ * SASS - Compile and move sass
+**/
+
+gulp.task('styles', function () {
+ var sass = require('gulp-sass');
+ var autoprefixer = require('gulp-autoprefixer');
+
+ // Wagtail Sass files include each other across applications,
+ // e.g. wagtailimages Sass files will include wagtailadmin/scss/mixins.scss
+ // Thus, each app is used as an includePath.
+ var includePaths = Object.keys(scssFiles);
+
+ // Not all files in a directory need to be compiled, so globs can not be used.
+ // Each file is named individually by joining its app path and file name.
+ var sources = Object.keys(scssFiles).reduce(function(allSources, appPath) {
+ var appSources = scssFiles[appPath];
+ return allSources.concat(appSources.map(function(appSource) {
+ return join(appPath, appSource);
+ }));
+ }, []);
+
+ return gulp.src(sources)
+ .pipe(sass({
+ errLogToConsole: true,
+ includePaths: includePaths,
+ outputStyle: 'expanded'
+ }))
+ .pipe(autoprefixer({
+ browsers: ['last 2 versions'],
+ cascade: false
+ }))
+ .pipe(gulp.dest(function(file) {
+ // e.g. wagtailadmin/scss/core.scss -> wagtailadmin/css/core.css
+ // Changing the suffix is done by Sass automatically
+ return file.base.replace('/scss/', '/css/');
+ }))
+ .on('error', gutil.log);
+});
diff --git a/package.json b/package.json
index f1324ca24e..ba55628109 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,6 @@
"browserify-shim": "~3.4.1",
"gulp": "~3.8.11",
"gulp-autoprefixer": "~1.0.1",
- "gulp-pixrem": "~0.1.1",
"gulp-rename": "^1.2.2",
"gulp-sass": "~1.0.0",
"gulp-sourcemaps": "~1.2.2",
diff --git a/setup.py b/setup.py
index a44d564e3b..9cbb651c4d 100644
--- a/setup.py
+++ b/setup.py
@@ -1,8 +1,12 @@
#!/usr/bin/env python
-import sys, os
+import sys
+import os
+
+from setuptools.command.sdist import sdist
from wagtail.wagtailcore import __version__
+from wagtail.utils.setup import assets, add_subcommand
try:
@@ -20,17 +24,12 @@ except ImportError:
pass
-# Disable parallel builds, because Pillow 2.5.3 does some crazy monkeypatching of
-# the build process on multicore systems, which breaks installation of libsass
-os.environ['MAX_CONCURRENCY'] = '1'
-
PY3 = sys.version_info[0] == 3
install_requires = [
"Django>=1.7.1,<1.9",
"django-compressor>=1.4",
- "django-libsass>=0.2",
"django-modelcluster>=0.6",
"django-taggit>=0.13.0",
"django-treebeard==3.0",
@@ -82,4 +81,8 @@ setup(
wagtail=wagtail.bin.wagtail:main
""",
zip_safe=False,
+ cmdclass={
+ 'sdist': add_subcommand(sdist, [('assets', None)]),
+ 'assets': assets,
+ },
)
diff --git a/tox.ini b/tox.ini
index d0d1078962..2c38da65b1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -18,8 +18,6 @@ basepython =
deps =
django-compressor>=1.4
- django-libsass>=0.2
- libsass==0.5.1
django-modelcluster>=0.6
django-taggit==0.13.0
django-treebeard==3.0
diff --git a/wagtail/contrib/wagtailstyleguide/static/wagtailstyleguide/css/.gitignore b/wagtail/contrib/wagtailstyleguide/static/wagtailstyleguide/css/.gitignore
new file mode 100644
index 0000000000..5d1f99fc29
--- /dev/null
+++ b/wagtail/contrib/wagtailstyleguide/static/wagtailstyleguide/css/.gitignore
@@ -0,0 +1 @@
+styleguide.css
diff --git a/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html b/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
index 27c93db48c..f4e8599874 100644
--- a/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
+++ b/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
@@ -3,7 +3,7 @@
{% block extra_css %}
{% compress css %}
-
+
{% endcompress %}
{% endblock %}
diff --git a/wagtail/project_template/core/templates/base.html b/wagtail/project_template/core/templates/base.html
index 843c3e5b4c..35d3612da0 100644
--- a/wagtail/project_template/core/templates/base.html
+++ b/wagtail/project_template/core/templates/base.html
@@ -14,7 +14,7 @@
{% templatetag openblock %} compress css {% templatetag closeblock %}
{# Global stylesheets #}
-
+
{% templatetag openblock %} endcompress {% templatetag closeblock %}
{% templatetag openblock %} block extra_css {% templatetag closeblock %}
diff --git a/wagtail/project_template/project_name/settings/base.py b/wagtail/project_template/project_name/settings/base.py
index 2af151e58a..52a4f266f3 100644
--- a/wagtail/project_template/project_name/settings/base.py
+++ b/wagtail/project_template/project_name/settings/base.py
@@ -129,14 +129,6 @@ MEDIA_ROOT = join(PROJECT_ROOT, 'media')
MEDIA_URL = '/media/'
-# Django compressor settings
-# http://django-compressor.readthedocs.org/en/latest/settings/
-
-COMPRESS_PRECOMPILERS = (
- ('text/x-scss', 'django_libsass.SassCompiler'),
-)
-
-
# Template configuration
from django.conf import global_settings
diff --git a/wagtail/utils/setup.py b/wagtail/utils/setup.py
new file mode 100644
index 0000000000..6503eb3b1b
--- /dev/null
+++ b/wagtail/utils/setup.py
@@ -0,0 +1,32 @@
+from __future__ import absolute_import, print_function, unicode_literals
+import subprocess
+
+from distutils.core import Command
+
+
+class assets(Command):
+
+ user_options = []
+
+ def initialize_options(self):
+ pass
+
+ def finalize_options(self):
+ pass
+
+ def run(self):
+ try:
+ subprocess.check_call(['npm', 'run', 'build'])
+ except (OSError, subprocess.CalledProcessError) as e:
+ print('Error compiling assets: ' + str(e))
+ raise SystemExit(1)
+
+
+def add_subcommand(command, extra_sub_commands):
+ # Sadly, as commands are old-style classes, `type()` can not be used to
+ # construct these. Additionally, old-style classes do not have a `name`
+ # attribute, so naming them nicely is also impossible.
+ class CompileAnd(command):
+ sub_commands = command.sub_commands + extra_sub_commands
+ CompileAnd.__name__ = command.__name__
+ return CompileAnd
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/.gitignore b/wagtail/wagtailadmin/static/wagtailadmin/css/.gitignore
new file mode 100644
index 0000000000..559f1bb2a0
--- /dev/null
+++ b/wagtail/wagtailadmin/static/wagtailadmin/css/.gitignore
@@ -0,0 +1,9 @@
+core.css
+layouts/home.css
+layouts/login.css
+layouts/page-editor.css
+layouts/preview.css
+normalize.css
+panels/rich-text.css
+userbar.css
+userbar_embed.css
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery-ui/images/animated-overlay.gif b/wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/animated-overlay.gif
similarity index 100%
rename from wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery-ui/images/animated-overlay.gif
rename to wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/animated-overlay.gif
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery-ui/images/ui-bg_flat_0_aaaaaa_40x100.png b/wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_0_aaaaaa_40x100.png
similarity index 100%
rename from wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery-ui/images/ui-bg_flat_0_aaaaaa_40x100.png
rename to wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery-ui/images/ui-bg_flat_100_246060_40x100.png b/wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_246060_40x100.png
similarity index 100%
rename from wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery-ui/images/ui-bg_flat_100_246060_40x100.png
rename to wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_246060_40x100.png
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery-ui/images/ui-bg_flat_100_49c0c1_40x100.png b/wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_49c0c1_40x100.png
similarity index 100%
rename from wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery-ui/images/ui-bg_flat_100_49c0c1_40x100.png
rename to wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_49c0c1_40x100.png
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery-ui/images/ui-bg_flat_100_e8f8f9_40x100.png b/wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_e8f8f9_40x100.png
similarity index 100%
rename from wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery-ui/images/ui-bg_flat_100_e8f8f9_40x100.png
rename to wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_e8f8f9_40x100.png
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery-ui/images/ui-bg_flat_100_f7474e_40x100.png b/wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_f7474e_40x100.png
similarity index 100%
rename from wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery-ui/images/ui-bg_flat_100_f7474e_40x100.png
rename to wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_f7474e_40x100.png
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery-ui/images/ui-bg_flat_100_ffffff_40x100.png b/wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_ffffff_40x100.png
similarity index 100%
rename from wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery-ui/images/ui-bg_flat_100_ffffff_40x100.png
rename to wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_ffffff_40x100.png
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery-ui/images/ui-bg_flat_65_49c0c1_40x100.png b/wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_65_49c0c1_40x100.png
similarity index 100%
rename from wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery-ui/images/ui-bg_flat_65_49c0c1_40x100.png
rename to wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_65_49c0c1_40x100.png
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery-ui/images/ui-icons_222222_256x240.png b/wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_222222_256x240.png
similarity index 100%
rename from wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery-ui/images/ui-icons_222222_256x240.png
rename to wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_222222_256x240.png
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery-ui/images/ui-icons_49c0c1_256x240.png b/wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_49c0c1_256x240.png
similarity index 100%
rename from wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery-ui/images/ui-icons_49c0c1_256x240.png
rename to wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_49c0c1_256x240.png
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery-ui/images/ui-icons_555555_256x240.png b/wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_555555_256x240.png
similarity index 100%
rename from wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery-ui/images/ui-icons_555555_256x240.png
rename to wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_555555_256x240.png
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery-ui/images/ui-icons_ffffff_256x240.png b/wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_ffffff_256x240.png
similarity index 100%
rename from wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery-ui/images/ui-icons_ffffff_256x240.png
rename to wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_ffffff_256x240.png
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery-ui/jquery-ui-1.10.3.verdant.css b/wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/jquery-ui-1.10.3.verdant.css
similarity index 100%
rename from wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery-ui/jquery-ui-1.10.3.verdant.css
rename to wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/jquery-ui-1.10.3.verdant.css
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery.tagit.css b/wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery.tagit.css
similarity index 100%
rename from wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/jquery.tagit.css
rename to wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery.tagit.css
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/tagit.ui-zendesk.css b/wagtail/wagtailadmin/static/wagtailadmin/css/vendor/tagit.ui-zendesk.css
similarity index 100%
rename from wagtail/wagtailadmin/static/wagtailadmin/scss/vendor/tagit.ui-zendesk.css
rename to wagtail/wagtailadmin/static/wagtailadmin/css/vendor/tagit.ui-zendesk.css
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/userbar_embed.js b/wagtail/wagtailadmin/static/wagtailadmin/js/userbar_embed.js
index eb2b00dac7..0bdaefea55 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/userbar_embed.js
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/userbar_embed.js
@@ -33,7 +33,7 @@
l = d.createElement('link');
l.rel = 'stylesheet';
- l.href = w.wagtail.static_root + 'scss/userbar_embed.css';
+ l.href = w.wagtail.static_root + 'css/userbar_embed.css';
f = d.createElement('iframe');
f.id = 'wagtail-userbar';
@@ -50,4 +50,4 @@
t = d.getElementsByTagName('title')[0];
t.parentNode.insertBefore(l, t.nextSibling);
d.body.appendChild(f);
-}(window, document));
+}(window,document));
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/normalize.css b/wagtail/wagtailadmin/static/wagtailadmin/scss/normalize.scss
similarity index 100%
rename from wagtail/wagtailadmin/static/wagtailadmin/scss/normalize.css
rename to wagtail/wagtailadmin/static/wagtailadmin/scss/normalize.scss
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/userbar_embed.css b/wagtail/wagtailadmin/static/wagtailadmin/scss/userbar_embed.scss
similarity index 100%
rename from wagtail/wagtailadmin/static/wagtailadmin/scss/userbar_embed.css
rename to wagtail/wagtailadmin/static/wagtailadmin/scss/userbar_embed.scss
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/complete.html b/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/complete.html
index 96ddad191e..23f096caa6 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/complete.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/complete.html
@@ -5,7 +5,7 @@
{% block extra_css %}
{% compress css %}
-
+
{% endcompress %}
{% endblock %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/confirm.html b/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/confirm.html
index 4261c900d4..54326736c1 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/confirm.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/confirm.html
@@ -5,7 +5,7 @@
{% block extra_css %}
{% compress css %}
-
+
{% endcompress %}
{% endblock %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/done.html b/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/done.html
index a36231d045..8a0d1e5b23 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/done.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/done.html
@@ -5,7 +5,7 @@
{% block extra_css %}
{% compress css %}
-
+
{% endcompress %}
{% endblock %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/form.html b/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/form.html
index 44682c8df7..26db15ea94 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/form.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/form.html
@@ -5,7 +5,7 @@
{% block extra_css %}
{% compress css %}
-
+
{% endcompress %}
{% endblock %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html b/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html
index d68adc7566..b72568314a 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html
@@ -3,8 +3,8 @@
{% block css %}
{% compress css %}
-
-
+
+
{% endcompress %}
{% block extra_css %}{% endblock %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/home.html b/wagtail/wagtailadmin/templates/wagtailadmin/home.html
index 0e856bb4a2..0a470a66c6 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/home.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/home.html
@@ -5,7 +5,7 @@
{% block extra_css %}
{% compress css %}
-
+
{% endcompress %}
{% endblock %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/login.html b/wagtail/wagtailadmin/templates/wagtailadmin/login.html
index 8d76c9b889..3364cf684d 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/login.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/login.html
@@ -5,7 +5,7 @@
{% block extra_css %}
{% compress css %}
-
+
{% endcompress %}
{% endblock %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_css.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_css.html
index 12a3df13cc..1d5881d608 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_css.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_css.html
@@ -5,12 +5,12 @@
{% endcomment %}
{% compress css %}
-
-
+
+
{# we'll want tag-it included, for the benefit of any modals that use it, like images. #}
{# TODO: a method of injecting these sorts of things on demand when the modal is spawned #}
-
+
{% hook_output 'insert_editor_css' %}
{% endcompress %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html
index be319c2f79..fa20dfd6b2 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html
@@ -4,7 +4,7 @@
{% trans "Preview" %}
{% compress css %}
-
+
{% endcompress %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/tag_field_css.html b/wagtail/wagtailadmin/templates/wagtailadmin/shared/tag_field_css.html
index e621cd190b..a147749ce1 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/shared/tag_field_css.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/shared/tag_field_css.html
@@ -1,4 +1,4 @@
{% load compress static %}
{% compress css %}
-
+
{% endcompress %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html b/wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html
index 7b53ed400f..459cbf9e2e 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html
@@ -11,7 +11,7 @@
{% compress css %}
-
+
{% endcompress %}
{% block css %}{% endblock %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/base.html b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/base.html
index 670f12f594..d8f90e3a1f 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/base.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/base.html
@@ -4,7 +4,7 @@
{% block titletag %}{% trans 'User bar' %}{% endblock %}
{% block css %}
{% compress css %}
-
+
{% endcompress %}
{% endblock %}
diff --git a/wagtail/wagtailimages/static/wagtailimages/css/.gitignore b/wagtail/wagtailimages/static/wagtailimages/css/.gitignore
new file mode 100644
index 0000000000..4f1174df98
--- /dev/null
+++ b/wagtail/wagtailimages/static/wagtailimages/css/.gitignore
@@ -0,0 +1,2 @@
+add-multiple.css
+focal-point-chooser.css
diff --git a/wagtail/wagtailimages/static/wagtailimages/scss/vendor/Jcrop.gif b/wagtail/wagtailimages/static/wagtailimages/css/vendor/Jcrop.gif
similarity index 100%
rename from wagtail/wagtailimages/static/wagtailimages/scss/vendor/Jcrop.gif
rename to wagtail/wagtailimages/static/wagtailimages/css/vendor/Jcrop.gif
diff --git a/wagtail/wagtailimages/static/wagtailimages/scss/vendor/jquery.Jcrop.min.css b/wagtail/wagtailimages/static/wagtailimages/css/vendor/jquery.Jcrop.min.css
similarity index 100%
rename from wagtail/wagtailimages/static/wagtailimages/scss/vendor/jquery.Jcrop.min.css
rename to wagtail/wagtailimages/static/wagtailimages/css/vendor/jquery.Jcrop.min.css
diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/edit.html b/wagtail/wagtailimages/templates/wagtailimages/images/edit.html
index 1bfc09280b..8762bb5556 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/images/edit.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/images/edit.html
@@ -6,9 +6,9 @@
{% include "wagtailadmin/shared/tag_field_css.html" %}
-
+
{% compress css %}
-
+
{% endcompress %}
{% endblock %}
diff --git a/wagtail/wagtailimages/templates/wagtailimages/multiple/add.html b/wagtail/wagtailimages/templates/wagtailimages/multiple/add.html
index b6d5115d2a..c235718fa0 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/multiple/add.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/multiple/add.html
@@ -4,7 +4,7 @@
{% block bodyclass %}menu-images{% endblock %}
{% block extra_css %}
{% compress css %}
-
+
{% endcompress %}
{% include "wagtailadmin/shared/tag_field_css.html" %}
{% endblock %}
diff --git a/wagtail/wagtailusers/static/wagtailusers/css/.gitignore b/wagtail/wagtailusers/static/wagtailusers/css/.gitignore
new file mode 100644
index 0000000000..6847d9b206
--- /dev/null
+++ b/wagtail/wagtailusers/static/wagtailusers/css/.gitignore
@@ -0,0 +1 @@
+groups_edit.css
diff --git a/wagtail/wagtailusers/templates/wagtailusers/groups/create.html b/wagtail/wagtailusers/templates/wagtailusers/groups/create.html
index a1b6909406..1ab92dba0a 100644
--- a/wagtail/wagtailusers/templates/wagtailusers/groups/create.html
+++ b/wagtail/wagtailusers/templates/wagtailusers/groups/create.html
@@ -6,7 +6,7 @@
{% block extra_css %}
{% compress css %}
-
+
{% endcompress %}
{% endblock %}
diff --git a/wagtail/wagtailusers/templates/wagtailusers/groups/edit.html b/wagtail/wagtailusers/templates/wagtailusers/groups/edit.html
index 92c3e5a500..fc1f357d41 100644
--- a/wagtail/wagtailusers/templates/wagtailusers/groups/edit.html
+++ b/wagtail/wagtailusers/templates/wagtailusers/groups/edit.html
@@ -6,7 +6,7 @@
{% block extra_css %}
{% compress css %}
-
+
{% endcompress %}
{% endblock %}