Added minimal CSS, tweaked templates.

3fb8eb80 · Anton Sarukhanov · 054219f1 · 3fb8eb80 · 3fb8eb80 · 3fb8eb80
Commit 3fb8eb80 authored 8 years ago by Anton Sarukhanov
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,7 @@ output

 # Bower
 bower_components
-content/lib
+theme/static/lib

 # Python
 *.py[cod]

--- a/bower.json
+++ b/bower.json
@@ -16,6 +16,6 @@
    "normalize-css": "normalize.css#^4.1.1"
  },
  "install": {
-    "path": "content/lib"
+    "path": "theme/static/lib"
  }
 }
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -3,8 +3,8 @@
 from __future__ import unicode_literals

 AUTHOR = 'Anton Sarukhanov'
-SITENAME = 'ant.sr'
-SITESUBTITLE = 'full-stack developer'
+SITENAME = 'Anton Sarukhanov'
+SITESUBTITLE = 'Full-Stack Developer'
 SITEURL = ''

 PATH = 'content'
@@ -21,8 +21,6 @@ TRANSLATION_FEED_ATOM = None
 AUTHOR_FEED_ATOM = None
 AUTHOR_FEED_RSS = None

-FOO = "B4R"
-
 # Blogroll
 LINKS = (('Code', 'https://git.xhost.io/anton'),
         ('Resume', 'static/resume.pdf'),)

--- a/theme/static/css/style.css
+++ b/theme/static/css/style.css
+/********** General **********/
+body {
+    font: 18px sans-serif;
+    max-width: 1000px;
+    margin: 0 auto;
+    padding: 0 1em;
+}
+
+a:link,
+a:visited,
+a:active {
+    color: #369;
+    font-weight: bold;
+    text-decoration: none;
+}
+a:focus,
+a:hover {
+    color: #036;
+}
+
+
+/********** Header **********/
+body > header {
+    white-space: pre-line;
+    text-align: center;
+    font-size: .8rem;
+}
+body > header > h1,
+body > header > h2 {
+    margin: 0;
+    line-height: 1.35;
+    display: inline-block;
+}
+body > header > h1:not(:last-child) {
+    border-bottom: 1px solid #369;
+}
+
+/********** Middle Area **********/
+body > div {
+    display: flex;
+    flex-wrap: wrap;
+}
+body > div > :empty {
+    display: none;
+}
+body > div > :not(:last-child) {
+    margin-right: 1em;
+}
+
+
+/********** Nav, Aside **********/
+body > div > nav,
+body > div > aside {
+    flex: 0 1 20%;
+}
+body > div > nav ul {
+    list-style-type: none;
+    padding-left: 0;
+}
+
+
+/********** Main **********/
+body > div > main {
+    flex: 1;
+}
+
+
+/********** Footer **********/
+body > footer {
+    text-align: center;
+    font-size: 0.8em;
+    color: #999;
+}
+
+
+/********** Larger screens **********/
+@media screen and (min-width: 600px) {
+    body > header {
+        font-size: 1rem;
+    }
+}
--- a/theme/templates/base.html
+++ b/theme/templates/base.html
@@ -4,6 +4,7 @@
        {% block head %}
        <title>{% block title %}{{ SITENAME }}{% endblock title %}</title>
        <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1">
        {% if FEED_ALL_ATOM %}
        <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Full Atom Feed" />
        {% endif %}
@@ -28,14 +29,19 @@
        {% if TAG_FEED_RSS and tag %}
        <link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_RSS|format(tag.slug) }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Tags RSS Feed" />
        {% endif %}
+        <link href="{{ SITEURL }}/theme/lib/normalize-css/normalize.css" rel="stylesheet" />
+        <link href="{{ SITEURL }}/theme/css/style.css" rel="stylesheet" />
        {% endblock head %}
 </head>
 <body>
 {% block body %}
-        <header class="body">
-                <h1><a href="{{ SITEURL }}/">{{ SITENAME }}</a></h1>
-                <h2><a href="{{ SITEURL }}/">{{ SITESUBTITLE }}</a></h2>
-        </header>
+    <header>
+            <h1><a href="{{ SITEURL }}/">{{ SITENAME }}</a></h1>
+            {% if SITESUBTITLE %}
+            <h2><a href="{{ SITEURL }}/">{{ SITESUBTITLE }}</a></h2>
+            {% endif %}
+    </header>
+    <div>
        <nav><ul>
        {% for title, link in MENUITEMS %}
            <li><a href="{{ link }}">{{ title }}</a></li>
@@ -52,8 +58,16 @@
          {% endif %}
        {% endif %}
        </ul></nav>
-        {% block content %}{% endblock %}
-        {% block footer %}{% endblock %}
+        <main>
+        {%- block content %}{% endblock -%}
+        </main>
+        <aside>
+        {%- block aside %}{% endblock -%}
+        </aside>
+    </div>
+    <footer>
+    {%- block footer %}{% endblock -%}
+    </footer>
 {% endblock %}
 </body>
 </html>
--- a/theme/templates/home.html
+++ b/theme/templates/home.html
@@ -23,3 +23,5 @@
 </ol>
 </section>
 {% endblock content %}
+{% block footer %}
+{% endblock %}