diff --git a/config/settings/common.py b/config/settings/common.py index bed5d47..9472a88 100644 --- a/config/settings/common.py +++ b/config/settings/common.py @@ -305,7 +305,6 @@ PAYMENT_PROVIDERS = { SASS_PRECISION = 8 SASS_PROCESSOR_INCLUDE_DIRS = [ - # str(ROOT_DIR), str(APPS_DIR) + '/static/sass', str(ROOT_DIR) + '/node_modules', ] diff --git a/config/urls.py b/config/urls.py index 5b04fce..176f287 100644 --- a/config/urls.py +++ b/config/urls.py @@ -39,7 +39,7 @@ urlpatterns = [ r'^api/uploader/$', markdown_uploader, name='markdown_uploader_page' ), - url(r'^blog/$', blog, name='contact'), + url(r'^blog/$', blog, name='blog'), url(r'^blog/rss/$', BlogFeed()), url(r'^blog/(?P[0-9A-Za-z_\-]+)/$', blog, name='blog-item'), url(r'^blog/category/(?P[0-9A-Za-z_\-]+)/$', blog, name='blog-category'), diff --git a/mhackspace/static/images/logo.png b/mhackspace/static/images/logo.png new file mode 100644 index 0000000..cef97f5 Binary files /dev/null and b/mhackspace/static/images/logo.png differ diff --git a/mhackspace/static/sass/_variables.scss b/mhackspace/static/sass/_variables.scss index c110c9f..8c99393 100644 --- a/mhackspace/static/sass/_variables.scss +++ b/mhackspace/static/sass/_variables.scss @@ -4,3 +4,7 @@ $black: #000; $pink: #f2dede; $dark-pink: #eed3d7; $red: #b94a48; + +$teal: #008080; + +$brand-primary: $teal; diff --git a/mhackspace/templates/blog/posts.html b/mhackspace/templates/blog/posts.html index 3efa877..32bac04 100644 --- a/mhackspace/templates/blog/posts.html +++ b/mhackspace/templates/blog/posts.html @@ -6,9 +6,24 @@
{% for post in posts %} -

{{ post.title }}

-

Published: {{ post.published_date }}

-

{{ post.description|safe_markdown }}

+
+

{{ post.title }}

+
+ Published: + {% if post.updated_date != post.published_date %} + Updated: {{ post.updated_date }} + {% endif %} +
+ {% if post.image %} +
+ + + + +
+ {% endif %} + {{ post.description|safe_markdown }} +
{% endfor %} {% if posts.num_pages > 1 %}