From 1ea77a6b5b2e9aa409dad967e3cbfcb908c792a7 Mon Sep 17 00:00:00 2001
From: Laurent <laurent@staxriver.com>
Date: Tue, 1 Oct 2019 18:15:39 +0200
Subject: [PATCH] Header styling + minor changes

---
 news/__pycache__/urls.cpython-37.pyc    | Bin 1694 -> 1813 bytes
 news/static/news/css/app.css            |  48 +++++++++++++++++++++---
 news/templates/base.html                |  11 ++++--
 news/templates/news/static/contact.html |  13 +++++++
 news/urls.py                            |  11 +++---
 5 files changed, 68 insertions(+), 15 deletions(-)
 create mode 100644 news/templates/news/static/contact.html

diff --git a/news/__pycache__/urls.cpython-37.pyc b/news/__pycache__/urls.cpython-37.pyc
index 069dbde7a962f29d77b4966ec0b9be0813b6baf1..67768edec6503647a518ca050490966022364c15 100644
GIT binary patch
delta 708
zcmY+=%Wl&^6b4|A?@8>mNgT&+)0RshF&Brz27y$eJ^?p%VF?A3GYW}fC)gH2-Si2v
zKqIznc>tD3NJu;c@|G2E!5K41;E|8#`{!bhKiVIf!&BR?OL#R;*o&4aNk2LMUM_YX
z;hm@Nhl2|Vl%<iFkx3*_L0;ApEz+>BMRiI*r{<yo2AEsyLv5>IR;Sv+f`*WVvcVQ=
zqMEQHw2Rt-mQWkD3mqW`)q?JYpo?sSE7U`EpeN*^9PosER2O`qJ(LUkLVZ*Z4l2oT
zi1Oe_j9sGo!pFm0hAVIt25@bw!gYA^=S)K!+{3|9b<#jAxq<0ErZ?dh+}_F%ihPWD
zAM-oa>|>tJ+R*{reI^C>*f|-!3`l7`r^$L57xZjSH@^t}@KR0bCXbBiDlOt^aqe-B
z^CB+h)3FG{*G00#)pj9PPtrJ{7^wVNN~JbWfxi3vmHZ$^R^z*N*f+&tUz8O)R@XX@
zvOfEyz9EOq*G})3J}lyNwhG_kcjV!WrZk&R!&h-mGo4Rv@J-Bky{=wW8gV}1Q(2(}
zBZp7u^3vnQ<Hg4kwI0WLzFB4Pl;*TJW8bxjKH#GR7U&O89$?oY7O`YYRuxBXlK<L2
Pt`oUxI?;(sxGeG;R_3Tl

delta 584
zcmZ|M%SyvQ6b9hTG@0I#-qX9cT5aRqje>4UA3#LGML|m74ARopniT7<8(nsx!HtM7
z;XC*YlC2>43U2gF8JEtGVZQU9Ng(qWdogNF!-yz2-q^!=BdjPN0)NBAO#>hI=)P8+
z1c3H}eXXSt1=LoE6VSNU4FiMVG=K`BA`q5}prR0!(os4XQZbYPaj66<21%(DDh?^B
zG%5jUp$UE>gG@q3h9)Wnrc@S{hMZI$m4U)c6pAPlN-`^R*3EWvFbDIn0E@6RRiPrY
zWz6!JRbgdHU{zLYSlumPxegYrO)0F)U;~39);DMETcUcAY?Wa9RIzrvCsHqe5&VI^
zI^bj1SA4BA0DfZ;EZBYiTA}YG?i(ZCANK4KZ;PV$6Sxan#L441?^Yc$v2jY?w|Yg&
zUQcTloRD~B$Q}-72OPXM#fggcPtB@{OLMYf$>GvU9^0-vzI5P(yL@!k;bT8&yX|Xl
lpS4*<v{k%kc6hLd+YHgEPE{Hs|4cPP=xj2=NR|re<QE``fsp_J

diff --git a/news/static/news/css/app.css b/news/static/news/css/app.css
index 3700345..928ba73 100644
--- a/news/static/news/css/app.css
+++ b/news/static/news/css/app.css
@@ -9,6 +9,7 @@
 
 :root {
   --main-bg-color: #FFD540;
+  --header-bg-color: #EAC33B;
 }
 
 a {
@@ -24,37 +25,72 @@ body {
 	font-size:18px;
   margin: 0px;
   padding: 0px;
+  /* margin-bottom: 100px; */
 }
 
 header {
   margin-bottom: 20px;
-  margin-top: 10px;
+  margin-top: 0px;
+  margin-left: auto;
+  margin-right: auto;
   text-align: center;
+  width: 100%;
+}
+@media print, screen and (min-width: 40em) {
+  header {
+    width: 420px;
+  }
 }
 
 /* header a {
   text-decoration: none;
 } */
 
+.title {
+  background-color: var(--header-bg-color);
+}
+
 header h1 {
-  margin-bottom: 0;
-  /* font-family: 'LibreBaskervilleBold'; */
-  font-size: 28px;
+  width: 100%;
+  margin-bottom: 0px;
+  font-family: "HelveticaNeue-CondensedBlack", "HelveticaNeueBlackCondensed", "HelveticaNeue-Black-Condensed", "Helvetica Neue Black Condensed", "HelveticaNeueBlack", "HelveticaNeue-Black", "Helvetica Neue Black", "HelveticaNeue", "Helvetica Neue", 'TeXGyreHerosCnBold', "Helvetica", "Tahoma", "Geneva", "Arial Narrow", "Arial", sans-serif;
+  font-weight:900;
+  font-stretch:condensed;  /* font-family: 'LibreBaskervilleBold'; */
+  /* letter-spacing: -1px; */
+  text-transform: uppercase;
+  font-size: 32px;
+}
+@media print, screen and (min-width: 40em) {
+  header h1 {
+    font-size: 48px;
+  }
+}
+
+header h1 a {
+  padding: 5px 0px;
+  color: #fff;
 }
 
 header h2 {
-  margin: 0;
+  margin-top: -10px;
   padding: 0;
   font-size: 14px;
 }
 
 nav {
-  margin-top: 10px;
+  padding: 4px;
+  /* margin-top: 4px; */
   font-size: 14px;
+  background-color: #333;
 }
 
 footer {
+  text-align: center;
+  font-size: 13px;
+  padding: 20px;
+  background-color: #333;
   margin-top: 50px;
+  margin-bottom: 0px;
 }
 
 article {
diff --git a/news/templates/base.html b/news/templates/base.html
index 07031e6..9f65d5d 100644
--- a/news/templates/base.html
+++ b/news/templates/base.html
@@ -25,8 +25,10 @@
 
      <!-- Header -->
     <header>
-     <h1><a href="{% url 'news:index' %}">poker rumble</a></h1>
-     <h2>HOME OF NEWS GRINDERS</h2>
+      <div class="title">
+        <h1><a href="{% url 'news:index' %}">poker rumble</a></h1>
+      </div>
+     <!-- <h2>HOME OF NEWS GRINDERS</h2> -->
 
      <nav>
        {% if user.is_authenticated %}
@@ -53,7 +55,10 @@
 
   <!-- Footer -->
   <footer>
-    <!-- some footer -->
+
+    <a href="{% url 'news:contact' %}">Contact</a>
+    <p>Copyright © 2019 Stax River</p>
+
   </footer>
 
 </body>
diff --git a/news/templates/news/static/contact.html b/news/templates/news/static/contact.html
new file mode 100644
index 0000000..5d5acce
--- /dev/null
+++ b/news/templates/news/static/contact.html
@@ -0,0 +1,13 @@
+{% extends "base.html" %}
+
+{% block title %}Contact{% endblock %}
+
+{% block content %}
+
+<h1>Contact</h1>
+
+<p>
+  Please contact us directly on social media!
+</p>
+
+{% endblock content %}
diff --git a/news/urls.py b/news/urls.py
index 013eafa..486f0da 100644
--- a/news/urls.py
+++ b/news/urls.py
@@ -1,10 +1,14 @@
 from django.urls import path, re_path, include
 from django.contrib.auth import views as auth_views
+from django.views.generic.base import TemplateView
 
 from . import views
 
 app_name = 'news'
 urlpatterns = [
+    # Static
+    path('contact', TemplateView.as_view(template_name='news/static/contact.html'), name='contact'),
+    # Posts
     path('', views.index, name='index'),
     path('<int:post_id>', views.post, name='post'),
     path('<int:post_id>/comment/<int:comment_id>', views.comment_with_parent, name='comment_with_parent'),
@@ -13,14 +17,12 @@ urlpatterns = [
     path('upvote/<int:comment_id>', views.upvote, name='upvote'),
     path('submission', views.submission, name='submission'),
     path('submitted', views.submitted, name='submitted'),
+    # User
     path('account', views.account, name='account'),
     path('signin', views.signin, name='signin'),
     path('logout', views.logout_view, name='logout_view'),
     path('password-change', views.password_change, name='password_change'),
     re_path(r'^register/$', views.register, name='register'),
-    # path('change-password/', auth_views.PasswordChangeView.as_view(template_name='change-password.html'),),
-    # path('change-password/done', views.password_change, name='password_change_done'),
-    # path('password-reset', auth_views.PasswordResetView.as_view(template_name='news/user/password_reset_form.html'), name='password_reset'),
     path('password_reset/', auth_views.PasswordResetView.as_view(
       template_name='news/user/password_reset_form.html',
       email_template_name='news/user/password_reset_email.html',
@@ -28,11 +30,8 @@ urlpatterns = [
       success_url='../password-reset/done'
     ), name='password_reset'),
     path('password-reset/done', auth_views.PasswordResetDoneView.as_view(template_name='news/user/password_reset_done.html'), name='password_reset_done'),
-    # path('accounts/', include('django.contrib.auth.urls')),
     path('reset/<uidb64>/<token>', auth_views.PasswordResetConfirmView.as_view(
         template_name='news/user/password_reset_confirm.html',
         success_url='../password-change/done'), name='password_reset_confirm'),
     path('password-change/done', auth_views.PasswordResetCompleteView.as_view(template_name='news/user/password_reset_complete.html'), name='password_change_done'),
-
-    # path('reset/<uidb64>/<token>', views.empty_view, name='password_reset_confirm'),
 ]