Merge branch 'master' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib

This commit is contained in:
Alice 2018-06-13 10:48:37 +02:00
commit 0f5e5606ab
3 changed files with 13 additions and 16 deletions

View File

@ -5,14 +5,14 @@ font-family: "Archivo Narrow";
}
p{
font-size: 18px;
font-size: 20px;
}
a{
text-decoration: none;
text-decoration: underline;
color: black;
}
a:hover{
@ -68,7 +68,7 @@ padding: 0px 10px;
}
.about{
font-size: 16px;
font-size: 18px;
}
.library_table{
@ -106,7 +106,7 @@ background-color: #E8E8E8!important;
}
.library_table .author_col{
font-size: 15px;
font-size: 18px;
}
.library_table li{
@ -133,7 +133,6 @@ background-color: #fafafa;
#title_xppl{
font-size: 46px;
cursor: pointer;
}
.header input{
@ -146,7 +145,7 @@ font-weight: bold;
.author input{
height:20px;
width: 500px;
font-size: 16px;
font-size: 18px;
}
.search input{

View File

@ -2,6 +2,7 @@
{% block main %}
<h1 class="page-header">About</h1>
<div style="width: 900px;">
<p class='about'>
XPPL is a project aimed at people who are studying the field of media culture, or as we like to call them: knowledge comrades.
<br>
@ -14,18 +15,14 @@ This digital library gathers all the books and articles floating around on the s
<br>
Are you interested in how this library works? Have a look at the source code in <a href 'https://git.xpub.nl/xpub-lib/log.html'> our git. </a>
</p>
<h2> What's the deal with the stacks? </h2>
<p class='about'>
A stack is a number of books that are read at a certain point in time, alternating between them. They usually have a topic in common, or follow a certain study path that can bring you to a point of knowledge. Rather than a bookshelf, where books are lined up and often forgotten, the stack on your table/nightstand/toilet consists of books prone to be opened and reopened at any time.
</p>
<h2>Who's behind this?</h2>
<p class='about'>
We're Angeliki, Alex, Alice, Joca, Natasha and Zalán, helped and supported by Femke, Aymeric, Michael, Steve, Andre, Leslie and many more.
<br>
<br>
XPUB is a study path within the Piet Zwart Institute masters program.
We're Angeliki, Alex, Alice, Joca, Natasha and Zalán, helped and supported by Femke, Aymeric, Michael, Steve, Andre, Leslie and many more. XPUB is a study path within the Piet Zwart Institute masters program.
</p>
</div>
{% endblock %}

View File

@ -7,7 +7,7 @@
<div style="float:right; padding-right: 140px;">
<img class="no_cover" id="{{ book.title }}" src="../cover/{{ book.cover }}" width="280px" onerror="if (this.src != '../cover/{{ book.cover }}') this.src = '../static/img/default_cover.gif';"></div>
<table class="library_table" id="table" style="width:50%; padding-bottom: 80px;">
<table class="library_table" id="table" style="width:50%; padding-bottom: 180px;">
<thead>
<tr id="header">
<th style="width: 150px;"></th>
@ -103,12 +103,13 @@
<a href="{{ url_for('edit_book_by_id', id=book.id )}}"><button style= "font-size: 10pt;"> edit</button></a>
<a href="{{ url_for('remove_book_by_id', id=book.id)}}"><button style= "font-size: 10pt;"> delete</button></a>
<br><br>
<br><br>
{%endif%}
<hr>
{% if previousbook %}
<a href="{{ url_for('show_book_by_id', id=previousbook.id )}}" style="font-size: 9pt;"> < see the previous book added to XPPL: &nbsp;<i>{{ previousbook.title |truncate(40,True,'...') }} </i></a> {% endif %}
<a href="{{ url_for('show_book_by_id', id=previousbook.id )}}" style="font-size: 10pt;"> < see the previous book added to XPPL: &nbsp;<i>{{ previousbook.title |truncate(40,True,'...') }} </i></a> {% endif %}
{% if nextbook %}
<a href="{{ url_for('show_book_by_id', id=nextbook.id )}}" style="float:right; font-size: 9pt;"> see the next book added to XPPL: &nbsp;<i>{{ nextbook.title|truncate(40,True,'...')}} </i>> </a>{% endif %}
<a href="{{ url_for('show_book_by_id', id=nextbook.id )}}" style="float:right; font-size: 10pt;"> see the next book added to XPPL: &nbsp;<i>{{ nextbook.title|truncate(40,True,'...')}} </i>> </a>{% endif %}
</div>
{% endblock %}