diff --git a/themes/cetcat/static/css/main.css b/themes/cetcat/static/css/main.css index 7603c153..ec89a869 100644 --- a/themes/cetcat/static/css/main.css +++ b/themes/cetcat/static/css/main.css @@ -10,6 +10,18 @@ font-weight: normal; font-style: normal; } +@font-face{ + font-family: "CMUconcrete"; + src:url('../fonts/cmunorm.ttf'); + font-weight: normal; + font-style: normal; +} +@font-face{ + font-family: "CMUconcrete"; + src:url('../fonts/cmunobx.ttf'); + font-weight: bold; + font-style: normal; +} @font-face{ font-family: "liberation"; src:url('../fonts/cmunit.ttf'); @@ -25,21 +37,31 @@ body{ margin:0 auto 5em auto; padding: 0px 15px; font-family: "liberation", monospace; - font-size: 18px; - line-height:1.7; + font-size: 16px; + line-height:1.8; font-style: normal; background-color: rgb(252, 255, 120); color:black; } header { width:calc(100% - 50px); - margin-top:15px; + margin-top:0; margin-bottom:4em; padding-bottom:1em; font-size: 12px; line-height: 1.7; letter-spacing: 0; } + #content.index header{ + font-family: 'CMUconcrete'; + font-size: 26px; + line-height: 1.6; + letter-spacing: .035em; + } + #content.index header em{ + font-size: 100%; + padding-right: 10px; + } #content{ margin-top:1em; } @@ -58,8 +80,7 @@ hr, .separator hr { border:0; border-top:1px dotted #7e5211; color: black; - margin-top:1em; - margin-bottom:1em; + margin:2em 0; } blockquote { @@ -90,6 +111,7 @@ p{ margin:0 0 1em 0; } em{ + font-family: 'liberation'; letter-spacing: 0; font-size: 125%; line-height: 1.0; @@ -113,14 +135,14 @@ pre{ #translation{ position: absolute; font-size: 12px; - top:-5px; - right:5px; + top:0px; + right:15px; margin:0; padding:0; + text-align: right; } #translation li{ list-style: none; - display: inline-block; } #translation li.active a{ text-decoration: none; @@ -137,10 +159,6 @@ pre{ .summary p{ display: inline; } -.summary img{ - width: 100%; - margin:0 0 1em 0; -} .long-read .hentry{ width:calc(400px + 2em); } @@ -153,67 +171,116 @@ pre{ padding:0; vertical-align: top; } + .hentry .article-info{ + width: 200px; + } + /* title */ .hentry .article-info .entry-title{ + width: 100%; font-family: "cmusans"; font-size: 190%; font-weight: bold; line-height: 1.10; margin:0; } - .hentry .article-info .entry-title a{ - text-decoration: none; - 8} + .hentry .article-info .entry-title a{ + text-decoration: none; + } + /* date */ + .event-details{ + width: 100%; + font-family: 'CMUconcrete'; + font-size: 12px; + margin:.5em 0 1em 0; + } /* ascii art styling */ .hentry pre{ font-size: 14.4px; font-weight: normal; } - .event-details{ - font-weight: bold; - margin:.5em 0 1em 0; + /* featured image */ + .hentry .article-info .featured-image img{ + width:200px; + max-height: 100%; + } + /* double-blocks for super important categories */ + .hentry.longread, .hentry.longread .article-info, .hentry.longread .featured-image img{ + width: calc(400px + 2em); } /****************************/ /* article */ +#content.body .entry-title{ + display:inline-block; + font-family: "cmusans"; + font-size: 180%; + line-height: 1.25; + font-weight: bold; + margin:30px 0 30px 275px; + color:#7e5211; + width: calc(100% - 275px); +} .article-info, .post-info{ color:#7e5211; } .article-info{ + width:200px; + float: left; margin-bottom:1em; } - .article-info .post-info time sup{ - font-size: 100%; - } .article-info .entry-title{ - width:100%; - display:inline-block; - font-family: "cmusans"; - font-size: 280%; - line-height: 1.5; - font-weight: bold; - } -.entry-content, #page-content{ - width: 800px; - margin:0; -} - .entry-content img, .summary img, #page-content img{ - max-width:100%; } - .entry-content .seperator hr, #page-content hr{ - max-width: 50%; + .article-info .featured-image img{ + max-width: 200px; + max-height: 300px; } -.post-info{ - font-size: 14px; - font-style: italic; - line-height: 0.95; -} - .post-info sup{ - font-size: 100%; + .post-info{ + font-size: 14px; + font-style: italic; + line-height: 0.95; } - .post-info .categories{ - margin: 5px 0; + .post-info sup{ + font-size: 100%; + } + .post-info .categories{ + margin: 5px 0; + } +.entry-content-container, #page-content-container{ + width: calc(100% - 285px); + background-color: rgba(255,255,0,.3); + float: right; + padding:30px; + margin-bottom:25px; +} + .entry-content, #page-content{ + position: relative; + max-width: 700px; + margin:0 auto 0 20px; } + .entry-content img, #page-content img{ + max-height:400px; + } + .entry-content .seperator hr, #page-content hr{ + width:100%; + } + /* Roel's complex footnote effect */ + .entry-content span.simple-footnote-container{ + float: left; + width: 200px; + margin-left:-270px; + } + .entry-content span.simple-footnote-content{ + font-size: 12px; + line-height: 1.1; + word-wrap:break-word; + } + .entry-content blockquote{ + font-size: 150%; + margin:0 3em; + line-height: 1.5; + } + /****************************/ /* other */ @@ -246,8 +313,8 @@ pre{ } /* add a monochrome filter over past events */ -.past-event img{ - filter:opacity(0.1); +.featured-image.past-event img{ + filter:opacity(0.25); /*filter: url("/images/filter.svg#monochrome"); -webkit-filter: url("/images/filter.svg#monochrome");*/ } diff --git a/themes/cetcat/static/fonts/cmunobx.ttf b/themes/cetcat/static/fonts/cmunobx.ttf new file mode 100644 index 00000000..d320eb74 Binary files /dev/null and b/themes/cetcat/static/fonts/cmunobx.ttf differ diff --git a/themes/cetcat/templates/article.html b/themes/cetcat/templates/article.html index 2cdc636a..ff8f7798 100644 --- a/themes/cetcat/templates/article.html +++ b/themes/cetcat/templates/article.html @@ -18,35 +18,50 @@ {% block content %}
+ +
+ {{ article.title }} +
-
- {{ article.title }} +
{% if article.event_start %} {{ article.event_start }} {% endif %}
-
-
- {{ article.content }} -

-
- +
+
+ + {{ article.content }} +

+
+
{% endblock %} diff --git a/themes/cetcat/templates/base.html b/themes/cetcat/templates/base.html index 17abe3df..da3ac5fe 100644 --- a/themes/cetcat/templates/base.html +++ b/themes/cetcat/templates/base.html @@ -32,13 +32,6 @@
  • RSS
  • {% endif %} - {% block content %} {% endblock %} diff --git a/themes/cetcat/templates/index.html b/themes/cetcat/templates/index.html index 99096bff..0d8f28a7 100644 --- a/themes/cetcat/templates/index.html +++ b/themes/cetcat/templates/index.html @@ -1,6 +1,13 @@ {% extends "base.html" %} {% block content %}
    + {% block content_title %} {% endblock %} {% if articles_page.has_other_pages() %} @@ -23,8 +30,13 @@ {% endif %} + -
    {{ article.summary }} +
    {{ article.summary }} {% if DEFAULT_LANG == 'en' %}