Fixing a small issue with titles on the home page

3 files changed, 2 insertions, 308 deletions

diff --git a/crumbs/static/css/crumbs.css b/crumbs/static/css/crumbs.css
index 4ea7262..d625cad 100644
--- a/crumbs/static/css/crumbs.css
+++ b/crumbs/static/css/crumbs.css
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 /**************************************
 
    BASIC DEFINITIONS 
@@ -45,7 +44,7 @@ h1, h2, h3, h4 {
   padding-bottom: 15px;
 }
 
-h1 {
+h1.normal {
   padding-top: 50px;
 }
 
@@ -215,186 +214,4 @@ code { padding: 3px 3px; }
   font-size: 16px;
   line-height: 16px;
   text-align: right;
-=======
-/*
- *    This is my CSS y'all! It probably sucks 💩
- */
-
-/* Responsive */
-@media (min-width: 768px) {
-  .container { width: 760px; }
-}
-@media (min-width: 992px) {
-  .container {
-    width: 985px;
-  }
-}
-@media (min-width: 1200px) {
-  .container {
-    width: 1195px;
-  }
-}
-
-/* The body is basically the base */
-body {
-  font-family: Roboto;
-  font-style: normal;
-  font-variant: normal;
-  font-size: 26px;
-  font-weight: 300;
-  color: #BEBEBE;
-  background-color: #242424;
-  margin: 0px;
-  /*line-height: 32px;*/
-  -webkit-font-smoothing:antialiased;
-  text-rendering: optimizeLegibility;
-}
-
-/* Describes the header container */
-.header {
-  height: 75px;
-  line-height: 75px;
-  background-color: #393939;
-  width: 100%;
-  margin-top: 15px;
-}
-
-/* Probably a temporary hack */
-.header p {
-  margin-left: 25px;
-}
-
-.header .nav {
-  float: right;
-}
-
-.header .nav a {
-  margin-left: 20px;
-  text-transform: uppercase;
-  transition: all 0.2s ease-out;
-}
-
-/* Mostly used on the front page */
-/*.highlight {
-  font-family: Inconsolata;
-}
-*/
-.title-text {
-  font-family: Inconsolata;
-  font-size: 32px;
-  line-height: 38px;
-}
-
-.title-text h1 { font-size: 64px; }
-
-/* Implements a blinking cursor */
-.blink {
-  -webkit-animation: 1s blink step-end infinite;
-  -moz-animation: 1s blink step-end infinite;
-  -ms-animation: 1s blink step-end infinite;
-  -o-animation: 1s blink step-end infinite;
-  animation: 1s blink step-end infinite;
-}
-
-/*************************
-
-COLOUR TILE THINGY
-
-**************************/
-
-.colours {
-  width: 1350px;
-  height: 90px;
-  padding-top: 75px;
-  margin: 0 auto;
-  display: flex;
-}
-
-.colour {
-  display: flex;
-  flex-direction: column;
-  height: 90px;
-  width: 90px;
-}
-
-#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; }
-
-/*************************
-
-BLINKING ANIMATIONS FOR DIFFERENT BROWSERS
-
-**************************/
-
-@keyframes "blink" {
-  from, to {
-    color: transparent;
-  }
-  50% {
-    color: #BEBEBE;
-  }
-}
-
-@-moz-keyframes blink {
-  from, to {
-    color: transparent;
-  }
-  50% {
-    color: #BEBEBE;
-  }
-}
-
-@-webkit-keyframes "blink" {
-  from, to {
-    color: transparent;
-  }
-  50% {
-    color: #BEBEBE;
-  }
-}
-
-@-ms-keyframes "blink" {
-  from, to {
-    color: transparent;
-  }
-  50% {
-    color: #BEBEBE;
-  }
-}
-
-@-o-keyframes "blink" {
-  from, to {
-    color: transparent;
-  }
-  50% {
-    color: #BEBEBE;
-  }
-}
-
-/*.header-nav .nav{
-  float:right;
-}
-.header-nav .nav a {
-  font-weight:300;
-  font-size: 18px;
-  color:#fff;
-  text-decoration:none;
-  padding:8px;
-  margin-left:20px;
-  text-transform: uppercase;
-  transition: all 0.2s ease-out;
->>>>>>> 6386c12fc0e606829d2b5bfea31d647852f2b491
 }
diff --git a/crumbs/templates/home.html b/crumbs/templates/home.html
index a17dc75..ef11073 100755
--- a/crumbs/templates/home.html
+++ b/crumbs/templates/home.html
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 {% extends "base.html" %}
 
 {# Define what html head we include #}
@@ -29,125 +28,3 @@
 
     <p>To get in touch with me, you can also send an e-mail to <a href="mailto:kookie@spacekookie.de" id="email"><b>kookie@spacekookie.de</b></a></p>
 {% endblock %}
-=======
-<!DOCTYPE html>
-<html lang="{{ DEFAULT_LANG }}">
-  <head>
-  {% block head %}
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="description" content="{% block description %}{% endblock description %}">
-    <meta name="keywords" content="{% block keywords %}{% endblock keywords %}">
-    <link rel="icon" href="{{ SITEURL }}/favicon.ico">
-
-    <title>{% block title %}{{ SITENAME }}{% endblock title %}</title>
-
-    <link href="https://fonts.googleapis.com/css?family=Roboto|Inconsolata:400,700&amp" rel="stylesheet">
-    <!-- <link href="https://fonts.googleapis.com/css?family=Inconsolata:400,700&amp;subset=latin-ext" rel="stylesheet"> -->
-    <!-- <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css"> -->
-    <!-- <link href="{{ SITEURL }}/theme/css/bootstrap.min.css" rel="stylesheet"> -->
-    <!-- <link href="{{ SITEURL }}/theme/css/fonts.css" rel="stylesheet"> -->
-    <!-- <link href="{{ SITEURL }}/theme/css/nest.css" rel="stylesheet"> -->
-    <!-- <link href="{{ SITEURL }}/theme/css/pygment.css" rel="stylesheet"> -->
-    <!-- <link href="{{ SITEURL }}/theme/css/home.css" rel="stylesheet"> -->
-
-    <!-- Stylesheets -->
-    <!-- <link rel="stylesheet" type="text/css" href="{{ SITEURL }}/theme/css/nest.css"> -->
-    <!-- <link rel="stylesheet" type="text/css" href="{{ SITEURL }}/theme/css/home.css">   -->
-    <link rel="stylesheet" type="text/css" href="{{ SITEURL }}/theme/css/crumbs.css">
-    <!-- /Stylesheets -->
-
-  {% endblock head %}
-  </head>
-
-  <body>
-
-    <!-- Navigation -->
-    <div class="container header">
-      <!-- <div class="nav pull-right"><a>Home</a></div> -->
-    </div>
-
-    <div class="">
-        
-      <!-- "# fun memory violations _" -->
-      <div class="title-text">
-        <h1># fun memory violations <span class="blink">_ </span></h1>
-      </div>
-
-      <div class="colours">
-        <div class="colour" id="colour1"></div>
-        <div class="colour" id="colour2"></div>
-        <div class="colour" id="colour3"></div>
-        <div class="colour" id="colour4"></div>
-        <div class="colour" id="colour5"></div>
-        <div class="colour" id="colour6"></div>
-        <div class="colour" id="colour7"></div>
-        <div class="colour" id="colour8"></div>
-        <div class="colour" id="colour9"></div>
-        <div class="colour" id="colour10"></div>
-        <div class="colour" id="colour11"></div>
-        <div class="colour" id="colour12"></div>
-        <div class="colour" id="colour13"></div>
-        <div class="colour" id="colour14"></div>
-        <div class="colour" id="colour15"></div>
-      </div>
-
-      <div class="title-text">
-        <p>Hi – Welcome to my dusty internet hangout place.</p>
-        <p>My name is Katharina Fey and I'm a software developer from Berlin. I like taking photos, writing stories and starting way too many personal projects.</p>
-      </div>
-
-    </div>
-  </body>
-
-
-
-
-      <!-- Header -->
-<!--       <div class="header-container gradient">
-
-      <div class="container">
-        <div class="header-nav">
-          <div class="header-logo">
-            <a class="pull-left" href="{{ SITEURL }}/"><img class="mr20" width=192px height=64px src="{{ SITEURL }}{{NEST_HEADER_LOGO or "/images/logo3.png" }}" alt="logo"></a>
-          </div>
-
-          <div class="nav pull-right">
-
-            {% for title, link in MENUITEMS %}
-              {% if 'http://' in link or 'https://' in link %}
-                <a class="nav" href="{{ link }}">{{ title }}</a>
-              {% else %}
-                <a class="nav" href="{{ SITEURL }}{{ link }}">{{ title }}</a>
-              {% endif %}
-            {% endfor %}
-      
-            {% if DISPLAY_PAGES_ON_MENU %}
-              {% for pg in PAGES %}
-                <a {% if pg == page %} class="active"{% endif %} href="{{ SITEURL }}/{{ pg.url }}">{{ pg.title }}</a>
-              {% endfor %}
-            {% endif %}
-
-          </div>
-        </div> 
-
-        <h1>Fun memory violations</h1>
-
-        <p><b>Hi –</b> Welcome to my dusty internet hangout place.</p>
-
-        <p>My name is <b>Katharina Fey</b> and I'm a software developer from Berlin. I like taking photos, writing stories and starting way too many personal projects.</p>
-
-        <div class="icons">
-          <a href="https://twitter.com/spacekookie"><h1 id="twitter"><i class="fa fa-twitter"></i> Twitter</h1></a>
-          <a href="https://github.com/spacekookie"><h1 id="github"><i class="fa fa-github"></i> Github</h1></a>
-          <a href="https://spacekookie.de/kookie.txt"><h1 id="keys"><i class="fa fa-key"></i> Keys</h1></a>
-        </div>
-
-
-        <p>To get in touch with me, you can also send an e-mail to <a href="mailto:kookie@spacekookie.de" id="email"><b>kookie@spacekookie.de</b></a></p>
-      </div>
-       -->
-  </body>
-</html>
->>>>>>> 6386c12fc0e606829d2b5bfea31d647852f2b491
diff --git a/crumbs/templates/normal.html b/crumbs/templates/normal.html
index 069e863..4c58b7b 100644
--- a/crumbs/templates/normal.html
+++ b/crumbs/templates/normal.html
@@ -11,7 +11,7 @@
     {% with type='normal' %} {% include "components/navbar_generator.html" %} {% endwith %}
     {% include "components/super_gay.html" %}
 
-    <h1>{% block title %}{% endblock %}</h1>
+    <h1 class="normal">{% block title %}{% endblock %}</h1>
 
     {% block content %}
     {% endblock %}