...
 
Commits (2)
......@@ -154,31 +154,30 @@ ul.no-bullet {
/* Navigation
*/
#page-nav {
#archive-header {
background-color: #18BC60;
border-bottom: 1px solid #000;
}
#top-nav h1 {
font-size: 1rem;
#archive-header h1 {
font-weight: 400;
text-transform: uppercase;
letter-spacing: 1px;
line-height: 1;
margin-bottom: 0;
}
#page-nav h1 a {
#archive-header h1 a {
display: block;
background-color: #18BC60;
color: #fff;
font-weight: 700;
text-transform: uppercase;
letter-spacing: 1px;
}
#page-nav h1 a span {
#archive-header h1 a span {
display: inline-block;
vertical-align: middle;
}
#page-nav h1 a img {
#archive-header h1 a img {
display: inline-block;
height: 80px;
width: auto;
......@@ -190,18 +189,18 @@ ul.no-bullet {
margin-bottom: 2rem;
}
#page-nav nav .menu,
#top-nav .top-bar {
background: transparent;
padding-top: 0;
padding-bottom: 0;
}
#top-nav nav .menu {
font-family: "PropCourierSans", Roboto, "DejaVu Sans", Helvetica, Arial, sans-serif;
font-weight: 700;
text-transform: uppercase;
letter-spacing: 1px;
}
#top-nav nav .menu li > span {
display: block;
padding: 0.7rem 1rem 0.7rem 0;
line-height: 1;
background: #fff;
}
#top-nav nav .menu.dropdown li ul.is-dropdown-submenu {
......@@ -265,18 +264,18 @@ ul.index li span.section {
}
ul.index li .title { font-size: 1rem; font-weight: 400;}
#category ul.index li .title { font-size: 1.25rem; }
#homepage ul.index li .title { font-size: 1.25rem; }
ul.index li span.author em {
ul.index li .author em {
color: #666;
font-style: normal;
}
ul.index li span.author a {
ul.index li .author a {
color: #666;
}
ul.index li a + span.author::before {
ul.index li a + .author::before {
color: #666;
display: inline-block;
content: "— ";
......@@ -298,14 +297,30 @@ ul.index li.current a {
color: #666;
}
ul.index li span.author {
display: block;
}
ul.index li .author { display: block; }
#homepage ul.index li .author { display: inline; }
ul.extras li {
display: inline-block;
}
#category ul.menu {
font-size: 1rem;
font-family: "PropCourierSans", Roboto, "DejaVu Sans", Helvetica, Arial, sans-serif;
font-weight: 700;
border: 1px solid #18BC60;
margin-top: 1.5rem;
}
#category ul.menu li {
border-left: 1px solid #18BC60;
}
#category ul.menu li:first-child {
border-left: 0;
}
/* Article
*/
......
......@@ -28,42 +28,39 @@
<body>
<div id="wrapper">
<div id="archive-header">
<h1 class="grid-container"><a href="{{ SITEURL }}">
<img src="{{ SITEURL }}/theme/images/libregraphicsmag-logo.png" alt="Libre Graphics magazine logo">
<span>{{ SITENAME }}</span>
</a></h1>
</div><!-- /#archive-header -->
<div id="top-nav">
<h1><a href="{{ SITEURL }}">
<img src="{{ SITEURL }}/theme/images/libregraphicsmag-logo.png" alt="Libre Graphics magazine logo">
<span>{{ SITENAME }}</span>
</a></h1>
<nav class="grid-container">
<ul class="menu dropdown grid-x grid-padding-x" data-dropdown-menu>
<li class="cell auto"><span>Browse by</span></li>
<li class="cell auto"><a href="{{ SITEURL }}/categories.html">Issue</a>
<nav class="top-bar grid-container">
<div class="top-bar-left">
<ul class="menu dropdown" data-dropdown-menu>
<li class="menu-text">Browse by</li>
<li><a href="{{ SITEURL }}/categories.html">Issue</a>
<ul class="menu">
{# put 'the-archive' category first #}
{% set cats = [categories[-1]] + categories[:-1] %}
{% for cat, null in cats %}
{% for cat, null in categories %}
<li class="cell auto"><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat.slug }}</a></li>
{% endfor %}
</ul>
</li>
<li class="cell auto"><a href="{{ SITEURL }}/authors.html">Author</a></li>
<li class="cell auto"><a href="{{ SITEURL }}/tags.html">Theme</a></li>
</ul>
</nav>
<!--
<nav>
{% for title, link in MENUITEMS %}
<a href="{{ link }}">{{ title }}</a>&nbsp;
{% endfor %}
{% if DISPLAY_PAGES_ON_MENU %}
{% for page in pages %}
<a href="{{ SITEURL }}/{{ page.url }}">{{ page.title }}</a>&nbsp;
{% endfor %}
{% endif %}
{% for cat, null in categories %}
<a href="{{ SITEURL }}/{{ cat.url }}">Issue {{ cat.slug }}</a>&nbsp;
{% endfor %}
</nav>
-->
<li><a href="{{ SITEURL }}/authors.html">Author</a></li>
<li><a href="{{ SITEURL }}/tags.html">Theme</a></li>
</ul>
</div>
<div class="top-bar-right">
<ul class="menu vertical medium-horizontal">
<li {% if page and page.slug == "glossary" %}class="active"{% endif %}>
<a href="{{ SITEURL }}/glossary/">Glossary</a>
</li>
<li {% if page and page.slug == "about" %}class="active"{% endif %}>
<a href="{{ SITEURL }}/about/">About</a>
</li>
</ul>
</div>
</nav>
</div><!-- /#top-nav -->
{% block content %}
......@@ -89,6 +86,9 @@
<li {% if page and page.slug == "about" %}class="active"{% endif %}>
<a href="{{ SITEURL }}/about/">About</a>
</li>
<li {% if page and page.slug == "glossary" %}class="active"{% endif %}>
<a href="{{ SITEURL }}/glossary/">Glossary</a>
</li>
</ul>
</div>
<div class="cell small-12 medium-8">
......
......@@ -50,22 +50,20 @@
</ul>
</div>
<footer class="cell">
<h4>Browse issues:</h4>
<p class="index">
<ul class="menu vertical medium-horizontal">
<li class="menu-text">Browse issues:</li>
{% for cat, articles in categories %}
{% if cat == category %}
<span class="button hollow disabled title">
Issue {{ cat.name.replace('issue', '') }}
</span>
<li class="is-active"><a href="{{ SITEURL }}/{{ cat.url }}" title="{{ cat.page.title }}">
{{ cat.slug }}
</a></li>
{% else %}
<a class="button hollow" href="{{ SITEURL }}/{{ cat.url }}" title="{{ cat.page.title }}">
<span class="title">
Issue {{ cat.name.replace('issue', '') }}
</span>
</a>
<li><a href="{{ SITEURL }}/{{ cat.url }}" title="{{ cat.page.title }}">
{{ cat.slug }}
</a></li>
{% endif %}
{% endfor %}
</p>
</ul>
</div><!-- /.previous-next -->
</div><!-- /.content -->
</section><!-- /.grid-container -->
......
......@@ -10,20 +10,44 @@
<li><a href="{{ SITEURL }}/{{ page.url }}">{{ page.title }}</a></li>
{% endfor %}
-->
<div class="content">
<div id="homepage" class="content">
<h2><a href="{{ SITEURL }}/the-archive">The Archive</a></h2>
<ul class="index">
{% for article in articles_page.object_list %}
{% if article.category.slug == 'the-archive' %}
<li>
<a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark"
title="Permalink to {{ article.title|striptags }}">
{% if article.section %}
<span class="section">{{ article.section }}</span>
{% endif %}
<strong class="title">{{ article.title }}</strong>
</a>
{% if article.authors %}
<span class="author">
{% for author in article.authors %}
<em>{{ author }}</em>{% if not loop.last %}, {% endif %}
{% endfor %}
</span>
{% endif %}
</li>
{% endif %}
{% endfor %}
</ul>
<ul class="issues grid-x small-up-2 medium-up-4">
{# put 'the-archive' category first #}
{% set cats = [categories[-1]] + categories[:-1] %}
{% for category, articles in cats %}
<li class="cell">
<a href="{{ SITEURL }}/{{ category.url }}">
<img src="/images/{{ category.slug }}/cover-{{ category.slug }}.png" alt="Cover, Issue {{ category.slug }}">
<span class="title">
Issue {{ category.name.replace('issue', '') }}
<strong>{{ category.page.title }}</strong>
</span>
</a>
</li>
{% for category, articles in categories %}
{% if category.slug != "the-archive" %}
<li class="cell">
<a href="{{ SITEURL }}/{{ category.url }}">
<img src="/images/{{ category.slug }}/cover-{{ category.slug }}.png" alt="Cover, Issue {{ category.slug }}">
<span class="title">
Issue {{ category.name.replace('issue', '') }}
<strong>{{ category.page.title }}</strong>
</span>
</a>
</li>
{% endif %}
{% endfor %}
</ul>
</div><!-- /.content -->
......
......@@ -20,7 +20,7 @@
{% block content %}
<section class="grid-container">
<h2>{{ page.title }}</h2>
<div class="content">
<div id="{{ page.slug }}" class="content">
{% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ page.slug }}.pdf">get
the pdf</a>{% endif %}
......