From 22e3845413ef85aa935a5c8cd865c1bcfa7823df Mon Sep 17 00:00:00 2001 From: Katharina Fey Date: Mon, 22 Jan 2018 04:14:20 +0100 Subject: Working on blog feed --- crumbs/static/css/cr_gay_override.css | 3 +- crumbs/static/css/cr_title.css | 15 --- crumbs/static/css/crumbs.css | 65 +++++++++++++ crumbs/templates/article.html | 35 ------- crumbs/templates/base.html | 170 ++++------------------------------ crumbs/templates/category.html | 60 ++++++------ 6 files changed, 110 insertions(+), 238 deletions(-) (limited to 'crumbs') diff --git a/crumbs/static/css/cr_gay_override.css b/crumbs/static/css/cr_gay_override.css index b28cb50..a8c8733 100644 --- a/crumbs/static/css/cr_gay_override.css +++ b/crumbs/static/css/cr_gay_override.css @@ -4,6 +4,7 @@ height: 12px; margin: 0 auto; display: flex; + align-self: center; padding-bottom: 25px; } @@ -12,5 +13,5 @@ display: flex; flex-direction: column; height: 12px; - width: 75px; + width: 78px; } diff --git a/crumbs/static/css/cr_title.css b/crumbs/static/css/cr_title.css index 3eb3466..86bef57 100644 --- a/crumbs/static/css/cr_title.css +++ b/crumbs/static/css/cr_title.css @@ -19,21 +19,6 @@ div.navigation { font-size: 58px; } -.cursor { - animation: flash 0.75s infinite alternate; -} - -@keyframes flash { - 0% { opacity: 1; } - 49% { opacity: 1; } - 50% { opacity: 0; } - 100% { opacity: 0; } -} - -#t-color-red { color: #ef787b; } -#t-color-org { color: #f6915f; } -#t-color-ylw { color: #fdcb71; } -#t-color-grn { color: #99cb9b; } /* This is the block container */ .gay { diff --git a/crumbs/static/css/crumbs.css b/crumbs/static/css/crumbs.css index 7f276c6..afba353 100644 --- a/crumbs/static/css/crumbs.css +++ b/crumbs/static/css/crumbs.css @@ -45,6 +45,13 @@ div.navigation a { /* transition: all 0.2s ease-out; */ } +.title { + font-size: 22px; + text-transform: lowercase; + margin-left: 25px; +} + + /* ✨ COLOUR DEFINITIONS ✨ @@ -53,6 +60,23 @@ div.navigation a { */ +.cursor { + animation: flash 0.75s infinite alternate; +} + +@keyframes flash { + 0% { opacity: 1; } + 49% { opacity: 1; } + 50% { opacity: 0; } + 100% { opacity: 0; } +} + +#t-color-red { color: #ef787b; } +#t-color-org { color: #f6915f; } +#t-color-ylw { color: #fdcb71; } +#t-color-grn { color: #99cb9b; } + + .colour1 { background-color: #3c3c3c; } .colour2 { background-color: #525252; } .colour3 { background-color: #74736a; } @@ -68,3 +92,44 @@ div.navigation a { .colour13 { background-color: #6997c8; } /* Blue */ .colour14 { background-color: #ca98c9; } /* Purple */ .colour15 { background-color: #ce7b59; } /* Brown */ + +/* + + ✨ CARD DEFINITIONS ✨ + +*/ + +div.card { + padding: 25px; + background-color: #CECECE; + color: #222222; + width: 100%; + margin-bottom: 25px; +} + +div.card h1 { + font-weight: 500; +} + +div.card hr { + background-color: #222222; + height: 1px; + border: 1px; + margin-top: 45px; + margin-bottom: 45px; + margin-left: 25px; + margin-right: 25px; +} + + +/* hr { + display: ; + color: #222222; + height: 1px; + border: 0; + border-top: 1px solid #222222; + margin: 1em 0; + padding: 0; + padding-bottom: 15px; + padding-top: 15px; +} */ \ No newline at end of file diff --git a/crumbs/templates/article.html b/crumbs/templates/article.html index 165bd08..eb38808 100755 --- a/crumbs/templates/article.html +++ b/crumbs/templates/article.html @@ -4,41 +4,6 @@ {% block description %}{{ article.content|striptags|truncate(200)|escape }}{% endblock description %} {% block keywords %}{% for tag in article.tags|sort %}{{ tag }}{% if not loop.last %}, {% endif %}{% endfor %}{% endblock keywords %} - - -{% block header %} - - -
-
-
-
-

{{ article.title }} ARTICLE

- - -

{{ article.locale_date }}{% if article.modified %}, {{ NEST_ARTICLE_HEADER_MODIFIED }} {{ article.locale_modified }}{% endif %},Category: {{ NEST_ARTICLE_HEADER_IN }} {{ article.category|capitalize }}

- -
-
-

- - {% for tag in article.tags|sort %}{{ tag }}{% if not loop.last %}, {% endif %}{% endfor %} -

-
-
-
-
- -{% endblock header %} - {% block content %}
{{ article.content }} diff --git a/crumbs/templates/base.html b/crumbs/templates/base.html index bccf49d..87ae083 100755 --- a/crumbs/templates/base.html +++ b/crumbs/templates/base.html @@ -15,17 +15,28 @@ +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/crumbs/templates/category.html b/crumbs/templates/category.html index b1a1c69..3264eef 100755 --- a/crumbs/templates/category.html +++ b/crumbs/templates/category.html @@ -1,44 +1,38 @@ {% extends "base.html" %} - - - - - -{% block header %} - -
-
-
-
-

{{ NEST_CATEGORY_HEADER_TITLE }} {{ category|capitalize }}

- -
-
-
-
-{% endblock header %} +{% block title %}{{ NEST_CATEGORY_HEAD_TITLE }} {{ category|capitalize }} - {{ super() }} CATEGORY {% endblock title %} +{% block description %}{{ NEST_CATEGORY_HEAD_DESCRIPTION }} {{ category|capitalize }}{% endblock description %} {% block content %} -
-
+

{{ category }}

- +
+ +
{% for article in articles %} -

{{ article.locale_date}}

-
-

{{ article.title }}

+
+

{{ article.title }}

+

{{ article.summary }}

-
+
{% endfor %} - -
+ + + + + + + + + + + + + + + + + {% endblock content %} -- cgit v1.2.3