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