From 5d51759a92f2b8f7eeef6442c26bc7a3d70b571f Mon Sep 17 00:00:00 2001 From: Nicholas Antonov Date: Tue, 30 Jan 2018 12:40:50 -0500 Subject: [PATCH 1/3] add files (imports fail) --- frontend/templates/base.html | 1 + frontend/templates/work.html | 1 - settings/common.py | 3 +++ static/scss/foundation | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) create mode 160000 static/scss/foundation diff --git a/frontend/templates/base.html b/frontend/templates/base.html index 72d8298d..8eddfbfb 100644 --- a/frontend/templates/base.html +++ b/frontend/templates/base.html @@ -12,6 +12,7 @@ {% block extra_css %}{% endblock %} + diff --git a/frontend/templates/work.html b/frontend/templates/work.html index 0647decb..993dec79 100644 --- a/frontend/templates/work.html +++ b/frontend/templates/work.html @@ -14,7 +14,6 @@ {% endblock %} {% block extra_css %} - {% if user.is_staff or user in work.last_campaign.managers.all %} {{ kwform.media.css }} diff --git a/settings/common.py b/settings/common.py index ee78c08a..90a4963c 100644 --- a/settings/common.py +++ b/settings/common.py @@ -191,6 +191,9 @@ SASS_PROCESSOR_INCLUDE_DIRS = [ os.path.join(PROJECT_DIR), os.path.join(PROJECT_DIR, 'static', 'scss'), os.path.join('static', 'scss'), + os.path.join(PROJECT_DIR, 'static', 'scss', 'foundation', 'scss'), + os.path.join('static', 'scss', 'foundation', 'scss'), + # static/scss/foundation/scss/foundation.scss ] diff --git a/static/scss/foundation b/static/scss/foundation new file mode 160000 index 00000000..85c4e889 --- /dev/null +++ b/static/scss/foundation @@ -0,0 +1 @@ +Subproject commit 85c4e889ab8b1ab7ebda94fbc723330402191683 From 47f81b141a6b92f3a70edd3b53bbf9e17d863412 Mon Sep 17 00:00:00 2001 From: Nicholas Antonov Date: Tue, 30 Jan 2018 13:48:53 -0500 Subject: [PATCH 2/3] Include all of foundation --- static/scss/global.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/static/scss/global.scss b/static/scss/global.scss index 453aeb84..c6b75c82 100644 --- a/static/scss/global.scss +++ b/static/scss/global.scss @@ -1,3 +1,3 @@ -* { - color: red ; -} \ No newline at end of file +@import 'settings/settings'; +@import 'foundation'; +@include foundation-everything; \ No newline at end of file From 08e09b76539e127046080c90019284edef1fbc79 Mon Sep 17 00:00:00 2001 From: Nicholas Antonov Date: Tue, 30 Jan 2018 14:00:49 -0500 Subject: [PATCH 3/3] readd campaign css --- frontend/templates/work.html | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/templates/work.html b/frontend/templates/work.html index 993dec79..0647decb 100644 --- a/frontend/templates/work.html +++ b/frontend/templates/work.html @@ -14,6 +14,7 @@ {% endblock %} {% block extra_css %} + {% if user.is_staff or user in work.last_campaign.managers.all %} {{ kwform.media.css }}