From 7ed624b108a683d6eb5e37da5c5da00aa5fd030f Mon Sep 17 00:00:00 2001 From: Katharina Sabel Date: Fri, 9 Dec 2016 23:19:50 +0100 Subject: A lot of changes that are very destructive to the theme. But I needed and wanted them. Might clean up the template tree to be a bit less...hacky. But this works for now --- static/css/nest.css | 20 ++- static/img/banner_bg2x.png | Bin 0 -> 111150 bytes static/img/cat.gif | Bin 0 -> 8863 bytes static/img/grey_2x.png | Bin 0 -> 89089 bytes templates/base.html | 56 ++++++-- templates/categories.html | 30 ++-- templates/category.html | 4 +- templates/home.html | 336 +++++++++++++++++++++++++++++++-------------- templates/tag.html | 79 ++++++----- 9 files changed, 354 insertions(+), 171 deletions(-) create mode 100644 static/img/banner_bg2x.png create mode 100644 static/img/cat.gif create mode 100644 static/img/grey_2x.png diff --git a/static/css/nest.css b/static/css/nest.css index 7c83391..619f508 100755 --- a/static/css/nest.css +++ b/static/css/nest.css @@ -7,17 +7,17 @@ /* Responsive */ @media (min-width: 768px) { .container { - width: 750px; + width: 760px; } } @media (min-width: 992px) { .container { - width: 850px; + width: 985px; } } @media (min-width: 1200px) { .container { - width: 850px; + width: 1195px; } } @@ -26,14 +26,20 @@ body { font-family: "Open Sans", sans-serif; font-size: 16px; color: #4b505a; - background-color: #f5f5f5; + /*background-color: #f5f5f5;*/ + background-image: url("../img/grey_2x.png"); line-height: 24px; -webkit-font-smoothing:antialiased; text-rendering: optimizeLegibility; } +div.hacky_bg { + background-image: url("../img/banner_bg2x.png"); +} + div.home { - background-color: #252525; + /*background-color: #252525;*/ + background-image: url("../img/banner_bg2x.png"); } div.imgbar { @@ -489,3 +495,7 @@ blockquote{ .footer a{ color: #fff; } + + + +/********** DIRTY DIRTY HACKS ***********/ diff --git a/static/img/banner_bg2x.png b/static/img/banner_bg2x.png new file mode 100644 index 0000000..5cd4242 Binary files /dev/null and b/static/img/banner_bg2x.png differ diff --git a/static/img/cat.gif b/static/img/cat.gif new file mode 100644 index 0000000..0bd2150 Binary files /dev/null and b/static/img/cat.gif differ diff --git a/static/img/grey_2x.png b/static/img/grey_2x.png new file mode 100644 index 0000000..eba36c7 Binary files /dev/null and b/static/img/grey_2x.png differ diff --git a/templates/base.html b/templates/base.html index cca740c..356eda0 100755 --- a/templates/base.html +++ b/templates/base.html @@ -56,17 +56,17 @@ {% if GOOGLE_ANALYTICS %} - - - + + + {% endif %} {% endblock head %} @@ -82,7 +82,7 @@
{% for title, link in MENUITEMS %} @@ -112,8 +112,36 @@ - {% block content %} - {% endblock %} + +
+
+ + + {% block content %} + {% endblock %} + + +
+ +

Categories

+
    + {% for cat in categories %} +
  • {{ cat[0] }} ({{cat[1]|length}})
    • + {% endfor %} +
+ +

Tags

+
    + {% for tag in tags %} +
  • {{ tag[0] }} ({{tag[1]|length}})
    • + {% endfor %} +
+ +

A picture of a cat

+ + +
+
diff --git a/templates/categories.html b/templates/categories.html index 0c24668..a5a97a8 100755 --- a/templates/categories.html +++ b/templates/categories.html @@ -26,18 +26,22 @@ {% endblock header %} {% block content %} -
-
- {% for category, articles in categories %} -

{{ category|capitalize }}

-
- {% for article in articles %} -
{{ article.locale_date}}
-
{{ article.title }}
- {% endfor %} -
- {% endfor %} -
-
+ +
+ +

{{ category|capitalize }}

+
+ + {% for category, articles in categories %} +

{{ category|capitalize }}

+
+ {% for article in articles %} +
{{ article.locale_date}}
+
{{ article.title }}
+ {% endfor %} +
+ {% endfor %} +
+
{% endblock content %} diff --git a/templates/category.html b/templates/category.html index f336b7c..3391cde 100755 --- a/templates/category.html +++ b/templates/category.html @@ -25,8 +25,9 @@ {% endblock header %} {% block content %} -
+
+

{{ category|capitalize }}

@@ -40,4 +41,5 @@ {% endfor %}
+ {% endblock content %} diff --git a/templates/home.html b/templates/home.html index 5b27875..46c6fbd 100755 --- a/templates/home.html +++ b/templates/home.html @@ -1,20 +1,116 @@ -{% extends "base.html" %} - -{% block title %}{{ page.title }} - {{ super() }}{% endblock title %} -{% block description %}{{ page.content|striptags|truncate(200)|escape }}{% endblock description %} - -{% block headerstyle %} - {% if page.illustration %} -
- {% elif NEST_HEADER_IMAGES %} -
- {% else %} -
- {% endif %} -{% endblock headerstyle %} - -{% block header %} -
+ + + + {% block head %} + + + + + + + + {% block title %}{{ SITENAME }}{% endblock title %} + + + {% if NEST_CSS_MINIFY %} + + {% else %} + + + + + {% endif %} + + + + {% if FEED_ALL_ATOM %} + + {% endif %} + {% if FEED_ALL_RSS %} + + {% endif %} + {% if FEED_ATOM %} + + {% endif %} + {% if FEED_RSS %} + + {% endif %} + {% if CATEGORY_FEED_ATOM and category %} + + {% endif %} + {% if CATEGORY_FEED_RSS and category %} + + {% endif %} + {% if TAG_FEED_ATOM and tag %} + + {% endif %} + {% if TAG_FEED_RSS and tag %} + + {% endif %} + + + + + + {% if GOOGLE_ANALYTICS %} + + + + {% endif %} + + {% endblock head %} + + + +
+ + + {% if page.illustration %} +
+ {% elif NEST_HEADER_IMAGES %} +
+ {% else %} +
+ {% endif %} + + +
+
+ +
+ {% for title, link in MENUITEMS %} + {% if 'http://' in link or 'https://' in link %} + {{ title }} + {% else %} + {{ title }} + {% endif %} + {% endfor %} + {% if DISPLAY_PAGES_ON_MENU %} + {% for pg in PAGES %} + {{ pg.title }} + {% endfor %} + {% endif %} +
+
+
+ + + + {% block header %} +
@@ -24,88 +120,128 @@
-{% endblock header %} - - -{% block content %} -
-
- - {{ page.content }} - - -
-
-

KEYS

- 
- _____
-/ PGP \__
-\_____/o \
-      \_ /
-       <|
-       <|
-       <|
-       `
-
-
-
-

CODE

- 
-    ___________________  
-   /   ______________  \
-  |   / unsigned int |  |
-  |   | number_fans()|  |
-  |   | {            |  |
-  |   \______________/  |
-  |  /|\ q  oo ===== o  | 
-   \___________________/ 
-     !_______________!   
-
+ {% endblock header %} + +
-
-

LONELY ROBOT

- 
-
-
-                   `
-                   `
-                   `
-          :        `
-         `         .
-         @         .
-         .         .
-                   .
-        '          ,
-          .,``     ,
-       :           ,
-       :  ';#;     ,
-      .  +`.    '  :
-      @'  #'       :
-     ;#:`,   ,     ;
-     @#@@@@@       ;
-     ';+,@'+,      ;
-    . `@+@;;.   `  ;
-    @  :@#@;@  .   :
-    ,   :+@@@ '@   ;
-   +      '@@ #:'  +
-   @     @+@# ',:  +
-  .`     @@@@+@@@  #
-  @      `@++ :''` #
- `:       @.@+ @#  #
- :  .     @@@@ .   #
- ,        @@@#@ `# '
- `      , @.@..   ',
- +     +@@@@@@@    ,
-   #@@@@@@@@@@:  .  
-  @ ,@@@@@@@@@#`    
-,@@@@@` #@@@+`      
-   @@@@@@@@         
-   '.  ,#.          
-
-Isn't that cryptic...
-
+ + + + + +
+ + +
+ + +
+ {{ page.content }} + +
+
+

KEYS

+ 
+ 
+           _____
+          / PGP \__
+          \_____/o \
+                \_ /
+                 <|
+                 <|
+                 <|
+                 `
+
+
+ + +
+

CODE

+ 
+        ___________________  
+       /   ______________  \
+      |   / unsigned int |  |
+      |   | number_fans()|  |
+      |   | {            |  |
+      |   \______________/  |
+      |  /|\ q  oo ===== o  | 
+       \___________________/ 
+         !_______________!   
+
+
+ + +
+

LONELY ROBOT

+ 
+
+
+
+
+                ...
+
+
+
+
+
+
+
+
+
+
+ + + + +
+
+
+
+
{{ NEST_SITEMAP_COLUMN_TITLE }}
+ +
+
+ {% if SOCIAL %} +
{{ NEST_SOCIAL_COLUMN_TITLE }}
+
    + {% for name, link in SOCIAL %} +
  • {{name}}
    • + {% endfor %} +
+ {% endif %} +
+
+ {% if LINKS %} +
{{ NEST_LINKS_COLUMN_TITLE }}
+
    + {% for name, link in LINKS %} +
  • {{name}}
    • + {% endfor %} +
+ {% endif %} +
+
+

+ {# Proudly powered by pelican
+ Theme and code by molivier
#} + {{ NEST_COPYRIGHT }} + {% if NEST_FOOTER_HTML %}{{ NEST_FOOTER_HTML }}{% endif %} +

+
+
+
-
-
-{% endblock %} -
\ No newline at end of file + +
+ + diff --git a/templates/tag.html b/templates/tag.html index 40c33af..b757117 100755 --- a/templates/tag.html +++ b/templates/tag.html @@ -4,49 +4,52 @@ {% block description %}{{ NEST_TAG_HEAD_DESCRIPTION }} {{ tag }}{% endblock description %} {% block headerstyle %} - {% if NEST_HEADER_IMAGES %} -
- {% else %} -
- {% endif %} + {% if NEST_HEADER_IMAGES %} +
+ {% else %} +
+ {% endif %} {% endblock headerstyle %} {% block header %} -
-
-
-
-

{{ NEST_CATEGORY_HEADER_TITLE }} {{ tag|capitalize }}

-
-
-
-
-
+
+
+
+
+

{{ NEST_CATEGORY_HEADER_TITLE }} {{ tag|capitalize }}

+
+
+
+
+
{% endblock header %} {% block content %} -
- -

{{ tag|capitalize }}

-
- - - {% if tag == 'blog' %} -
-
- Browse the archive by category

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

{{ article.locale_date}}

-
-

{{ article.title }}

 -

{{ article.summary }}

-
- {% endfor %} -
+ +
+ +

{{ tag|capitalize }}

+
+ + + {% if tag == 'blog' %} +
+
+ Browse the archive by category

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

{{ article.locale_date}}

+
+

{{ article.title }}

 +

{{ article.summary }}

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