Move assets/ to live under static/.

This decreases the clutter in the root directory of the Zulip
repository.
This commit is contained in:
Tim Abbott 2016-08-25 20:06:07 -07:00
parent d8aed0227a
commit b200c6cdc0
13 changed files with 5 additions and 5 deletions

2
.gitattributes vendored
View File

@ -1,7 +1,7 @@
.gitignore export-ignore
.gitattributes export-ignore
/analytics export-ignore
/assets export-ignore
/static/assets export-ignore
/bots export-ignore
/corporate export-ignore
/static export-ignore

View File

@ -58,8 +58,8 @@ templating systems.
* `node_modules/` Third-party JavaScript installed via `npm`.
* `assets/` For assets not to be served to the web (e.g. the system to
generate our favicons).
* `static/assets/` For assets not to be served to the web (e.g. the system to
generate our favicons).
-----------------------------------------------------------------------

View File

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

View File

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 5.1 KiB

View File

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

View File

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

View File

@ -6,4 +6,4 @@ rm -rf static/third/gemoji/images
(cd tools/setup/emoji_dump && python ./emoji_dump.py)
mkdir -p static/third/gemoji/images
mv tools/setup/emoji_dump/out static/third/gemoji/images/emoji
cp -RPp assets/zulip-emoji/* static/third/gemoji/images/emoji/
cp -RPp static/assets/zulip-emoji/* static/third/gemoji/images/emoji/

View File

@ -44,7 +44,7 @@ subprocess.check_call(['bash', '-ex', 'tools/setup/download-zxcvbn'],
stdout=fp, stderr=fp)
# Collect the files that we're going to serve.
subprocess.check_call(['python', './manage.py', 'collectstatic', '--noinput'],
subprocess.check_call(['python', './manage.py', 'collectstatic', '--noinput', '-i', 'assets'],
stdout=fp, stderr=fp)
# Compile translation strings to generate `.mo` files.