change favicons

set static file collection dirs

diff --git a/meta/static/apple-touch-icon-precomposed.png b/meta/static/apple-touch-icon-precomposed.png
index 1ea85edc6fd9d63f688509c47959a98e10a1c0d0..a951a1034afb586dbd1d6996f4c789ddfa42e5e0 100644 (file)
Binary files a/meta/static/apple-touch-icon-precomposed.png and b/meta/static/apple-touch-icon-precomposed.png differ

diff --git a/meta/static/favicon.ico b/meta/static/favicon.ico
index be74abd69ad6a32de7375df13cab9354798e328f..26cb573abb81f1a0bbf7d716823d3fe5c0da3c99 100644 (file)
Binary files a/meta/static/favicon.ico and b/meta/static/favicon.ico differ

diff --git a/mlpccg-web/settings.py b/mlpccg-web/settings.py
index a7a281483cad8587efb1e67705ffbaf61d31a418..41d78fb43136f14b32e9227ab26f609a3b8f5afb 100644 (file)
--- a/mlpccg-web/settings.py
+++ b/mlpccg-web/settings.py
@@ -24,7 +24,7 @@ DEBUG = False
 
 TEMPLATE_DEBUG = False
 
-ALLOWED_HOSTS = []
+ALLOWED_HOSTS = ['.yukkurigames.com', 'mlpccg-meta.local']
 
 
 # Application definition
@@ -81,4 +81,5 @@ USE_TZ = True
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.6/howto/static-files/
 
-STATIC_URL = '/static/'
+STATIC_URL = 'http://mlpccg-meta.local/meta/static/'
+STATIC_ROOT = '/home/jessicatz/Bin/htdocs/meta/static/'