From ac932e85e5c08d4d9b53653dc50495915372f3d5 Mon Sep 17 00:00:00 2001 From: Nick Sergeant Date: Mon, 20 Oct 2014 20:35:59 -0400 Subject: [PATCH] Staticfiles stuff. --- Makefile | 2 +- .../blogs/themes/pro-adams/base.html | 14 +-- media/css/blog-themes/default/style.css | 2 +- media/css/blog-themes/default/style.scss | 4 +- media/css/blog-themes/pro-adams/style.css | 2 +- media/css/blog-themes/pro-adams/style.scss | 2 +- media/css/pro.css | 2 +- media/css/snipt.css | 2 +- media/js/snipt-all.min.js | 4 +- media/js/src/account.js | 8 +- media/js/src/application.js | 30 +++--- snipts/templates/snipts/raw.html | 4 +- .../templates/snipts/snipt-js-template.html | 2 +- snipts/templates/snipts/snipt-list.html | 2 +- templates/base.html | 96 +++++++++---------- templates/homepage.html | 2 +- templates/pro.html | 8 +- 17 files changed, 93 insertions(+), 93 deletions(-) diff --git a/Makefile b/Makefile index 3704bc1..e3bec6f 100644 --- a/Makefile +++ b/Makefile @@ -65,7 +65,7 @@ deploy: media/js/src/pro.js \ > media/js/pro-all.min.js - @/Users/Nick/.virtualenvs/snipt/bin/python manage.py collectstatic --noinput + /Users/Nick/.virtualenvs/snipt/bin/python manage.py collectstatic --noinput @git push heroku heroku:master diff --git a/blogs/templates/blogs/themes/pro-adams/base.html b/blogs/templates/blogs/themes/pro-adams/base.html index 4d93d87..38287f9 100644 --- a/blogs/templates/blogs/themes/pro-adams/base.html +++ b/blogs/templates/blogs/themes/pro-adams/base.html @@ -27,15 +27,15 @@ {% endif %} {% if debug %} - - - - + + + + {% else %} - + {% endif %} - + {% if custom_css %}