diff --git a/.gitignore b/.gitignore index 51d4744..8d4e2a6 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ mhackspace/media/* __pycache__/ node_modules src -.env \ No newline at end of file +.env +staticfiles/* diff --git a/config/settings/common.py b/config/settings/common.py index fc4941c..6f767f0 100644 --- a/config/settings/common.py +++ b/config/settings/common.py @@ -192,7 +192,7 @@ STATICFILES_FINDERS = ( 'django.contrib.staticfiles.finders.AppDirectoriesFinder', 'sass_processor.finders.CssFinder', ) - +SASS_PROCESSOR_AUTO_INCLUDE = True # MEDIA CONFIGURATION # ------------------------------------------------------------------------------ # See: https://docs.djangoproject.com/en/dev/ref/settings/#media-root @@ -292,3 +292,5 @@ PAYMENT_PROVIDERS = { } } +SASS_PRECISION = 8 + diff --git a/config/settings/local.py b/config/settings/local.py index f70d9c7..b6def96 100644 --- a/config/settings/local.py +++ b/config/settings/local.py @@ -89,3 +89,5 @@ CAPTCHA = { 'secret': '', 'site': '' } + +SASS_PROCESSOR_AUTO_INCLUDE = False diff --git a/mhackspace/static/images/membership_card_background.png b/mhackspace/static/images/membership_card_background.png new file mode 100644 index 0000000..da7cc44 Binary files /dev/null and b/mhackspace/static/images/membership_card_background.png differ diff --git a/mhackspace/static/sass/components/_membership.scss b/mhackspace/static/sass/components/_membership.scss new file mode 100644 index 0000000..82c5205 --- /dev/null +++ b/mhackspace/static/sass/components/_membership.scss @@ -0,0 +1,13 @@ +#membercard { + color: #000; + background-color: #8C50A5; + border-radius: 14px; + box-shadow: 0 2px 5px 0 rgba(0,0,0,0.5); + background-image: url('/static/images/membership_card_background.png'); + width: 430px; + height: 240px; + margin-left: 20px; + text-shadow: 1px 1px #FFF; + position: relative; + float: right; +} diff --git a/mhackspace/static/sass/project.scss b/mhackspace/static/sass/project.scss index 2265e89..dc86b25 100644 --- a/mhackspace/static/sass/project.scss +++ b/mhackspace/static/sass/project.scss @@ -4,6 +4,7 @@ @import "components/alert"; @import "components/header"; +@import "components/membership"; @import "components/footer"; @import "pages/home"; diff --git a/mhackspace/templates/base.html b/mhackspace/templates/base.html index 2277ab5..3ef4418 100644 --- a/mhackspace/templates/base.html +++ b/mhackspace/templates/base.html @@ -1,3 +1,4 @@ +{% load sass_tags %} {% load i18n compress %} {% load static from staticfiles %} @@ -30,7 +31,7 @@ {# { compress css }#} - + {# { endcompress }#} {% endblock %} @@ -50,7 +51,7 @@ Maidstone Hackspace -