From ddebafa1199134606012f57246780bc5d1608337 Mon Sep 17 00:00:00 2001 From: Tim Heap Date: Thu, 23 Apr 2015 11:11:49 +1000 Subject: [PATCH 1/7] Remove libsass dependency, precompile CSS for distribution Depending on libsass for all Wagtail installations was causing issues with various operating systems, dramatically increasing installation times, and preventing front end development adopting modern practices. libsass has been removed as a dependency. Sass files are compiled before release as a dependency of the `sdist` setup command. Sass compilation is done through `gulp`. People wishing to hack on the frontend assets should now install wagtail locally, install the node dependencies, and run `gulp`: $ pip install -e path/to/wagtail $ cd path/to/wagtail $ npm install $ npm start All the templates and JS files have been updated to reference the new compiled CSS files instead of the Sass files. Precompiled CSS for jquery-ui and similar have been moved out of the `scss/` directory to the `css/` directory. --- .gitignore | 1 + docs/getting_started/installation.rst | 1 - docs/howto/settings.rst | 5 -- gulpfile.js | 84 ++++++++++++++++++ package.json | 1 - setup.py | 15 ++-- tox.ini | 2 - .../static/wagtailstyleguide/css/.gitignore | 1 + .../templates/wagtailstyleguide/base.html | 2 +- .../project_template/core/templates/base.html | 2 +- .../project_name/settings/base.py | 8 -- wagtail/utils/setup.py | 32 +++++++ .../static/wagtailadmin/css/.gitignore | 9 ++ .../jquery-ui/images/animated-overlay.gif | Bin .../images/ui-bg_flat_0_aaaaaa_40x100.png | Bin .../images/ui-bg_flat_100_246060_40x100.png | Bin .../images/ui-bg_flat_100_49c0c1_40x100.png | Bin .../images/ui-bg_flat_100_e8f8f9_40x100.png | Bin .../images/ui-bg_flat_100_f7474e_40x100.png | Bin .../images/ui-bg_flat_100_ffffff_40x100.png | Bin .../images/ui-bg_flat_65_49c0c1_40x100.png | Bin .../images/ui-icons_222222_256x240.png | Bin .../images/ui-icons_49c0c1_256x240.png | Bin .../images/ui-icons_555555_256x240.png | Bin .../images/ui-icons_ffffff_256x240.png | Bin .../jquery-ui/jquery-ui-1.10.3.verdant.css | 0 .../{scss => css}/vendor/jquery.tagit.css | 0 .../{scss => css}/vendor/tagit.ui-zendesk.css | 0 .../static/wagtailadmin/js/userbar_embed.js | 4 +- .../scss/{normalize.css => normalize.scss} | 0 .../{userbar_embed.css => userbar_embed.scss} | 0 .../account/password_reset/complete.html | 2 +- .../account/password_reset/confirm.html | 2 +- .../account/password_reset/done.html | 2 +- .../account/password_reset/form.html | 2 +- .../templates/wagtailadmin/admin_base.html | 4 +- .../templates/wagtailadmin/home.html | 2 +- .../templates/wagtailadmin/login.html | 2 +- .../wagtailadmin/pages/_editor_css.html | 6 +- .../templates/wagtailadmin/pages/preview.html | 2 +- .../wagtailadmin/shared/tag_field_css.html | 2 +- .../templates/wagtailadmin/skeleton.html | 2 +- .../templates/wagtailadmin/userbar/base.html | 2 +- .../static/wagtailimages/css/.gitignore | 2 + .../{scss => css}/vendor/Jcrop.gif | Bin .../{scss => css}/vendor/jquery.Jcrop.min.css | 0 .../templates/wagtailimages/images/edit.html | 4 +- .../templates/wagtailimages/multiple/add.html | 2 +- .../static/wagtailusers/css/.gitignore | 1 + .../templates/wagtailusers/groups/create.html | 2 +- .../templates/wagtailusers/groups/edit.html | 2 +- 51 files changed, 163 insertions(+), 47 deletions(-) create mode 100644 gulpfile.js create mode 100644 wagtail/contrib/wagtailstyleguide/static/wagtailstyleguide/css/.gitignore create mode 100644 wagtail/utils/setup.py create mode 100644 wagtail/wagtailadmin/static/wagtailadmin/css/.gitignore rename wagtail/wagtailadmin/static/wagtailadmin/{scss => css}/vendor/jquery-ui/images/animated-overlay.gif (100%) rename wagtail/wagtailadmin/static/wagtailadmin/{scss => css}/vendor/jquery-ui/images/ui-bg_flat_0_aaaaaa_40x100.png (100%) rename wagtail/wagtailadmin/static/wagtailadmin/{scss => css}/vendor/jquery-ui/images/ui-bg_flat_100_246060_40x100.png (100%) rename wagtail/wagtailadmin/static/wagtailadmin/{scss => css}/vendor/jquery-ui/images/ui-bg_flat_100_49c0c1_40x100.png (100%) rename wagtail/wagtailadmin/static/wagtailadmin/{scss => css}/vendor/jquery-ui/images/ui-bg_flat_100_e8f8f9_40x100.png (100%) rename wagtail/wagtailadmin/static/wagtailadmin/{scss => css}/vendor/jquery-ui/images/ui-bg_flat_100_f7474e_40x100.png (100%) rename wagtail/wagtailadmin/static/wagtailadmin/{scss => css}/vendor/jquery-ui/images/ui-bg_flat_100_ffffff_40x100.png (100%) rename wagtail/wagtailadmin/static/wagtailadmin/{scss => css}/vendor/jquery-ui/images/ui-bg_flat_65_49c0c1_40x100.png (100%) rename wagtail/wagtailadmin/static/wagtailadmin/{scss => css}/vendor/jquery-ui/images/ui-icons_222222_256x240.png (100%) rename wagtail/wagtailadmin/static/wagtailadmin/{scss => css}/vendor/jquery-ui/images/ui-icons_49c0c1_256x240.png (100%) rename wagtail/wagtailadmin/static/wagtailadmin/{scss => css}/vendor/jquery-ui/images/ui-icons_555555_256x240.png (100%) rename wagtail/wagtailadmin/static/wagtailadmin/{scss => css}/vendor/jquery-ui/images/ui-icons_ffffff_256x240.png (100%) rename wagtail/wagtailadmin/static/wagtailadmin/{scss => css}/vendor/jquery-ui/jquery-ui-1.10.3.verdant.css (100%) rename wagtail/wagtailadmin/static/wagtailadmin/{scss => css}/vendor/jquery.tagit.css (100%) rename wagtail/wagtailadmin/static/wagtailadmin/{scss => css}/vendor/tagit.ui-zendesk.css (100%) rename wagtail/wagtailadmin/static/wagtailadmin/scss/{normalize.css => normalize.scss} (100%) rename wagtail/wagtailadmin/static/wagtailadmin/scss/{userbar_embed.css => userbar_embed.scss} (100%) create mode 100644 wagtail/wagtailimages/static/wagtailimages/css/.gitignore rename wagtail/wagtailimages/static/wagtailimages/{scss => css}/vendor/Jcrop.gif (100%) rename wagtail/wagtailimages/static/wagtailimages/{scss => css}/vendor/jquery.Jcrop.min.css (100%) create mode 100644 wagtail/wagtailusers/static/wagtailusers/css/.gitignore 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 %} From 136d97dca297f22fa88848477b17f2c8dde3903c Mon Sep 17 00:00:00 2001 From: Tim Heap Date: Fri, 24 Apr 2015 08:52:36 +1000 Subject: [PATCH 2/7] Add instructions on compiling SCSS files to docs --- docs/contributing/css_guidelines.rst | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/docs/contributing/css_guidelines.rst b/docs/contributing/css_guidelines.rst index 26d1e5e123..fef75dfc4a 100644 --- a/docs/contributing/css_guidelines.rst +++ b/docs/contributing/css_guidelines.rst @@ -3,6 +3,26 @@ CSS coding guidelines Our CSS is written in Sass, using the SCSS syntax. +Compiling +~~~~~~~~~ + +The SCSS source files are compiled to CSS using the +[gulp](http://gulpjs.com/) build system. +This requires [node.js](http://nodejs.org) to run. +To install the libraries required for compiling the SCSS, +run the following from the Wagtail repository root: + + $ npm install + +To compile the assets, run: + + $ npm run build + +Alternatively, the SCSS files can be monitored, +automatically recompiling when any changes are observed, by running: + + $ npm start + Spacing ~~~~~~~ From 0be22dc3f0711e260e3bb93a3ffe938d36b499f2 Mon Sep 17 00:00:00 2001 From: Tim Heap Date: Fri, 24 Apr 2015 09:34:16 +1000 Subject: [PATCH 3/7] Check for and warn about missing assets in `setup.py install` --- setup.py | 5 ++--- wagtail/utils/setup.py | 24 ++++++++++++++++++++++-- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index 9cbb651c4d..4e82a9dab9 100644 --- a/setup.py +++ b/setup.py @@ -1,13 +1,11 @@ #!/usr/bin/env python import sys -import os from setuptools.command.sdist import sdist from wagtail.wagtailcore import __version__ -from wagtail.utils.setup import assets, add_subcommand - +from wagtail.utils.setup import assets, add_subcommand, check_bdist_egg try: from setuptools import setup, find_packages @@ -83,6 +81,7 @@ setup( zip_safe=False, cmdclass={ 'sdist': add_subcommand(sdist, [('assets', None)]), + 'bdist_egg': check_bdist_egg, 'assets': assets, }, ) diff --git a/wagtail/utils/setup.py b/wagtail/utils/setup.py index 6503eb3b1b..33639449c4 100644 --- a/wagtail/utils/setup.py +++ b/wagtail/utils/setup.py @@ -1,8 +1,12 @@ from __future__ import absolute_import, print_function, unicode_literals + +import os import subprocess from distutils.core import Command +from setuptools.command.bdist_egg import bdist_egg + class assets(Command): @@ -22,10 +26,26 @@ class assets(Command): raise SystemExit(1) +class check_bdist_egg(bdist_egg): + + # If this file does not exist, warn the user to compile the assets + sentinel_file = 'wagtail/wagtailadmin/static/wagtailadmin/css/core.css' + + def run(self): + bdist_egg.run(self) + if not os.path.isfile(self.sentinel_file): + print("\n".join([ + "************************************************************", + "The front end assets for Wagtail are missing.", + "To generate the assets, please refer to the documentation in", + "docs/contributing/css_guidelines.rst", + "************************************************************", + ])) + + 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. + # construct these. class CompileAnd(command): sub_commands = command.sub_commands + extra_sub_commands CompileAnd.__name__ = command.__name__ From 37816f68cf826d82accf96a925156c1e91a38827 Mon Sep 17 00:00:00 2001 From: Tim Heap Date: Fri, 24 Apr 2015 10:16:58 +1000 Subject: [PATCH 4/7] Move all static assets to `static_src`, compile to `static` The fonts were also relocated out of the `scss/fonts` directory to their own `fonts` directory. All the `static` directories are now ignored, and are completely generated from the compilation process. --- gulpfile.js | 156 +++++++++++++----- wagtail/contrib/wagtailstyleguide/.gitignore | 1 + .../static/wagtailstyleguide/css/.gitignore | 1 - .../wagtailstyleguide/scss/styleguide.scss | 2 +- wagtail/utils/setup.py | 4 +- wagtail/wagtailadmin/.gitignore | 1 + .../static/wagtailadmin/css/.gitignore | 9 - .../static/wagtailadmin/scss/fonts.scss | 83 ---------- .../wagtailadmin/css/normalize.css} | 0 .../jquery-ui/images/animated-overlay.gif | Bin .../images/ui-bg_flat_0_aaaaaa_40x100.png | Bin .../images/ui-bg_flat_100_246060_40x100.png | Bin .../images/ui-bg_flat_100_49c0c1_40x100.png | Bin .../images/ui-bg_flat_100_e8f8f9_40x100.png | Bin .../images/ui-bg_flat_100_f7474e_40x100.png | Bin .../images/ui-bg_flat_100_ffffff_40x100.png | Bin .../images/ui-bg_flat_65_49c0c1_40x100.png | Bin .../images/ui-icons_222222_256x240.png | Bin .../images/ui-icons_49c0c1_256x240.png | Bin .../images/ui-icons_555555_256x240.png | Bin .../images/ui-icons_ffffff_256x240.png | Bin .../jquery-ui/jquery-ui-1.10.3.verdant.css | 0 .../wagtailadmin/css/vendor/jquery.tagit.css | 0 .../css/vendor/tagit.ui-zendesk.css | 0 .../wagtailadmin}/fonts/Bitter-Bold.eot | Bin .../wagtailadmin}/fonts/Bitter-Bold.svg | 0 .../wagtailadmin}/fonts/Bitter-Bold.ttf | Bin .../wagtailadmin}/fonts/Bitter-Bold.woff | Bin .../wagtailadmin}/fonts/Bitter-Regular.eot | Bin .../wagtailadmin}/fonts/Bitter-Regular.svg | 0 .../wagtailadmin}/fonts/Bitter-Regular.ttf | Bin .../wagtailadmin}/fonts/Bitter-Regular.woff | Bin .../fonts/OpenSans-Bold-webfont.eot | Bin .../fonts/OpenSans-Bold-webfont.svg | 0 .../fonts/OpenSans-Bold-webfont.ttf | Bin .../fonts/OpenSans-Bold-webfont.woff | Bin .../fonts/OpenSans-Light-webfont.eot | Bin .../fonts/OpenSans-Light-webfont.svg | 0 .../fonts/OpenSans-Light-webfont.ttf | Bin .../fonts/OpenSans-Light-webfont.woff | Bin .../fonts/OpenSans-Regular-webfont.eot | Bin .../fonts/OpenSans-Regular-webfont.svg | 0 .../fonts/OpenSans-Regular-webfont.ttf | Bin .../fonts/OpenSans-Regular-webfont.woff | Bin .../fonts/OpenSans-Semibold-webfont.eot | Bin .../fonts/OpenSans-Semibold-webfont.svg | 0 .../fonts/OpenSans-Semibold-webfont.ttf | Bin .../fonts/OpenSans-Semibold-webfont.woff | Bin .../wagtailadmin}/fonts/wagtail-icomoon.json | 0 .../wagtailadmin}/fonts/wagtail.eot | Bin .../wagtailadmin}/fonts/wagtail.svg | 0 .../wagtailadmin}/fonts/wagtail.ttf | Bin .../wagtailadmin}/fonts/wagtail.woff | Bin .../wagtailadmin/images/bg-body.svg | 0 .../wagtailadmin/images/bg-dark-diag.svg | 0 .../wagtailadmin/images/bg-light-diag.svg | 0 .../wagtailadmin/images/spinner.gif | Bin .../wagtailadmin/images/transparency.svg | 0 .../wagtailadmin/images/wagtail-logo.svg | 0 .../wagtailadmin/js/blocks/list.js | 0 .../wagtailadmin/js/blocks/sequence.js | 0 .../wagtailadmin/js/blocks/stream.js | 0 .../wagtailadmin/js/blocks/struct.js | 0 .../wagtailadmin/js/core.js | 0 .../wagtailadmin/js/expanding_formset.js | 0 .../wagtailadmin/js/explorer-menu.js | 0 .../wagtailadmin/js/hallo-plugins/hallo-hr.js | 0 .../hallo-plugins/hallo-requireparagraphs.js | 0 .../js/hallo-plugins/hallo-wagtaillink.js | 0 .../wagtailadmin/js/modal-workflow.js | 0 .../wagtailadmin/js/page-chooser.js | 0 .../wagtailadmin/js/page-editor.js | 0 .../wagtailadmin/js/privacy-switch.js | 0 .../wagtailadmin/js/submenu.js | 0 .../wagtailadmin/js/userbar.js | 0 .../wagtailadmin/js/userbar_embed.js | 0 .../wagtailadmin/js/vendor/bootstrap-modal.js | 0 .../wagtailadmin/js/vendor/bootstrap-tab.js | 0 .../js/vendor/bootstrap-transition.js | 0 .../wagtailadmin/js/vendor/hallo.js | 0 .../wagtailadmin/js/vendor/jquery-1.10.3.js | 0 .../js/vendor/jquery-ui-1.10.3.js | 0 .../wagtailadmin/js/vendor/jquery.autosize.js | 0 .../vendor/jquery.ba-throttle-debounce.min.js | 0 .../js/vendor/jquery.datetimepicker.js | 0 .../wagtailadmin/js/vendor/jquery.dlmenu.js | 0 .../js/vendor/modernizr-2.6.2.min.js | 0 .../wagtailadmin/js/vendor/rangy-core.js | 0 .../wagtailadmin/js/vendor/tag-it.js | 0 .../scss/components/datetimepicker.scss | 0 .../scss/components/dropdowns.scss | 0 .../scss/components/explorer.scss | 0 .../scss/components/formatters.scss | 0 .../wagtailadmin/scss/components/forms.scss | 0 .../wagtailadmin/scss/components/header.scss | 0 .../wagtailadmin/scss/components/icons.scss | 0 .../wagtailadmin/scss/components/listing.scss | 0 .../scss/components/main-nav.scss | 0 .../scss/components/messages.scss | 0 .../wagtailadmin/scss/components/modals.scss | 0 .../scss/components/progressbar.scss | 0 .../wagtailadmin/scss/components/tabs.scss | 0 .../scss/components/typography.scss | 0 .../wagtailadmin/scss/core.scss | 2 +- .../static_src/wagtailadmin/scss/fonts.scss | 83 ++++++++++ .../wagtailadmin/scss/grid.scss | 0 .../wagtailadmin/scss/layouts/home.scss | 0 .../wagtailadmin/scss/layouts/login.scss | 2 +- .../scss/layouts/page-editor.scss | 0 .../wagtailadmin/scss/layouts/preview.scss | 2 +- .../wagtailadmin/scss/mixins.scss | 0 .../wagtailadmin/scss/panels/rich-text.scss | 2 +- .../wagtailadmin/scss/userbar.scss | 0 .../wagtailadmin/scss/userbar_embed.scss | 0 .../wagtailadmin/scss/variables.scss | 4 +- wagtail/wagtaildocs/.gitignore | 1 + .../wagtaildocs/js/document-chooser.js | 0 .../js/hallo-plugins/hallo-wagtaildoclink.js | 0 wagtail/wagtailembeds/.gitignore | 1 + .../js/hallo-plugins/hallo-wagtailembeds.js | 0 wagtail/wagtailforms/.gitignore | 1 + .../wagtailforms/js/page-editor.js | 0 wagtail/wagtailimages/.gitignore | 1 + .../static/wagtailimages/css/.gitignore | 2 - .../wagtailimages/css/vendor/Jcrop.gif | Bin .../css/vendor/jquery.Jcrop.min.css | 0 .../wagtailimages/js/add-multiple.js | 0 .../wagtailimages/js/focal-point-chooser.js | 0 .../js/hallo-plugins/hallo-wagtailimage.js | 0 .../wagtailimages/js/image-chooser.js | 0 .../wagtailimages/js/image-url-generator.js | 0 .../js/vendor/canvas-to-blob.min.js | 0 .../js/vendor/jquery.Jcrop.min.js | 0 .../js/vendor/jquery.fileupload-image.js | 0 .../js/vendor/jquery.fileupload-process.js | 0 .../js/vendor/jquery.fileupload-validate.js | 0 .../js/vendor/jquery.fileupload.js | 0 .../js/vendor/jquery.iframe-transport.js | 0 .../wagtailimages/js/vendor/load-image.min.js | 0 .../wagtailimages/scss/add-multiple.scss | 2 +- .../scss/focal-point-chooser.scss | 2 +- wagtail/wagtailsnippets/.gitignore | 1 + .../wagtailsnippets/js/snippet-chooser.js | 0 wagtail/wagtailusers/.gitignore | 1 + .../static/wagtailusers/css/.gitignore | 1 - .../wagtailusers/scss/groups_edit.scss | 0 146 files changed, 218 insertions(+), 147 deletions(-) create mode 100644 wagtail/contrib/wagtailstyleguide/.gitignore delete mode 100644 wagtail/contrib/wagtailstyleguide/static/wagtailstyleguide/css/.gitignore rename wagtail/contrib/wagtailstyleguide/{static => static_src}/wagtailstyleguide/scss/styleguide.scss (99%) create mode 100644 wagtail/wagtailadmin/.gitignore delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/css/.gitignore delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/scss/fonts.scss rename wagtail/wagtailadmin/{static/wagtailadmin/scss/normalize.scss => static_src/wagtailadmin/css/normalize.css} (100%) mode change 100755 => 100644 rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/css/vendor/jquery-ui/images/animated-overlay.gif (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_0_aaaaaa_40x100.png (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_246060_40x100.png (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_49c0c1_40x100.png (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_e8f8f9_40x100.png (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_f7474e_40x100.png (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_ffffff_40x100.png (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_65_49c0c1_40x100.png (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_222222_256x240.png (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_49c0c1_256x240.png (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_555555_256x240.png (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_ffffff_256x240.png (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/css/vendor/jquery-ui/jquery-ui-1.10.3.verdant.css (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/css/vendor/jquery.tagit.css (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/css/vendor/tagit.ui-zendesk.css (100%) rename wagtail/wagtailadmin/{static/wagtailadmin/scss => static_src/wagtailadmin}/fonts/Bitter-Bold.eot (100%) rename wagtail/wagtailadmin/{static/wagtailadmin/scss => static_src/wagtailadmin}/fonts/Bitter-Bold.svg (100%) rename wagtail/wagtailadmin/{static/wagtailadmin/scss => static_src/wagtailadmin}/fonts/Bitter-Bold.ttf (100%) rename wagtail/wagtailadmin/{static/wagtailadmin/scss => static_src/wagtailadmin}/fonts/Bitter-Bold.woff (100%) rename wagtail/wagtailadmin/{static/wagtailadmin/scss => static_src/wagtailadmin}/fonts/Bitter-Regular.eot (100%) rename wagtail/wagtailadmin/{static/wagtailadmin/scss => static_src/wagtailadmin}/fonts/Bitter-Regular.svg (100%) rename wagtail/wagtailadmin/{static/wagtailadmin/scss => static_src/wagtailadmin}/fonts/Bitter-Regular.ttf (100%) rename wagtail/wagtailadmin/{static/wagtailadmin/scss => static_src/wagtailadmin}/fonts/Bitter-Regular.woff (100%) rename wagtail/wagtailadmin/{static/wagtailadmin/scss => static_src/wagtailadmin}/fonts/OpenSans-Bold-webfont.eot (100%) rename wagtail/wagtailadmin/{static/wagtailadmin/scss => static_src/wagtailadmin}/fonts/OpenSans-Bold-webfont.svg (100%) rename wagtail/wagtailadmin/{static/wagtailadmin/scss => static_src/wagtailadmin}/fonts/OpenSans-Bold-webfont.ttf (100%) rename wagtail/wagtailadmin/{static/wagtailadmin/scss => static_src/wagtailadmin}/fonts/OpenSans-Bold-webfont.woff (100%) rename wagtail/wagtailadmin/{static/wagtailadmin/scss => static_src/wagtailadmin}/fonts/OpenSans-Light-webfont.eot (100%) rename wagtail/wagtailadmin/{static/wagtailadmin/scss => static_src/wagtailadmin}/fonts/OpenSans-Light-webfont.svg (100%) rename wagtail/wagtailadmin/{static/wagtailadmin/scss => static_src/wagtailadmin}/fonts/OpenSans-Light-webfont.ttf (100%) rename wagtail/wagtailadmin/{static/wagtailadmin/scss => static_src/wagtailadmin}/fonts/OpenSans-Light-webfont.woff (100%) rename wagtail/wagtailadmin/{static/wagtailadmin/scss => static_src/wagtailadmin}/fonts/OpenSans-Regular-webfont.eot (100%) rename wagtail/wagtailadmin/{static/wagtailadmin/scss => static_src/wagtailadmin}/fonts/OpenSans-Regular-webfont.svg (100%) rename wagtail/wagtailadmin/{static/wagtailadmin/scss => static_src/wagtailadmin}/fonts/OpenSans-Regular-webfont.ttf (100%) rename wagtail/wagtailadmin/{static/wagtailadmin/scss => static_src/wagtailadmin}/fonts/OpenSans-Regular-webfont.woff (100%) rename wagtail/wagtailadmin/{static/wagtailadmin/scss => static_src/wagtailadmin}/fonts/OpenSans-Semibold-webfont.eot (100%) rename wagtail/wagtailadmin/{static/wagtailadmin/scss => static_src/wagtailadmin}/fonts/OpenSans-Semibold-webfont.svg (100%) rename wagtail/wagtailadmin/{static/wagtailadmin/scss => static_src/wagtailadmin}/fonts/OpenSans-Semibold-webfont.ttf (100%) rename wagtail/wagtailadmin/{static/wagtailadmin/scss => static_src/wagtailadmin}/fonts/OpenSans-Semibold-webfont.woff (100%) rename wagtail/wagtailadmin/{static/wagtailadmin/scss => static_src/wagtailadmin}/fonts/wagtail-icomoon.json (100%) rename wagtail/wagtailadmin/{static/wagtailadmin/scss => static_src/wagtailadmin}/fonts/wagtail.eot (100%) rename wagtail/wagtailadmin/{static/wagtailadmin/scss => static_src/wagtailadmin}/fonts/wagtail.svg (100%) rename wagtail/wagtailadmin/{static/wagtailadmin/scss => static_src/wagtailadmin}/fonts/wagtail.ttf (100%) rename wagtail/wagtailadmin/{static/wagtailadmin/scss => static_src/wagtailadmin}/fonts/wagtail.woff (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/images/bg-body.svg (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/images/bg-dark-diag.svg (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/images/bg-light-diag.svg (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/images/spinner.gif (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/images/transparency.svg (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/images/wagtail-logo.svg (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/js/blocks/list.js (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/js/blocks/sequence.js (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/js/blocks/stream.js (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/js/blocks/struct.js (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/js/core.js (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/js/expanding_formset.js (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/js/explorer-menu.js (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/js/hallo-plugins/hallo-hr.js (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/js/hallo-plugins/hallo-requireparagraphs.js (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/js/hallo-plugins/hallo-wagtaillink.js (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/js/modal-workflow.js (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/js/page-chooser.js (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/js/page-editor.js (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/js/privacy-switch.js (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/js/submenu.js (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/js/userbar.js (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/js/userbar_embed.js (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/js/vendor/bootstrap-modal.js (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/js/vendor/bootstrap-tab.js (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/js/vendor/bootstrap-transition.js (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/js/vendor/hallo.js (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/js/vendor/jquery-1.10.3.js (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/js/vendor/jquery-ui-1.10.3.js (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/js/vendor/jquery.autosize.js (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/js/vendor/jquery.ba-throttle-debounce.min.js (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/js/vendor/jquery.datetimepicker.js (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/js/vendor/jquery.dlmenu.js (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/js/vendor/modernizr-2.6.2.min.js (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/js/vendor/rangy-core.js (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/js/vendor/tag-it.js (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/scss/components/datetimepicker.scss (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/scss/components/dropdowns.scss (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/scss/components/explorer.scss (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/scss/components/formatters.scss (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/scss/components/forms.scss (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/scss/components/header.scss (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/scss/components/icons.scss (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/scss/components/listing.scss (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/scss/components/main-nav.scss (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/scss/components/messages.scss (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/scss/components/modals.scss (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/scss/components/progressbar.scss (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/scss/components/tabs.scss (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/scss/components/typography.scss (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/scss/core.scss (99%) create mode 100644 wagtail/wagtailadmin/static_src/wagtailadmin/scss/fonts.scss rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/scss/grid.scss (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/scss/layouts/home.scss (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/scss/layouts/login.scss (99%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/scss/layouts/page-editor.scss (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/scss/layouts/preview.scss (99%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/scss/mixins.scss (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/scss/panels/rich-text.scss (99%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/scss/userbar.scss (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/scss/userbar_embed.scss (100%) rename wagtail/wagtailadmin/{static => static_src}/wagtailadmin/scss/variables.scss (96%) create mode 100644 wagtail/wagtaildocs/.gitignore rename wagtail/wagtaildocs/{static => static_src}/wagtaildocs/js/document-chooser.js (100%) rename wagtail/wagtaildocs/{static => static_src}/wagtaildocs/js/hallo-plugins/hallo-wagtaildoclink.js (100%) create mode 100644 wagtail/wagtailembeds/.gitignore rename wagtail/wagtailembeds/{static => static_src}/wagtailembeds/js/hallo-plugins/hallo-wagtailembeds.js (100%) create mode 100644 wagtail/wagtailforms/.gitignore rename wagtail/wagtailforms/{static => static_src}/wagtailforms/js/page-editor.js (100%) create mode 100644 wagtail/wagtailimages/.gitignore delete mode 100644 wagtail/wagtailimages/static/wagtailimages/css/.gitignore rename wagtail/wagtailimages/{static => static_src}/wagtailimages/css/vendor/Jcrop.gif (100%) rename wagtail/wagtailimages/{static => static_src}/wagtailimages/css/vendor/jquery.Jcrop.min.css (100%) rename wagtail/wagtailimages/{static => static_src}/wagtailimages/js/add-multiple.js (100%) rename wagtail/wagtailimages/{static => static_src}/wagtailimages/js/focal-point-chooser.js (100%) rename wagtail/wagtailimages/{static => static_src}/wagtailimages/js/hallo-plugins/hallo-wagtailimage.js (100%) rename wagtail/wagtailimages/{static => static_src}/wagtailimages/js/image-chooser.js (100%) rename wagtail/wagtailimages/{static => static_src}/wagtailimages/js/image-url-generator.js (100%) rename wagtail/wagtailimages/{static => static_src}/wagtailimages/js/vendor/canvas-to-blob.min.js (100%) rename wagtail/wagtailimages/{static => static_src}/wagtailimages/js/vendor/jquery.Jcrop.min.js (100%) rename wagtail/wagtailimages/{static => static_src}/wagtailimages/js/vendor/jquery.fileupload-image.js (100%) rename wagtail/wagtailimages/{static => static_src}/wagtailimages/js/vendor/jquery.fileupload-process.js (100%) rename wagtail/wagtailimages/{static => static_src}/wagtailimages/js/vendor/jquery.fileupload-validate.js (100%) rename wagtail/wagtailimages/{static => static_src}/wagtailimages/js/vendor/jquery.fileupload.js (100%) rename wagtail/wagtailimages/{static => static_src}/wagtailimages/js/vendor/jquery.iframe-transport.js (100%) rename wagtail/wagtailimages/{static => static_src}/wagtailimages/js/vendor/load-image.min.js (100%) rename wagtail/wagtailimages/{static => static_src}/wagtailimages/scss/add-multiple.scss (99%) rename wagtail/wagtailimages/{static => static_src}/wagtailimages/scss/focal-point-chooser.scss (99%) create mode 100644 wagtail/wagtailsnippets/.gitignore rename wagtail/wagtailsnippets/{static => static_src}/wagtailsnippets/js/snippet-chooser.js (100%) create mode 100644 wagtail/wagtailusers/.gitignore delete mode 100644 wagtail/wagtailusers/static/wagtailusers/css/.gitignore rename wagtail/wagtailusers/{static => static_src}/wagtailusers/scss/groups_edit.scss (100%) diff --git a/gulpfile.js b/gulpfile.js index 8406102483..306f0f2834 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -2,68 +2,118 @@ 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']); +gulp.task('build', ['styles', 'javascript', 'images', 'fonts']); -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', - ], + +var sourceDirName = 'static_src'; +var destDirName = 'static'; +var renameSrcToDest = function() { + return rename(function(filePath) { + filePath.dirname = filePath.dirname.replace( + '/' + sourceDirName + '/', + '/' + destDirName + '/'); + }); }; +var flatten = function(arrOfArr) { + return arrOfArr.reduce(function(flat, more) { + return flat.concat(more); + }, []); +}; + + +// A Wagtail app that contains static files +var App = function(dir, options) { + this.dir = dir; + this.options = options || {}; + this.appName = this.options.appName || path.basename(dir); + this.sourceFiles = path.join('.', this.dir, sourceDirName); +}; +App.prototype = Object.create(null); +App.prototype.scssIncludePaths = function() { + return [this.sourceFiles]; +}; +App.prototype.scssSources = function() { + if (!this.options.scss) return []; + + return this.options.scss.map(function(file) { + return path.join(this.sourceFiles, file); + }, this); +}; + + +// All the Wagtail apps that contain static files +var apps = [ + new App('wagtail/wagtailadmin', { + 'scss': [ + '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/userbar_embed.scss', + ], + }), + new App('wagtail/wagtaildocs'), + new App('wagtail/wagtailembeds'), + new App('wagtail/wagtailforms'), + new App('wagtail/wagtailimages', { + 'scss': [ + 'wagtailimages/scss/add-multiple.scss', + 'wagtailimages/scss/focal-point-chooser.scss', + ], + }), + new App('wagtail/wagtailsnippets'), + new App('wagtail/wagtailusers', { + 'scss': [ + 'wagtailusers/scss/groups_edit.scss', + ], + }), + new App('wagtail/contrib/wagtailstyleguide', { + 'scss': [ + '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']); - } + apps.forEach(function(app) { + gulp.watch(path.join(app.sourceFiles, '*/scss/**'), ['styles:sass']); + gulp.watch(path.join(app.sourceFiles, '*/css/**'), ['styles:css']); + gulp.watch(path.join(app.sourceFiles, '*/js/**'), ['javascript']); + gulp.watch(path.join(app.sourceFiles, '*/images/**'), ['images']); + gulp.watch(path.join(app.sourceFiles, '*/fonts/**'), ['fonts']); + }); }); /* - * SASS - Compile and move sass + * Styles **/ +gulp.task('styles', ['styles:sass', 'styles:css']); -gulp.task('styles', function () { +// SASS - Compile and move sass +gulp.task('styles:sass', 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 + // e.g. wagtailimages Sass files will include wagtailadmin/sass/mixins.scss // Thus, each app is used as an includePath. - var includePaths = Object.keys(scssFiles); + var includePaths = flatten(apps.map(function(app) { return app.scssIncludePaths() })) - // 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); - })); - }, []); + // Not all files in a directory need to be compiled, so each app defines + // its own Sass files that need to be compiled. + var sources = flatten(apps.map(function(app) { return app.scssSources(); })); return gulp.src(sources) .pipe(sass({ @@ -78,7 +128,33 @@ gulp.task('styles', function () { .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/'); + return file.base + .replace('/static_src/', '/static/') + .replace('/scss/', '/css/'); })) .on('error', gutil.log); }); + + +/* + * Simple copy tasks - these just copy files from the source to the destination, + * with no compilation, minification, or other intelligence + * +**/ +var rename = require('gulp-rename'); +var simpleCopyTask = function(glob) { + return function() { + var sources = apps.map(function(app) { + return path.join(app.sourceFiles, app.appName, glob); + }); + + return gulp.src(sources, {base: '.'}) + .pipe(renameSrcToDest()) + .pipe(gulp.dest('.')) + .on('error', gutil.log); + }; +}; +gulp.task('styles:css', simpleCopyTask('css/**/*')); +gulp.task('javascript', simpleCopyTask('js/**/*')); +gulp.task('images', simpleCopyTask('images/**/*')); +gulp.task('fonts', simpleCopyTask('fonts/**/*')); diff --git a/wagtail/contrib/wagtailstyleguide/.gitignore b/wagtail/contrib/wagtailstyleguide/.gitignore new file mode 100644 index 0000000000..980c85122d --- /dev/null +++ b/wagtail/contrib/wagtailstyleguide/.gitignore @@ -0,0 +1 @@ +static/ diff --git a/wagtail/contrib/wagtailstyleguide/static/wagtailstyleguide/css/.gitignore b/wagtail/contrib/wagtailstyleguide/static/wagtailstyleguide/css/.gitignore deleted file mode 100644 index 5d1f99fc29..0000000000 --- a/wagtail/contrib/wagtailstyleguide/static/wagtailstyleguide/css/.gitignore +++ /dev/null @@ -1 +0,0 @@ -styleguide.css diff --git a/wagtail/contrib/wagtailstyleguide/static/wagtailstyleguide/scss/styleguide.scss b/wagtail/contrib/wagtailstyleguide/static_src/wagtailstyleguide/scss/styleguide.scss similarity index 99% rename from wagtail/contrib/wagtailstyleguide/static/wagtailstyleguide/scss/styleguide.scss rename to wagtail/contrib/wagtailstyleguide/static_src/wagtailstyleguide/scss/styleguide.scss index 8eedb1d448..873aaf6b6f 100644 --- a/wagtail/contrib/wagtailstyleguide/static/wagtailstyleguide/scss/styleguide.scss +++ b/wagtail/contrib/wagtailstyleguide/static_src/wagtailstyleguide/scss/styleguide.scss @@ -102,4 +102,4 @@ section{ .timepicker{ height:150px; -} \ No newline at end of file +} diff --git a/wagtail/utils/setup.py b/wagtail/utils/setup.py index 33639449c4..8f34fc10ee 100644 --- a/wagtail/utils/setup.py +++ b/wagtail/utils/setup.py @@ -29,11 +29,11 @@ class assets(Command): class check_bdist_egg(bdist_egg): # If this file does not exist, warn the user to compile the assets - sentinel_file = 'wagtail/wagtailadmin/static/wagtailadmin/css/core.css' + sentinel_dir = 'wagtail/wagtailadmin/static/' def run(self): bdist_egg.run(self) - if not os.path.isfile(self.sentinel_file): + if not os.path.isdir(self.sentinel_dir): print("\n".join([ "************************************************************", "The front end assets for Wagtail are missing.", diff --git a/wagtail/wagtailadmin/.gitignore b/wagtail/wagtailadmin/.gitignore new file mode 100644 index 0000000000..7b4d4ba2e6 --- /dev/null +++ b/wagtail/wagtailadmin/.gitignore @@ -0,0 +1 @@ +static diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/.gitignore b/wagtail/wagtailadmin/static/wagtailadmin/css/.gitignore deleted file mode 100644 index 559f1bb2a0..0000000000 --- a/wagtail/wagtailadmin/static/wagtailadmin/css/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -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/fonts.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts.scss deleted file mode 100644 index 9092012c6f..0000000000 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts.scss +++ /dev/null @@ -1,83 +0,0 @@ -@font-face { - font-family: "Open Sans"; - src:url("#{$css-root}fonts/OpenSans-Light-webfont.eot"); - src:url("#{$css-root}fonts/OpenSans-Light-webfont.eot?#iefix") format("embedded-opentype"), - url("#{$css-root}fonts/OpenSans-Light-webfont.ttf") format("truetype"), - url("#{$css-root}fonts/OpenSans-Light-webfont.svg#opensans_italic_webfont") format("svg"), - url("#{$css-root}fonts/OpenSans-Light-webfont.woff") format("woff"); - font-weight: 300; - font-style: normal; -} - -@font-face { - font-family: "Open Sans"; - src:url("#{$css-root}fonts/OpenSans-Regular-webfont.eot"); - src:url("#{$css-root}fonts/OpenSans-Regular-webfont.eot?#iefix") format("embedded-opentype"), - url("#{$css-root}fonts/OpenSans-Regular-webfont.ttf") format("truetype"), - url("#{$css-root}fonts/OpenSans-Regular-webfont.svg#opensans_regular_webfont") format("svg"), - url("#{$css-root}fonts/OpenSans-Regular-webfont.woff") format("woff"); - font-weight: 400; - font-style: normal; -} - -@font-face { - font-family: "Open Sans"; - src:url("#{$css-root}fonts/OpenSans-Semibold-webfont.eot"); - src:url("#{$css-root}fonts/OpenSans-Semibold-webfont.eot?#iefix") format("embedded-opentype"), - url("#{$css-root}fonts/OpenSans-Semibold-webfont.ttf") format("truetype"), - url("#{$css-root}fonts/OpenSans-Semibold-webfont.svg#opensans_semibold_webfont") format("svg"), - url("#{$css-root}fonts/OpenSans-Semibold-webfont.woff") format("woff"); - font-weight: 600; - font-style: normal; -} - -@font-face { - font-family: "Open Sans"; - src:url("#{$css-root}fonts/OpenSans-Bold-webfont.eot"); - src:url("#{$css-root}fonts/OpenSans-Bold-webfont.eot?#iefix") format("embedded-opentype"), - url("#{$css-root}fonts/OpenSans-Bold-webfont.ttf") format("truetype"), - url("#{$css-root}fonts/OpenSans-Bold-webfont.svg#opensans_bold_webfont") format("svg"), - url("#{$css-root}fonts/OpenSans-Bold-webfont.woff") format("woff"); - font-weight: 700; - font-style: normal; -} - -@font-face { - font-family: "Bitter"; - src: url("#{$css-root}fonts/Bitter-Regular.eot"); - src: url("#{$css-root}fonts/Bitter-Regular.eot?#iefix") format("embedded-opentype"), - url("#{$css-root}fonts/Bitter-Regular.ttf") format("truetype"), - url("#{$css-root}fonts/Bitter-Regular.svg#Bitter-Regular") format("svg"), - url("#{$css-root}fonts/Bitter-Regular.woff") format("woff"); - font-weight:400; - font-style:normal; -} - -@font-face { - font-family: "Bitter"; - src: url("#{$css-root}fonts/Bitter-Bold.eot"); - src: url("#{$css-root}fonts/Bitter-Bold.eot?#iefix") format("embedded-opentype"), - url("#{$css-root}fonts/Bitter-Bold.ttf") format("truetype"), - url("#{$css-root}fonts/Bitter-Bold.svg#Bitter-Bold") format("svg"), - url("#{$css-root}fonts/Bitter-Bold.woff") format("woff"); - font-weight:700; - font-style:normal; -} - -@font-face { - font-family: "wagtail"; - src:url("#{$css-root}fonts/wagtail.eot"); - src:url("#{$css-root}fonts/wagtail.eot?#iefix") format("embedded-opentype"), - url("#{$css-root}fonts/wagtail.ttf") format("truetype"), - url("#{$css-root}fonts/wagtail.svg#wagtail") format("svg"), - url("#{$css-root}fonts/wagtail.woff") format("woff"); - font-weight: normal; - font-style: normal; -} -/* fix to make chrome on windows use svg, which renders better */ -@media screen and (-webkit-min-device-pixel-ratio:0) { - @font-face { - font-family: "wagtail"; - src: url("#{$css-root}fonts/wagtail.svg#wagtail") format("svg"); - } -} \ No newline at end of file diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/normalize.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/css/normalize.css old mode 100755 new mode 100644 similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/normalize.scss rename to wagtail/wagtailadmin/static_src/wagtailadmin/css/normalize.css diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/animated-overlay.gif b/wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/animated-overlay.gif similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/animated-overlay.gif rename to wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/animated-overlay.gif diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_0_aaaaaa_40x100.png b/wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_0_aaaaaa_40x100.png similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_0_aaaaaa_40x100.png rename to wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_0_aaaaaa_40x100.png diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_246060_40x100.png b/wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_246060_40x100.png similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_246060_40x100.png rename to wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_246060_40x100.png diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_49c0c1_40x100.png b/wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_49c0c1_40x100.png similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_49c0c1_40x100.png rename to wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_49c0c1_40x100.png diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_e8f8f9_40x100.png b/wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_e8f8f9_40x100.png similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_e8f8f9_40x100.png rename to wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_e8f8f9_40x100.png diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_f7474e_40x100.png b/wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_f7474e_40x100.png similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_f7474e_40x100.png rename to wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_f7474e_40x100.png diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_ffffff_40x100.png b/wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_ffffff_40x100.png similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_ffffff_40x100.png rename to wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_100_ffffff_40x100.png diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_65_49c0c1_40x100.png b/wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_65_49c0c1_40x100.png similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_65_49c0c1_40x100.png rename to wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-bg_flat_65_49c0c1_40x100.png diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_222222_256x240.png b/wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_222222_256x240.png similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_222222_256x240.png rename to wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_222222_256x240.png diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_49c0c1_256x240.png b/wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_49c0c1_256x240.png similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_49c0c1_256x240.png rename to wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_49c0c1_256x240.png diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_555555_256x240.png b/wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_555555_256x240.png similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_555555_256x240.png rename to wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_555555_256x240.png diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_ffffff_256x240.png b/wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_ffffff_256x240.png similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_ffffff_256x240.png rename to wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/images/ui-icons_ffffff_256x240.png diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/jquery-ui-1.10.3.verdant.css b/wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/jquery-ui-1.10.3.verdant.css similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery-ui/jquery-ui-1.10.3.verdant.css rename to wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery-ui/jquery-ui-1.10.3.verdant.css diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery.tagit.css b/wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery.tagit.css similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/css/vendor/jquery.tagit.css rename to wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/jquery.tagit.css diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/vendor/tagit.ui-zendesk.css b/wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/tagit.ui-zendesk.css similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/css/vendor/tagit.ui-zendesk.css rename to wagtail/wagtailadmin/static_src/wagtailadmin/css/vendor/tagit.ui-zendesk.css diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/Bitter-Bold.eot b/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/Bitter-Bold.eot similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/Bitter-Bold.eot rename to wagtail/wagtailadmin/static_src/wagtailadmin/fonts/Bitter-Bold.eot diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/Bitter-Bold.svg b/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/Bitter-Bold.svg similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/Bitter-Bold.svg rename to wagtail/wagtailadmin/static_src/wagtailadmin/fonts/Bitter-Bold.svg diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/Bitter-Bold.ttf b/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/Bitter-Bold.ttf similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/Bitter-Bold.ttf rename to wagtail/wagtailadmin/static_src/wagtailadmin/fonts/Bitter-Bold.ttf diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/Bitter-Bold.woff b/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/Bitter-Bold.woff similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/Bitter-Bold.woff rename to wagtail/wagtailadmin/static_src/wagtailadmin/fonts/Bitter-Bold.woff diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/Bitter-Regular.eot b/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/Bitter-Regular.eot similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/Bitter-Regular.eot rename to wagtail/wagtailadmin/static_src/wagtailadmin/fonts/Bitter-Regular.eot diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/Bitter-Regular.svg b/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/Bitter-Regular.svg similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/Bitter-Regular.svg rename to wagtail/wagtailadmin/static_src/wagtailadmin/fonts/Bitter-Regular.svg diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/Bitter-Regular.ttf b/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/Bitter-Regular.ttf similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/Bitter-Regular.ttf rename to wagtail/wagtailadmin/static_src/wagtailadmin/fonts/Bitter-Regular.ttf diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/Bitter-Regular.woff b/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/Bitter-Regular.woff similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/Bitter-Regular.woff rename to wagtail/wagtailadmin/static_src/wagtailadmin/fonts/Bitter-Regular.woff diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Bold-webfont.eot b/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/OpenSans-Bold-webfont.eot similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Bold-webfont.eot rename to wagtail/wagtailadmin/static_src/wagtailadmin/fonts/OpenSans-Bold-webfont.eot diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Bold-webfont.svg b/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/OpenSans-Bold-webfont.svg similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Bold-webfont.svg rename to wagtail/wagtailadmin/static_src/wagtailadmin/fonts/OpenSans-Bold-webfont.svg diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Bold-webfont.ttf b/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/OpenSans-Bold-webfont.ttf similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Bold-webfont.ttf rename to wagtail/wagtailadmin/static_src/wagtailadmin/fonts/OpenSans-Bold-webfont.ttf diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Bold-webfont.woff b/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/OpenSans-Bold-webfont.woff similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Bold-webfont.woff rename to wagtail/wagtailadmin/static_src/wagtailadmin/fonts/OpenSans-Bold-webfont.woff diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Light-webfont.eot b/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/OpenSans-Light-webfont.eot similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Light-webfont.eot rename to wagtail/wagtailadmin/static_src/wagtailadmin/fonts/OpenSans-Light-webfont.eot diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Light-webfont.svg b/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/OpenSans-Light-webfont.svg similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Light-webfont.svg rename to wagtail/wagtailadmin/static_src/wagtailadmin/fonts/OpenSans-Light-webfont.svg diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Light-webfont.ttf b/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/OpenSans-Light-webfont.ttf similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Light-webfont.ttf rename to wagtail/wagtailadmin/static_src/wagtailadmin/fonts/OpenSans-Light-webfont.ttf diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Light-webfont.woff b/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/OpenSans-Light-webfont.woff similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Light-webfont.woff rename to wagtail/wagtailadmin/static_src/wagtailadmin/fonts/OpenSans-Light-webfont.woff diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Regular-webfont.eot b/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/OpenSans-Regular-webfont.eot similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Regular-webfont.eot rename to wagtail/wagtailadmin/static_src/wagtailadmin/fonts/OpenSans-Regular-webfont.eot diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Regular-webfont.svg b/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/OpenSans-Regular-webfont.svg similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Regular-webfont.svg rename to wagtail/wagtailadmin/static_src/wagtailadmin/fonts/OpenSans-Regular-webfont.svg diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Regular-webfont.ttf b/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/OpenSans-Regular-webfont.ttf similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Regular-webfont.ttf rename to wagtail/wagtailadmin/static_src/wagtailadmin/fonts/OpenSans-Regular-webfont.ttf diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Regular-webfont.woff b/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/OpenSans-Regular-webfont.woff similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Regular-webfont.woff rename to wagtail/wagtailadmin/static_src/wagtailadmin/fonts/OpenSans-Regular-webfont.woff diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Semibold-webfont.eot b/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/OpenSans-Semibold-webfont.eot similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Semibold-webfont.eot rename to wagtail/wagtailadmin/static_src/wagtailadmin/fonts/OpenSans-Semibold-webfont.eot diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Semibold-webfont.svg b/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/OpenSans-Semibold-webfont.svg similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Semibold-webfont.svg rename to wagtail/wagtailadmin/static_src/wagtailadmin/fonts/OpenSans-Semibold-webfont.svg diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Semibold-webfont.ttf b/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/OpenSans-Semibold-webfont.ttf similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Semibold-webfont.ttf rename to wagtail/wagtailadmin/static_src/wagtailadmin/fonts/OpenSans-Semibold-webfont.ttf diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Semibold-webfont.woff b/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/OpenSans-Semibold-webfont.woff similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Semibold-webfont.woff rename to wagtail/wagtailadmin/static_src/wagtailadmin/fonts/OpenSans-Semibold-webfont.woff diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail-icomoon.json b/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/wagtail-icomoon.json similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail-icomoon.json rename to wagtail/wagtailadmin/static_src/wagtailadmin/fonts/wagtail-icomoon.json diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.eot b/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/wagtail.eot similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.eot rename to wagtail/wagtailadmin/static_src/wagtailadmin/fonts/wagtail.eot diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg b/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/wagtail.svg similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg rename to wagtail/wagtailadmin/static_src/wagtailadmin/fonts/wagtail.svg diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.ttf b/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/wagtail.ttf similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.ttf rename to wagtail/wagtailadmin/static_src/wagtailadmin/fonts/wagtail.ttf diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.woff b/wagtail/wagtailadmin/static_src/wagtailadmin/fonts/wagtail.woff similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.woff rename to wagtail/wagtailadmin/static_src/wagtailadmin/fonts/wagtail.woff diff --git a/wagtail/wagtailadmin/static/wagtailadmin/images/bg-body.svg b/wagtail/wagtailadmin/static_src/wagtailadmin/images/bg-body.svg similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/images/bg-body.svg rename to wagtail/wagtailadmin/static_src/wagtailadmin/images/bg-body.svg diff --git a/wagtail/wagtailadmin/static/wagtailadmin/images/bg-dark-diag.svg b/wagtail/wagtailadmin/static_src/wagtailadmin/images/bg-dark-diag.svg similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/images/bg-dark-diag.svg rename to wagtail/wagtailadmin/static_src/wagtailadmin/images/bg-dark-diag.svg diff --git a/wagtail/wagtailadmin/static/wagtailadmin/images/bg-light-diag.svg b/wagtail/wagtailadmin/static_src/wagtailadmin/images/bg-light-diag.svg similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/images/bg-light-diag.svg rename to wagtail/wagtailadmin/static_src/wagtailadmin/images/bg-light-diag.svg diff --git a/wagtail/wagtailadmin/static/wagtailadmin/images/spinner.gif b/wagtail/wagtailadmin/static_src/wagtailadmin/images/spinner.gif similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/images/spinner.gif rename to wagtail/wagtailadmin/static_src/wagtailadmin/images/spinner.gif diff --git a/wagtail/wagtailadmin/static/wagtailadmin/images/transparency.svg b/wagtail/wagtailadmin/static_src/wagtailadmin/images/transparency.svg similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/images/transparency.svg rename to wagtail/wagtailadmin/static_src/wagtailadmin/images/transparency.svg diff --git a/wagtail/wagtailadmin/static/wagtailadmin/images/wagtail-logo.svg b/wagtail/wagtailadmin/static_src/wagtailadmin/images/wagtail-logo.svg similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/images/wagtail-logo.svg rename to wagtail/wagtailadmin/static_src/wagtailadmin/images/wagtail-logo.svg diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/blocks/list.js b/wagtail/wagtailadmin/static_src/wagtailadmin/js/blocks/list.js similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/js/blocks/list.js rename to wagtail/wagtailadmin/static_src/wagtailadmin/js/blocks/list.js diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/blocks/sequence.js b/wagtail/wagtailadmin/static_src/wagtailadmin/js/blocks/sequence.js similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/js/blocks/sequence.js rename to wagtail/wagtailadmin/static_src/wagtailadmin/js/blocks/sequence.js diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/blocks/stream.js b/wagtail/wagtailadmin/static_src/wagtailadmin/js/blocks/stream.js similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/js/blocks/stream.js rename to wagtail/wagtailadmin/static_src/wagtailadmin/js/blocks/stream.js diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/blocks/struct.js b/wagtail/wagtailadmin/static_src/wagtailadmin/js/blocks/struct.js similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/js/blocks/struct.js rename to wagtail/wagtailadmin/static_src/wagtailadmin/js/blocks/struct.js diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/core.js b/wagtail/wagtailadmin/static_src/wagtailadmin/js/core.js similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/js/core.js rename to wagtail/wagtailadmin/static_src/wagtailadmin/js/core.js diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/expanding_formset.js b/wagtail/wagtailadmin/static_src/wagtailadmin/js/expanding_formset.js similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/js/expanding_formset.js rename to wagtail/wagtailadmin/static_src/wagtailadmin/js/expanding_formset.js diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/explorer-menu.js b/wagtail/wagtailadmin/static_src/wagtailadmin/js/explorer-menu.js similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/js/explorer-menu.js rename to wagtail/wagtailadmin/static_src/wagtailadmin/js/explorer-menu.js diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-hr.js b/wagtail/wagtailadmin/static_src/wagtailadmin/js/hallo-plugins/hallo-hr.js similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-hr.js rename to wagtail/wagtailadmin/static_src/wagtailadmin/js/hallo-plugins/hallo-hr.js diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-requireparagraphs.js b/wagtail/wagtailadmin/static_src/wagtailadmin/js/hallo-plugins/hallo-requireparagraphs.js similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-requireparagraphs.js rename to wagtail/wagtailadmin/static_src/wagtailadmin/js/hallo-plugins/hallo-requireparagraphs.js diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-wagtaillink.js b/wagtail/wagtailadmin/static_src/wagtailadmin/js/hallo-plugins/hallo-wagtaillink.js similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-wagtaillink.js rename to wagtail/wagtailadmin/static_src/wagtailadmin/js/hallo-plugins/hallo-wagtaillink.js diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/modal-workflow.js b/wagtail/wagtailadmin/static_src/wagtailadmin/js/modal-workflow.js similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/js/modal-workflow.js rename to wagtail/wagtailadmin/static_src/wagtailadmin/js/modal-workflow.js diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/page-chooser.js b/wagtail/wagtailadmin/static_src/wagtailadmin/js/page-chooser.js similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/js/page-chooser.js rename to wagtail/wagtailadmin/static_src/wagtailadmin/js/page-chooser.js diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js b/wagtail/wagtailadmin/static_src/wagtailadmin/js/page-editor.js similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js rename to wagtail/wagtailadmin/static_src/wagtailadmin/js/page-editor.js diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/privacy-switch.js b/wagtail/wagtailadmin/static_src/wagtailadmin/js/privacy-switch.js similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/js/privacy-switch.js rename to wagtail/wagtailadmin/static_src/wagtailadmin/js/privacy-switch.js diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/submenu.js b/wagtail/wagtailadmin/static_src/wagtailadmin/js/submenu.js similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/js/submenu.js rename to wagtail/wagtailadmin/static_src/wagtailadmin/js/submenu.js diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/userbar.js b/wagtail/wagtailadmin/static_src/wagtailadmin/js/userbar.js similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/js/userbar.js rename to wagtail/wagtailadmin/static_src/wagtailadmin/js/userbar.js diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/userbar_embed.js b/wagtail/wagtailadmin/static_src/wagtailadmin/js/userbar_embed.js similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/js/userbar_embed.js rename to wagtail/wagtailadmin/static_src/wagtailadmin/js/userbar_embed.js diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/bootstrap-modal.js b/wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/bootstrap-modal.js similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/js/vendor/bootstrap-modal.js rename to wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/bootstrap-modal.js diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/bootstrap-tab.js b/wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/bootstrap-tab.js similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/js/vendor/bootstrap-tab.js rename to wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/bootstrap-tab.js diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/bootstrap-transition.js b/wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/bootstrap-transition.js similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/js/vendor/bootstrap-transition.js rename to wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/bootstrap-transition.js diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/hallo.js b/wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/hallo.js similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/js/vendor/hallo.js rename to wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/hallo.js diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/jquery-1.10.3.js b/wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/jquery-1.10.3.js similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/js/vendor/jquery-1.10.3.js rename to wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/jquery-1.10.3.js diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/jquery-ui-1.10.3.js b/wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/jquery-ui-1.10.3.js similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/js/vendor/jquery-ui-1.10.3.js rename to wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/jquery-ui-1.10.3.js diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/jquery.autosize.js b/wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/jquery.autosize.js similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/js/vendor/jquery.autosize.js rename to wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/jquery.autosize.js diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/jquery.ba-throttle-debounce.min.js b/wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/jquery.ba-throttle-debounce.min.js similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/js/vendor/jquery.ba-throttle-debounce.min.js rename to wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/jquery.ba-throttle-debounce.min.js diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/jquery.datetimepicker.js b/wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/jquery.datetimepicker.js similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/js/vendor/jquery.datetimepicker.js rename to wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/jquery.datetimepicker.js diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/jquery.dlmenu.js b/wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/jquery.dlmenu.js similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/js/vendor/jquery.dlmenu.js rename to wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/jquery.dlmenu.js diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/modernizr-2.6.2.min.js b/wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/modernizr-2.6.2.min.js similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/js/vendor/modernizr-2.6.2.min.js rename to wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/modernizr-2.6.2.min.js diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/rangy-core.js b/wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/rangy-core.js similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/js/vendor/rangy-core.js rename to wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/rangy-core.js diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/tag-it.js b/wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/tag-it.js similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/js/vendor/tag-it.js rename to wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/tag-it.js diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/datetimepicker.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/datetimepicker.scss similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/components/datetimepicker.scss rename to wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/datetimepicker.scss diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/dropdowns.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/dropdowns.scss similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/components/dropdowns.scss rename to wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/dropdowns.scss diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/explorer.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/explorer.scss similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/components/explorer.scss rename to wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/explorer.scss diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/formatters.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/formatters.scss similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/components/formatters.scss rename to wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/formatters.scss diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/forms.scss similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss rename to wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/forms.scss diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/header.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/header.scss similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/components/header.scss rename to wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/header.scss diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/icons.scss similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss rename to wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/icons.scss diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/listing.scss similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss rename to wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/listing.scss diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/main-nav.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/main-nav.scss similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/components/main-nav.scss rename to wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/main-nav.scss diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/messages.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/messages.scss similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/components/messages.scss rename to wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/messages.scss diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/modals.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/modals.scss similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/components/modals.scss rename to wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/modals.scss diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/progressbar.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/progressbar.scss similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/components/progressbar.scss rename to wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/progressbar.scss diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/tabs.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/tabs.scss similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/components/tabs.scss rename to wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/tabs.scss diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/typography.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/typography.scss similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/components/typography.scss rename to wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/typography.scss diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/core.scss similarity index 99% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss rename to wagtail/wagtailadmin/static_src/wagtailadmin/scss/core.scss index 397fbaa0ec..86ed407ed9 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss +++ b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/core.scss @@ -17,7 +17,7 @@ @import "wagtailadmin/scss/components/datetimepicker.scss"; @import "wagtailadmin/scss/components/main-nav.scss"; -@import "fonts.scss"; +@import "wagtailadmin/scss/fonts.scss"; html{ background:$color-grey-4; diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/fonts.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/fonts.scss new file mode 100644 index 0000000000..e1941a331e --- /dev/null +++ b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/fonts.scss @@ -0,0 +1,83 @@ +@font-face { + font-family: "Open Sans"; + src:url("#{$font-root}OpenSans-Light-webfont.eot"); + src:url("#{$font-root}OpenSans-Light-webfont.eot?#iefix") format("embedded-opentype"), + url("#{$font-root}OpenSans-Light-webfont.ttf") format("truetype"), + url("#{$font-root}OpenSans-Light-webfont.svg#opensans_italic_webfont") format("svg"), + url("#{$font-root}OpenSans-Light-webfont.woff") format("woff"); + font-weight: 300; + font-style: normal; +} + +@font-face { + font-family: "Open Sans"; + src:url("#{$font-root}OpenSans-Regular-webfont.eot"); + src:url("#{$font-root}OpenSans-Regular-webfont.eot?#iefix") format("embedded-opentype"), + url("#{$font-root}OpenSans-Regular-webfont.ttf") format("truetype"), + url("#{$font-root}OpenSans-Regular-webfont.svg#opensans_regular_webfont") format("svg"), + url("#{$font-root}OpenSans-Regular-webfont.woff") format("woff"); + font-weight: 400; + font-style: normal; +} + +@font-face { + font-family: "Open Sans"; + src:url("#{$font-root}OpenSans-Semibold-webfont.eot"); + src:url("#{$font-root}OpenSans-Semibold-webfont.eot?#iefix") format("embedded-opentype"), + url("#{$font-root}OpenSans-Semibold-webfont.ttf") format("truetype"), + url("#{$font-root}OpenSans-Semibold-webfont.svg#opensans_semibold_webfont") format("svg"), + url("#{$font-root}OpenSans-Semibold-webfont.woff") format("woff"); + font-weight: 600; + font-style: normal; +} + +@font-face { + font-family: "Open Sans"; + src:url("#{$font-root}OpenSans-Bold-webfont.eot"); + src:url("#{$font-root}OpenSans-Bold-webfont.eot?#iefix") format("embedded-opentype"), + url("#{$font-root}OpenSans-Bold-webfont.ttf") format("truetype"), + url("#{$font-root}OpenSans-Bold-webfont.svg#opensans_bold_webfont") format("svg"), + url("#{$font-root}OpenSans-Bold-webfont.woff") format("woff"); + font-weight: 700; + font-style: normal; +} + +@font-face { + font-family: "Bitter"; + src: url("#{$font-root}Bitter-Regular.eot"); + src: url("#{$font-root}Bitter-Regular.eot?#iefix") format("embedded-opentype"), + url("#{$font-root}Bitter-Regular.ttf") format("truetype"), + url("#{$font-root}Bitter-Regular.svg#Bitter-Regular") format("svg"), + url("#{$font-root}Bitter-Regular.woff") format("woff"); + font-weight:400; + font-style:normal; +} + +@font-face { + font-family: "Bitter"; + src: url("#{$font-root}Bitter-Bold.eot"); + src: url("#{$font-root}Bitter-Bold.eot?#iefix") format("embedded-opentype"), + url("#{$font-root}Bitter-Bold.ttf") format("truetype"), + url("#{$font-root}Bitter-Bold.svg#Bitter-Bold") format("svg"), + url("#{$font-root}Bitter-Bold.woff") format("woff"); + font-weight:700; + font-style:normal; +} + +@font-face { + font-family: "wagtail"; + src:url("#{$font-root}wagtail.eot"); + src:url("#{$font-root}wagtail.eot?#iefix") format("embedded-opentype"), + url("#{$font-root}wagtail.ttf") format("truetype"), + url("#{$font-root}wagtail.svg#wagtail") format("svg"), + url("#{$font-root}wagtail.woff") format("woff"); + font-weight: normal; + font-style: normal; +} +/* fix to make chrome on windows use svg, which renders better */ +@media screen and (-webkit-min-device-pixel-ratio:0) { + @font-face { + font-family: "wagtail"; + src: url("#{$font-root}wagtail.svg#wagtail") format("svg"); + } +} diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/grid.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/grid.scss similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/grid.scss rename to wagtail/wagtailadmin/static_src/wagtailadmin/scss/grid.scss diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/home.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/layouts/home.scss similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/home.scss rename to wagtail/wagtailadmin/static_src/wagtailadmin/scss/layouts/home.scss diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/login.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/layouts/login.scss similarity index 99% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/login.scss rename to wagtail/wagtailadmin/static_src/wagtailadmin/scss/layouts/login.scss index 5cbba03f19..1236fdbb8b 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/login.scss +++ b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/layouts/login.scss @@ -179,4 +179,4 @@ form{ } } } -} \ No newline at end of file +} diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/layouts/page-editor.scss similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss rename to wagtail/wagtailadmin/static_src/wagtailadmin/scss/layouts/page-editor.scss diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/preview.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/layouts/preview.scss similarity index 99% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/preview.scss rename to wagtail/wagtailadmin/static_src/wagtailadmin/scss/layouts/preview.scss index 545c0e7baf..37e59f555b 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/preview.scss +++ b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/layouts/preview.scss @@ -83,4 +83,4 @@ html,body { @-moz-keyframes spin { from { -moz-transform: rotate(0deg); } to { -moz-transform: rotate(360deg); } -} \ No newline at end of file +} diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/mixins.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/mixins.scss similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/mixins.scss rename to wagtail/wagtailadmin/static_src/wagtailadmin/scss/mixins.scss diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/panels/rich-text.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/panels/rich-text.scss similarity index 99% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/panels/rich-text.scss rename to wagtail/wagtailadmin/static_src/wagtailadmin/scss/panels/rich-text.scss index 3734fdfa4b..3719be5e8b 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/panels/rich-text.scss +++ b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/panels/rich-text.scss @@ -169,4 +169,4 @@ .hallotoolbar.full{ margin-left:$desktop-nice-padding; } -} \ No newline at end of file +} diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/userbar.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/userbar.scss similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/userbar.scss rename to wagtail/wagtailadmin/static_src/wagtailadmin/scss/userbar.scss diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/userbar_embed.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/userbar_embed.scss similarity index 100% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/userbar_embed.scss rename to wagtail/wagtailadmin/static_src/wagtailadmin/scss/userbar_embed.scss diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/variables.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/variables.scss similarity index 96% rename from wagtail/wagtailadmin/static/wagtailadmin/scss/variables.scss rename to wagtail/wagtailadmin/static_src/wagtailadmin/scss/variables.scss index c016d50c3b..8908df87d4 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/variables.scss +++ b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/variables.scss @@ -6,7 +6,7 @@ CSS into ${STATIC_URL}/CACHE/css/ regardless of compilation mode, so we can reliably use relative paths to get back to STATIC_URL. */ $static-root: "../../wagtailadmin/images/"; -$css-root: "../../wagtailadmin/scss/"; +$font-root: "../../wagtailadmin/fonts/"; /* grid settings */ $grid-columns: 12; @@ -62,4 +62,4 @@ $color-text-input: $color-grey-1; /* misc sizing */ $thumbnail-width: 130px; -$menu-width: 180px; \ No newline at end of file +$menu-width: 180px; diff --git a/wagtail/wagtaildocs/.gitignore b/wagtail/wagtaildocs/.gitignore new file mode 100644 index 0000000000..980c85122d --- /dev/null +++ b/wagtail/wagtaildocs/.gitignore @@ -0,0 +1 @@ +static/ diff --git a/wagtail/wagtaildocs/static/wagtaildocs/js/document-chooser.js b/wagtail/wagtaildocs/static_src/wagtaildocs/js/document-chooser.js similarity index 100% rename from wagtail/wagtaildocs/static/wagtaildocs/js/document-chooser.js rename to wagtail/wagtaildocs/static_src/wagtaildocs/js/document-chooser.js diff --git a/wagtail/wagtaildocs/static/wagtaildocs/js/hallo-plugins/hallo-wagtaildoclink.js b/wagtail/wagtaildocs/static_src/wagtaildocs/js/hallo-plugins/hallo-wagtaildoclink.js similarity index 100% rename from wagtail/wagtaildocs/static/wagtaildocs/js/hallo-plugins/hallo-wagtaildoclink.js rename to wagtail/wagtaildocs/static_src/wagtaildocs/js/hallo-plugins/hallo-wagtaildoclink.js diff --git a/wagtail/wagtailembeds/.gitignore b/wagtail/wagtailembeds/.gitignore new file mode 100644 index 0000000000..980c85122d --- /dev/null +++ b/wagtail/wagtailembeds/.gitignore @@ -0,0 +1 @@ +static/ diff --git a/wagtail/wagtailembeds/static/wagtailembeds/js/hallo-plugins/hallo-wagtailembeds.js b/wagtail/wagtailembeds/static_src/wagtailembeds/js/hallo-plugins/hallo-wagtailembeds.js similarity index 100% rename from wagtail/wagtailembeds/static/wagtailembeds/js/hallo-plugins/hallo-wagtailembeds.js rename to wagtail/wagtailembeds/static_src/wagtailembeds/js/hallo-plugins/hallo-wagtailembeds.js diff --git a/wagtail/wagtailforms/.gitignore b/wagtail/wagtailforms/.gitignore new file mode 100644 index 0000000000..980c85122d --- /dev/null +++ b/wagtail/wagtailforms/.gitignore @@ -0,0 +1 @@ +static/ diff --git a/wagtail/wagtailforms/static/wagtailforms/js/page-editor.js b/wagtail/wagtailforms/static_src/wagtailforms/js/page-editor.js similarity index 100% rename from wagtail/wagtailforms/static/wagtailforms/js/page-editor.js rename to wagtail/wagtailforms/static_src/wagtailforms/js/page-editor.js diff --git a/wagtail/wagtailimages/.gitignore b/wagtail/wagtailimages/.gitignore new file mode 100644 index 0000000000..7b4d4ba2e6 --- /dev/null +++ b/wagtail/wagtailimages/.gitignore @@ -0,0 +1 @@ +static diff --git a/wagtail/wagtailimages/static/wagtailimages/css/.gitignore b/wagtail/wagtailimages/static/wagtailimages/css/.gitignore deleted file mode 100644 index 4f1174df98..0000000000 --- a/wagtail/wagtailimages/static/wagtailimages/css/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -add-multiple.css -focal-point-chooser.css diff --git a/wagtail/wagtailimages/static/wagtailimages/css/vendor/Jcrop.gif b/wagtail/wagtailimages/static_src/wagtailimages/css/vendor/Jcrop.gif similarity index 100% rename from wagtail/wagtailimages/static/wagtailimages/css/vendor/Jcrop.gif rename to wagtail/wagtailimages/static_src/wagtailimages/css/vendor/Jcrop.gif diff --git a/wagtail/wagtailimages/static/wagtailimages/css/vendor/jquery.Jcrop.min.css b/wagtail/wagtailimages/static_src/wagtailimages/css/vendor/jquery.Jcrop.min.css similarity index 100% rename from wagtail/wagtailimages/static/wagtailimages/css/vendor/jquery.Jcrop.min.css rename to wagtail/wagtailimages/static_src/wagtailimages/css/vendor/jquery.Jcrop.min.css diff --git a/wagtail/wagtailimages/static/wagtailimages/js/add-multiple.js b/wagtail/wagtailimages/static_src/wagtailimages/js/add-multiple.js similarity index 100% rename from wagtail/wagtailimages/static/wagtailimages/js/add-multiple.js rename to wagtail/wagtailimages/static_src/wagtailimages/js/add-multiple.js diff --git a/wagtail/wagtailimages/static/wagtailimages/js/focal-point-chooser.js b/wagtail/wagtailimages/static_src/wagtailimages/js/focal-point-chooser.js similarity index 100% rename from wagtail/wagtailimages/static/wagtailimages/js/focal-point-chooser.js rename to wagtail/wagtailimages/static_src/wagtailimages/js/focal-point-chooser.js diff --git a/wagtail/wagtailimages/static/wagtailimages/js/hallo-plugins/hallo-wagtailimage.js b/wagtail/wagtailimages/static_src/wagtailimages/js/hallo-plugins/hallo-wagtailimage.js similarity index 100% rename from wagtail/wagtailimages/static/wagtailimages/js/hallo-plugins/hallo-wagtailimage.js rename to wagtail/wagtailimages/static_src/wagtailimages/js/hallo-plugins/hallo-wagtailimage.js diff --git a/wagtail/wagtailimages/static/wagtailimages/js/image-chooser.js b/wagtail/wagtailimages/static_src/wagtailimages/js/image-chooser.js similarity index 100% rename from wagtail/wagtailimages/static/wagtailimages/js/image-chooser.js rename to wagtail/wagtailimages/static_src/wagtailimages/js/image-chooser.js diff --git a/wagtail/wagtailimages/static/wagtailimages/js/image-url-generator.js b/wagtail/wagtailimages/static_src/wagtailimages/js/image-url-generator.js similarity index 100% rename from wagtail/wagtailimages/static/wagtailimages/js/image-url-generator.js rename to wagtail/wagtailimages/static_src/wagtailimages/js/image-url-generator.js diff --git a/wagtail/wagtailimages/static/wagtailimages/js/vendor/canvas-to-blob.min.js b/wagtail/wagtailimages/static_src/wagtailimages/js/vendor/canvas-to-blob.min.js similarity index 100% rename from wagtail/wagtailimages/static/wagtailimages/js/vendor/canvas-to-blob.min.js rename to wagtail/wagtailimages/static_src/wagtailimages/js/vendor/canvas-to-blob.min.js diff --git a/wagtail/wagtailimages/static/wagtailimages/js/vendor/jquery.Jcrop.min.js b/wagtail/wagtailimages/static_src/wagtailimages/js/vendor/jquery.Jcrop.min.js similarity index 100% rename from wagtail/wagtailimages/static/wagtailimages/js/vendor/jquery.Jcrop.min.js rename to wagtail/wagtailimages/static_src/wagtailimages/js/vendor/jquery.Jcrop.min.js diff --git a/wagtail/wagtailimages/static/wagtailimages/js/vendor/jquery.fileupload-image.js b/wagtail/wagtailimages/static_src/wagtailimages/js/vendor/jquery.fileupload-image.js similarity index 100% rename from wagtail/wagtailimages/static/wagtailimages/js/vendor/jquery.fileupload-image.js rename to wagtail/wagtailimages/static_src/wagtailimages/js/vendor/jquery.fileupload-image.js diff --git a/wagtail/wagtailimages/static/wagtailimages/js/vendor/jquery.fileupload-process.js b/wagtail/wagtailimages/static_src/wagtailimages/js/vendor/jquery.fileupload-process.js similarity index 100% rename from wagtail/wagtailimages/static/wagtailimages/js/vendor/jquery.fileupload-process.js rename to wagtail/wagtailimages/static_src/wagtailimages/js/vendor/jquery.fileupload-process.js diff --git a/wagtail/wagtailimages/static/wagtailimages/js/vendor/jquery.fileupload-validate.js b/wagtail/wagtailimages/static_src/wagtailimages/js/vendor/jquery.fileupload-validate.js similarity index 100% rename from wagtail/wagtailimages/static/wagtailimages/js/vendor/jquery.fileupload-validate.js rename to wagtail/wagtailimages/static_src/wagtailimages/js/vendor/jquery.fileupload-validate.js diff --git a/wagtail/wagtailimages/static/wagtailimages/js/vendor/jquery.fileupload.js b/wagtail/wagtailimages/static_src/wagtailimages/js/vendor/jquery.fileupload.js similarity index 100% rename from wagtail/wagtailimages/static/wagtailimages/js/vendor/jquery.fileupload.js rename to wagtail/wagtailimages/static_src/wagtailimages/js/vendor/jquery.fileupload.js diff --git a/wagtail/wagtailimages/static/wagtailimages/js/vendor/jquery.iframe-transport.js b/wagtail/wagtailimages/static_src/wagtailimages/js/vendor/jquery.iframe-transport.js similarity index 100% rename from wagtail/wagtailimages/static/wagtailimages/js/vendor/jquery.iframe-transport.js rename to wagtail/wagtailimages/static_src/wagtailimages/js/vendor/jquery.iframe-transport.js diff --git a/wagtail/wagtailimages/static/wagtailimages/js/vendor/load-image.min.js b/wagtail/wagtailimages/static_src/wagtailimages/js/vendor/load-image.min.js similarity index 100% rename from wagtail/wagtailimages/static/wagtailimages/js/vendor/load-image.min.js rename to wagtail/wagtailimages/static_src/wagtailimages/js/vendor/load-image.min.js diff --git a/wagtail/wagtailimages/static/wagtailimages/scss/add-multiple.scss b/wagtail/wagtailimages/static_src/wagtailimages/scss/add-multiple.scss similarity index 99% rename from wagtail/wagtailimages/static/wagtailimages/scss/add-multiple.scss rename to wagtail/wagtailimages/static_src/wagtailimages/scss/add-multiple.scss index 9893f23774..7d1d1b6822 100644 --- a/wagtail/wagtailimages/static/wagtailimages/scss/add-multiple.scss +++ b/wagtail/wagtailimages/static_src/wagtailimages/scss/add-multiple.scss @@ -121,4 +121,4 @@ display:block; } } -} \ No newline at end of file +} diff --git a/wagtail/wagtailimages/static/wagtailimages/scss/focal-point-chooser.scss b/wagtail/wagtailimages/static_src/wagtailimages/scss/focal-point-chooser.scss similarity index 99% rename from wagtail/wagtailimages/static/wagtailimages/scss/focal-point-chooser.scss rename to wagtail/wagtailimages/static_src/wagtailimages/scss/focal-point-chooser.scss index 2e36063dfd..d1a022f6b7 100644 --- a/wagtail/wagtailimages/static/wagtailimages/scss/focal-point-chooser.scss +++ b/wagtail/wagtailimages/static_src/wagtailimages/scss/focal-point-chooser.scss @@ -19,4 +19,4 @@ &:hover .current-focal-point-indicator{ opacity:0; } -} \ No newline at end of file +} diff --git a/wagtail/wagtailsnippets/.gitignore b/wagtail/wagtailsnippets/.gitignore new file mode 100644 index 0000000000..980c85122d --- /dev/null +++ b/wagtail/wagtailsnippets/.gitignore @@ -0,0 +1 @@ +static/ diff --git a/wagtail/wagtailsnippets/static/wagtailsnippets/js/snippet-chooser.js b/wagtail/wagtailsnippets/static_src/wagtailsnippets/js/snippet-chooser.js similarity index 100% rename from wagtail/wagtailsnippets/static/wagtailsnippets/js/snippet-chooser.js rename to wagtail/wagtailsnippets/static_src/wagtailsnippets/js/snippet-chooser.js diff --git a/wagtail/wagtailusers/.gitignore b/wagtail/wagtailusers/.gitignore new file mode 100644 index 0000000000..7b4d4ba2e6 --- /dev/null +++ b/wagtail/wagtailusers/.gitignore @@ -0,0 +1 @@ +static diff --git a/wagtail/wagtailusers/static/wagtailusers/css/.gitignore b/wagtail/wagtailusers/static/wagtailusers/css/.gitignore deleted file mode 100644 index 6847d9b206..0000000000 --- a/wagtail/wagtailusers/static/wagtailusers/css/.gitignore +++ /dev/null @@ -1 +0,0 @@ -groups_edit.css diff --git a/wagtail/wagtailusers/static/wagtailusers/scss/groups_edit.scss b/wagtail/wagtailusers/static_src/wagtailusers/scss/groups_edit.scss similarity index 100% rename from wagtail/wagtailusers/static/wagtailusers/scss/groups_edit.scss rename to wagtail/wagtailusers/static_src/wagtailusers/scss/groups_edit.scss From 2af8fdf8b6b4a7f4d5bac0f8cf62e31b7587e96c Mon Sep 17 00:00:00 2001 From: Tim Heap Date: Thu, 30 Apr 2015 15:24:45 +1000 Subject: [PATCH 5/7] Build assest as part of watching them --- gulpfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulpfile.js b/gulpfile.js index 306f0f2834..3ae9846a81 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -4,7 +4,7 @@ var rename = require('gulp-rename'); var path = require('path'); -gulp.task('default', ['watch']); +gulp.task('default', ['build', 'watch']); gulp.task('build', ['styles', 'javascript', 'images', 'fonts']); From 4614526416a70f7a93a9cc846a137510d52e3ee1 Mon Sep 17 00:00:00 2001 From: Tim Heap Date: Thu, 30 Apr 2015 15:25:28 +1000 Subject: [PATCH 6/7] Move `require()` calls out of gulp tasks --- gulpfile.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 3ae9846a81..1f82a888b7 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -102,14 +102,14 @@ gulp.task('watch', ['build'], function () { gulp.task('styles', ['styles:sass', 'styles:css']); // SASS - Compile and move sass +var sass = require('gulp-sass'); +var autoprefixer = require('gulp-autoprefixer'); gulp.task('styles:sass', 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/sass/mixins.scss // Thus, each app is used as an includePath. - var includePaths = flatten(apps.map(function(app) { return app.scssIncludePaths() })) + var includePaths = flatten(apps.map(function(app) { return app.scssIncludePaths(); })); // Not all files in a directory need to be compiled, so each app defines // its own Sass files that need to be compiled. From 676799da45d8dd6640d18855ff4ceec174cbd73a Mon Sep 17 00:00:00 2001 From: Tim Heap Date: Tue, 5 May 2015 22:23:05 +1000 Subject: [PATCH 7/7] Add docs on compiling the static admin assets --- docs/contributing/developing.rst | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/docs/contributing/developing.rst b/docs/contributing/developing.rst index 3297268b71..63bc7463a8 100644 --- a/docs/contributing/developing.rst +++ b/docs/contributing/developing.rst @@ -82,6 +82,30 @@ If your Elasticsearch instance is located somewhere else, you can set the If you no longer want Wagtail to test against Elasticsearch, uninstall the ``elasticsearch`` package. +Compiling static assets +~~~~~~~~~~~~~~~~~~~~~~~ + +All static assets such as JavaScript, CSS, images, and fonts for the Wagtail admin are compiled from their respective sources by ``gulp``. The compiled assets are not committed to the repository, and are compiled before packaging each new release. Compiled assets should not be submitted as part of a pull request. + +To compile the assets, Node.js and the compilation tool chain need to be installed. Instructions for installing Node.js can be found on the `Node.js download page `_. Once Node.js is installed, installing the tool chain is done via ``npm``: + +.. code-block:: bash + + $ cd /path/to/wagtail + $ npm install + +To compile the assets, run: + +.. code-block:: bash + + $ npm run build + +This must be done after every change to the source files. To watch the source files for changes and then automatically recompile the assets, run: + +.. code-block:: bash + + $ npm start + Styleguide ~~~~~~~~~~