From 3b5522de3397444441e87a9c8fa76ad2de82d358 Mon Sep 17 00:00:00 2001 From: Katharina Fey Date: Mon, 22 Jan 2018 01:47:06 +0100 Subject: Adding new content and template pages --- crumbs/static/css/cr_gay_override.css | 16 +++++ crumbs/static/css/cr_title.css | 38 ++++-------- crumbs/static/css/crumbs.css | 33 +++++++++-- crumbs/static/css/nest.css | 4 +- crumbs/templates/base.html | 107 +++++++++++++++++++++++++--------- crumbs/templates/home.html | 77 ++++++++++-------------- crumbs/templates/super_gay.html | 17 ++++++ 7 files changed, 184 insertions(+), 108 deletions(-) create mode 100644 crumbs/static/css/cr_gay_override.css create mode 100644 crumbs/templates/super_gay.html (limited to 'crumbs') diff --git a/crumbs/static/css/cr_gay_override.css b/crumbs/static/css/cr_gay_override.css new file mode 100644 index 0000000..b28cb50 --- /dev/null +++ b/crumbs/static/css/cr_gay_override.css @@ -0,0 +1,16 @@ +/* This is the block container */ +.gay { + width: 0 auto; + height: 12px; + margin: 0 auto; + display: flex; + padding-bottom: 25px; +} + +/* This is a block */ +.colour { + display: flex; + flex-direction: column; + height: 12px; + width: 75px; +} diff --git a/crumbs/static/css/cr_title.css b/crumbs/static/css/cr_title.css index 742a535..3eb3466 100644 --- a/crumbs/static/css/cr_title.css +++ b/crumbs/static/css/cr_title.css @@ -4,13 +4,18 @@ This file contains all definitions are are EXCLUSIVE for the title */ +div.navigation { + padding-top: 12px; + padding-bottom: 75px; + padding-right: 32px; + height: 75px; + line-height: 75px; + } + + .title { padding-top: 20px; padding-bottom: 50px; -} - -.title h1 { - font-family: 'Inconsolata', monospace; font-size: 58px; } @@ -30,17 +35,16 @@ This file contains all definitions are are EXCLUSIVE for the title #t-color-ylw { color: #fdcb71; } #t-color-grn { color: #99cb9b; } - /* This is the block container */ -.colours { +.gay { width: 0 auto; height: 50px; margin: 0 auto; display: flex; padding-bottom: 150px; } - - /* This is a block */ + +/* This is a block */ .colour { display: flex; flex-direction: column; @@ -48,24 +52,6 @@ This file contains all definitions are are EXCLUSIVE for the title width: 75px; } -/* Colour defitions */ -.colour1 { background-color: #3c3c3c; } -.colour2 { background-color: #525252; } -.colour3 { background-color: #74736a; } -.colour4 { background-color: #9f9e93; } -.colour5 { background-color: #d2cfc7; } -.colour6 { background-color: #e7e5df; } -.colour7 { background-color: #f1f0ec; } -.colour8 { background-color: #ef787b; } -.colour9 { background-color: #f6915f; } -.colour10 { background-color: #fdcb71; } -.colour11 { background-color: #99cb9b; } -.colour12 { background-color: #6ccaca; } -.colour13 { background-color: #6997c8; } -.colour14 { background-color: #ca98c9; } -.colour15 { background-color: #ce7b59; } - - .span { display: inline-block; } diff --git a/crumbs/static/css/crumbs.css b/crumbs/static/css/crumbs.css index 3ec495a..7f276c6 100644 --- a/crumbs/static/css/crumbs.css +++ b/crumbs/static/css/crumbs.css @@ -21,13 +21,16 @@ p { font-weight: 300; } +h1, h2, h3, h4 { + font-family: 'Inconsolata', monospace; +} div.navigation { padding-top: 12px; - padding-bottom: 75px; + padding-bottom: 25px; padding-right: 32px; - height: 75px; - line-height: 75px; + height: 50px; + line-height: 50px; } div.navigation a { @@ -42,6 +45,26 @@ div.navigation a { /* transition: all 0.2s ease-out; */ } -div.navigation a:hover { +/* + + ✨ COLOUR DEFINITIONS ✨ + + These colours are re-used in many parts of the website + +*/ -} \ No newline at end of file +.colour1 { background-color: #3c3c3c; } +.colour2 { background-color: #525252; } +.colour3 { background-color: #74736a; } +.colour4 { background-color: #9f9e93; } +.colour5 { background-color: #d2cfc7; } +.colour6 { background-color: #e7e5df; } +.colour7 { background-color: #f1f0ec; } +.colour8 { background-color: #ef787b; } /* Red */ +.colour9 { background-color: #f6915f; } /* Orange */ +.colour10 { background-color: #fdcb71; } /* Yellow */ +.colour11 { background-color: #99cb9b; } /* Green */ +.colour12 { background-color: #6ccaca; } /* Cyan */ +.colour13 { background-color: #6997c8; } /* Blue */ +.colour14 { background-color: #ca98c9; } /* Purple */ +.colour15 { background-color: #ce7b59; } /* Brown */ diff --git a/crumbs/static/css/nest.css b/crumbs/static/css/nest.css index f822494..596bb02 100755 --- a/crumbs/static/css/nest.css +++ b/crumbs/static/css/nest.css @@ -113,7 +113,7 @@ code { padding: 3px 3px; } padding-bottom:20px; padding-left:20px; padding-right:0px; - background: #BBBBBB ; + background: #BBBBBB; font-size:14px; font-weight:400; font-family:Consolas,monaco,monospace; @@ -199,7 +199,7 @@ h5 { float:right; } .header-nav .nav a { - font-weight:300; + font-weight:300; font-size: 18px; color:#fff; text-decoration:none; diff --git a/crumbs/templates/base.html b/crumbs/templates/base.html index 17866d2..bccf49d 100755 --- a/crumbs/templates/base.html +++ b/crumbs/templates/base.html @@ -1,41 +1,90 @@ - - - {% block head %} + + + + + + + + + + + + + + + +
+ + +
+ + +
+ + + {% include "super_gay.html" %} +
+ + + +
+ + + + - + + + + + + + + - + - {% endblock head %} + - {% block headerstyle %} - {% endblock headerstyle %} + -
+ - {% block header %} - {% endblock header %} + -
+ -
-
+ - {% block content %} - {% endblock %} + -
+ -