Commit 7ee272db authored by ludi's avatar ludi

Merge branch 'master' of gitlab.constantvzw.org:osp/work.maintenance-as-architecture

parents 6befe1b4 e2401e4a
Pipeline #198 failed with stages
......@@ -192,8 +192,4 @@ limits of disciplines, social occupations and precarity. In 2013 he held his
first retrospective exhibition. Both are members of the housing community
Woningen 123 Logements.
</div>
<div markdown="true" id=office-back-to-top>
<a href="">Back to top</a>
</div>
</div>
\ No newline at end of file
......@@ -128,7 +128,7 @@ p + p {
#taglist .tag {
text-decoration: none;
color: var(--text-color);
margin-left: 1em;
margin-right: 1em;
display: none;
}
......@@ -137,11 +137,12 @@ p + p {
}
#taglist .tag.active, #taglist.show-all .tag {
display: initial;
display: inline-block;
}
.filter-active #taglist:before {
content: "Found " attr(data-post-count) ", filtered by tag(s): "
content: "Found " attr(data-post-count) " entries, filtered by tag(s):";
padding-right: 1em;
}
.filter-active #taglist, #taglist.show-all {
......@@ -241,24 +242,24 @@ article.entry {
display: inline-block;
}
.entry .metadata .summary,
.entry .metadata .content {
margin-top: 1em;
}
.entry .metadata .toggle {
margin-top: .5em;
margin-bottom: 1em;
}
.entry .metadata .toggle:before {
display: inline;
cursor: zoom-in;
content: "+";
content: "+ expand description";
}
.entry[data-expanded="true"] .metadata .toggle:before {
cursor: zoom-out;
content: "-";
}
.entry .metadata .tags h5 {
content: "- collapse description";
}
.entry .metadata .tags a {
......@@ -271,7 +272,7 @@ article.entry {
}
.entry .metadata .tags a {
margin-right: 1.5em;
margin-right: 1em;
}
.entry .metadata .tags a:last-child {
......@@ -282,22 +283,10 @@ a.tag {
position: relative;
}
a.tag:hover:before {
content: '+';
position: absolute;
left: -.75em;
top: -.1em;
}
a.tag.active {
text-decoration: underline !important;
}
a.tag.active:hover:before {
content: 'x';
top: -.2em;
}
h3 {
font-size: 175%;
/*text-transform: uppercase;*/
......@@ -309,6 +298,20 @@ li.active {
font-weight: 200;
}
#back-to-top {
float: right;
position: sticky;
bottom: 2em;
font-size: 50%;
padding: .25em 1em .25em 1em;
border: 2px solid white;
background-color: black;
}
#back-to-top a{
text-decoration: none;
}
@media (orientation: portrait) {
#postlist article {
min-height: auto;
......@@ -329,7 +332,7 @@ li.active {
.entry .entry-content {
margin: 0 1.5em 0 0;
flex: 1 1 auto;
flex: 2 0;
position: sticky;
max-height: calc(100vh - 2em);
top: 1em;
......@@ -342,23 +345,29 @@ li.active {
.entry .metadata {
margin: 0;
flex: 0 0 250px;
flex: 1 0;
min-width: 300px;
}
}
@media screen and (min-width: 1300px) {
@media screen and (min-width: 1400px) {
body {
font-size: 180%;
}
.entry .entry-content {
flex: 3 0;
}
.entry .metadata {
flex: 0 0 25vw;
flex: 1 0;
}
}
@media screen and (max-width: 800px) {
/** Mobile? */
body {
font-size: 115%;
margin: .5em 1.5em .5em .5em;
}
......@@ -367,6 +376,10 @@ li.active {
padding-left: .5em;
/* padding-:5vh; */
}
.entry .metadata {
margin: 1em 0.5em 1em 0.5em;
}
}
/*office page styles */
......@@ -430,23 +443,6 @@ section.page-content.office .portraits object, section.page-content.office .port
line-height: 1em !important;
}
#office-back-to-top {
position: sticky;
bottom: 2em;
right: 2em;
float: left;
margin-left: 50%;
font-size: 50%;
padding: .25em 1em .25em 1em;
border: 2px solid white;
background-color: black;
}
#office-back-to-top a{
text-decoration: none;
}
@page {
size: 210mm 297mm;
margin: 0mm 20mm 0mm 20mm;
......@@ -543,10 +539,6 @@ section.page-content.office .portraits object, section.page-content.office .port
content: '';
}
.entry .tags a.tag {
margin-right: 0;
}
.entry .tags:before {
content: "Tags: ";
}
......
......@@ -34,7 +34,7 @@
{% endblock head %}
</head>
<body id="index" class="{% block body_class %}{% endblock %}">
<body id="top" class="{% block body_class %}{% endblock %}">
<section id="title">
<h1><a href="{{ SITEURL }}/">{{ SITENAME }} <strong>{{ SITESUBTITLE }}</strong></a></h1>
{% block content_title %}
......
......@@ -19,13 +19,13 @@
<section id="postlist">
<article id="print-cover">
<h2>
MAMA
YOUR MAMA
</h2>
<p>
Maintenance as Architecture
</p>
<p>
Introduction about this document
MAMA is a developing spatial practice to whom maintenance matters.
</p>
<section class="print-metadata">
<section class="tags"></section>
......@@ -34,29 +34,32 @@
</article>
{% for article in articles_page.object_list %}
<article class="entry" data-slug="{{ article.slug }}">
{% if article.image %}
<div class="entry-content">
{% if article.image %}
<object data="{{ SITEURL }}/images/{{ article.image }}" class="entry-img" type="image/svg+xml"></object>
{% endif %}
</div><!-- /.entry-content -->
{% endif %}
<section class="metadata">
{% if article.content %}
<section class="summary">{{ article.summary }}</section>
<section class="content">{{ article.content }}</section>
<section class="toggle"></section>
{% endif %}
<section class="tags">
{% for tag in article.tags %}
<a href="{{ SITEURL }}/{{ tag.url }}" data-slug="{{ tag.slug }}" class="tag">{{ tag }}</a>
{% endfor %}
</section>
{% if article.content %}
<section class="summary">{{ article.summary }}</section>
<section class="content">{{ article.content }}</section>
<section class="toggle"></section>
{% endif %}
</section>
</article>
{% endfor %}
</section><!-- /#posts-list -->
{% if articles_page.has_other_pages() %}
{% include 'pagination.html' %}
{% endif %}
{% endif %}
<div markdown="true" id="back-to-top">
<a href="#top"></a>
</div>
</section><!-- /#content -->
<script src="{{ SITEURL }}/theme/js/tags.js"></script>
......
......@@ -12,6 +12,9 @@
<p>
Last updated: {{ page.locale_modified }}
</p>
{% endif %}
{% endif %}
<div markdown="true" id="back-to-top">
<a href="#top"></a>
</div>
</section>
{% endblock %}
{% endblock %}
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment