All static media is run through "collectstatic"

mtruyens · Aug 7, 2018 · 17bcb7f · 17bcb7f
1 parent ae9a6d3
commit 17bcb7f
Show file tree

Hide file tree

Showing 15 changed files with 19 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -32,6 +32,7 @@ media/json
 media/man
 media/pdf
 media/static
+/static
 node_modules
 package-lock.json
 readthedocs/rtd_tests/builds

diff --git a/media/css/badge_only.css b/media/css/badge_only.css
@@ -1 +1 @@
-../static/core/css/badge_only.css
+../../readthedocs/core/static/core/css/badge_only.css
diff --git a/media/css/sphinx_rtd_theme.css b/media/css/sphinx_rtd_theme.css
@@ -1 +1 @@
-../static/core/css/theme.css
+../../readthedocs/core/static/core/css/theme.css
diff --git a/media/font/fontawesome_webfont.eot b/media/font/fontawesome_webfont.eot
@@ -1 +1 @@
-../static/core/font/fontawesome-webfont.eot
+../../readthedocs/core/static/core/font/fontawesome-webfont.eot
diff --git a/media/font/fontawesome_webfont.svg b/media/font/fontawesome_webfont.svg
@@ -1 +1 @@
-../static/core/font/fontawesome-webfont.svg
+../../readthedocs/core/static/core/font/fontawesome-webfont.svg
diff --git a/media/font/fontawesome_webfont.ttf b/media/font/fontawesome_webfont.ttf
@@ -1 +1 @@
-../static/core/font/fontawesome-webfont.ttf
+../../readthedocs/core/static/core/font/fontawesome-webfont.ttf
diff --git a/media/font/fontawesome_webfont.woff b/media/font/fontawesome_webfont.woff
@@ -1 +1 @@
-../static/core/font/fontawesome-webfont.woff
+../../readthedocs/core/static/core/font/fontawesome-webfont.woff
diff --git a/media/font/fontawesome_webfont.woff2 b/media/font/fontawesome_webfont.woff2
@@ -0,0 +1 @@
+../../readthedocs/core/static/core/font/fontawesome-webfont.woff2
diff --git a/media/fonts b/media/fonts
@@ -1 +1 @@
-static/core/font/
+../readthedocs/core/static/core/font
diff --git a/media/javascript/jquery/jquery-2.0.3.min.js b/media/javascript/jquery/jquery-2.0.3.min.js
@@ -1 +1 @@
-../../static/vendor/jquery-standalone.js
+../../../readthedocs/static/vendor/jquery-standalone.js
diff --git a/media/javascript/jquery/jquery-migrate-1.2.1.min.js b/media/javascript/jquery/jquery-migrate-1.2.1.min.js
@@ -1 +1 @@
-../../static/vendor/jquery-migrate-standalone.js
+../../../readthedocs/static/vendor/jquery-migrate-standalone.js
diff --git a/media/javascript/jquery/jquery-ui-1.8.24.custom.min.js b/media/javascript/jquery/jquery-ui-1.8.24.custom.min.js
@@ -1 +1 @@
-../../static/vendor/jquery-ui-standalone.js
+../../../readthedocs/static/vendor/jquery-ui-standalone.js
diff --git a/media/javascript/readthedocs-doc-embed.js b/media/javascript/readthedocs-doc-embed.js
@@ -1 +1 @@
-../static/core/js/readthedocs-doc-embed.js
+../../readthedocs/core/static/core/js/readthedocs-doc-embed.js
diff --git a/media/javascript/underscore.js b/media/javascript/underscore.js
@@ -1 +1 @@
-../static/vendor/underscore-standalone.js
+../../readthedocs/static/vendor/underscore-standalone.js
diff --git a/readthedocs/settings/base.py b/readthedocs/settings/base.py
@@ -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 = [
         {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../static/core/css/badge_only.css
		../../readthedocs/core/static/core/css/badge_only.css
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../static/core/css/theme.css
		../../readthedocs/core/static/core/css/theme.css
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../static/core/font/fontawesome-webfont.eot
		../../readthedocs/core/static/core/font/fontawesome-webfont.eot
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../readthedocs/core/static/core/font/fontawesome-webfont.woff2
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		static/core/font/
		../readthedocs/core/static/core/font
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../../static/vendor/jquery-standalone.js
		../../../readthedocs/static/vendor/jquery-standalone.js
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../../static/vendor/jquery-migrate-standalone.js
		../../../readthedocs/static/vendor/jquery-migrate-standalone.js
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../../static/vendor/jquery-ui-standalone.js
		../../../readthedocs/static/vendor/jquery-ui-standalone.js
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../static/core/js/readthedocs-doc-embed.js
		../../readthedocs/core/static/core/js/readthedocs-doc-embed.js
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../static/vendor/underscore-standalone.js
		../../readthedocs/static/vendor/underscore-standalone.js