Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

All static media is run through "collectstatic" #4489

Merged
merged 4 commits into from
Aug 14, 2018
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
All static media is run through "collectstatic"
davidfischer committed Aug 7, 2018

Verified

This commit was signed with the committer’s verified signature.
hameerabbasi Hameer Abbasi
commit 17bcb7f641f1cade3b986bf1af7ecf5a43d7b274
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -32,6 +32,7 @@ media/json
media/man
media/pdf
media/static
/static
node_modules
package-lock.json
readthedocs/rtd_tests/builds
2 changes: 1 addition & 1 deletion media/css/badge_only.css
2 changes: 1 addition & 1 deletion media/css/sphinx_rtd_theme.css
2 changes: 1 addition & 1 deletion media/font/fontawesome_webfont.eot
2 changes: 1 addition & 1 deletion media/font/fontawesome_webfont.svg
2 changes: 1 addition & 1 deletion media/font/fontawesome_webfont.ttf
2 changes: 1 addition & 1 deletion media/font/fontawesome_webfont.woff
1 change: 1 addition & 0 deletions media/font/fontawesome_webfont.woff2
2 changes: 1 addition & 1 deletion media/fonts
2 changes: 1 addition & 1 deletion media/javascript/jquery/jquery-2.0.3.min.js
2 changes: 1 addition & 1 deletion media/javascript/jquery/jquery-migrate-1.2.1.min.js
2 changes: 1 addition & 1 deletion media/javascript/jquery/jquery-ui-1.8.24.custom.min.js
2 changes: 1 addition & 1 deletion media/javascript/readthedocs-doc-embed.js
2 changes: 1 addition & 1 deletion media/javascript/underscore.js
7 changes: 5 additions & 2 deletions readthedocs/settings/base.py
Original file line number Diff line number Diff line change
@@ -167,12 +167,15 @@ def USE_PROMOS(self): # noqa
PRODUCTION_MEDIA_ARTIFACTS = os.path.join(PRODUCTION_ROOT, 'media')

# Assets and media
STATIC_ROOT = os.path.join(SITE_ROOT, 'media/static/')
STATIC_ROOT = os.path.join(SITE_ROOT, 'static')
STATIC_URL = '/static/'
MEDIA_ROOT = os.path.join(SITE_ROOT, 'media/')
MEDIA_URL = '/media/'
ADMIN_MEDIA_PREFIX = '/media/admin/'
STATICFILES_DIRS = [os.path.join(SITE_ROOT, 'readthedocs', 'static')]
STATICFILES_DIRS = [
os.path.join(SITE_ROOT, 'media'),
os.path.join(SITE_ROOT, 'readthedocs', 'static'),
]

TEMPLATES = [
{