From a784ddad4fb51b396b613c4c2eec34ab74f3c26d Mon Sep 17 00:00:00 2001 From: Anna Sidwell Date: Fri, 12 Oct 2018 20:00:55 -0400 Subject: [PATCH] Move some utility classes into a shared location --- apps/map/templates/map/form-selector.html | 7 ------- assets/css/ojuso.css | 8 ++++++++ ojusomap/settings.py | 3 +++ ojusomap/templates/base.html | 9 +++++---- 4 files changed, 16 insertions(+), 11 deletions(-) create mode 100644 assets/css/ojuso.css diff --git a/apps/map/templates/map/form-selector.html b/apps/map/templates/map/form-selector.html index f4b76fb..5b1a27f 100644 --- a/apps/map/templates/map/form-selector.html +++ b/apps/map/templates/map/form-selector.html @@ -7,8 +7,6 @@ {% block stylesheets %} {{ block.super }} {% endblock %} diff --git a/assets/css/ojuso.css b/assets/css/ojuso.css new file mode 100644 index 0000000..6e2f94b --- /dev/null +++ b/assets/css/ojuso.css @@ -0,0 +1,8 @@ +/* Make sure that the footer doesn't have space after it */ +.container { min-height: 60vh; } + +/* Colour utility classes */ +.ojuso-red { color: #ea4639; } +.ojuso-green { color: #4ac95d; } +.ojuso-yellow { color: #f9db3c; } +.ojuso-blue { color: #008ad5; } diff --git a/ojusomap/settings.py b/ojusomap/settings.py index d2d7af5..1cce276 100644 --- a/ojusomap/settings.py +++ b/ojusomap/settings.py @@ -206,6 +206,9 @@ AWS_SECRET_ACCESS_KEY = "pTZAnmtvGzFBdI/jwtwRoFW5eK7eJ8FLFxr1/Jb+Yq4" STATIC_ROOT = os.path.join(BASE_DIR, 'static/') STATIC_URL = os.getenv("STATIC_URL", '/static/') +STATICFILES_DIRS = [ + os.path.join(BASE_DIR, "assets") +] STATICFILES_FINDERS = [ 'django.contrib.staticfiles.finders.FileSystemFinder', 'django.contrib.staticfiles.finders.AppDirectoriesFinder', diff --git a/ojusomap/templates/base.html b/ojusomap/templates/base.html index bd3e79a..2563c8e 100644 --- a/ojusomap/templates/base.html +++ b/ojusomap/templates/base.html @@ -7,10 +7,11 @@ - - - - + + + + + {% block page_title %}Ojuso{% endblock %}