Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development

This commit is contained in:
stephan 2020-02-27 15:33:43 +01:00
commit 2744d107ae
2 changed files with 44 additions and 32 deletions

View File

@ -34,14 +34,13 @@
<div class="print-transform"> <div class="print-transform">
<div class="section"> <div class="section">
<div class="row container"> <div class="row container">
<div class="col s12">
<p>&nbsp;</p>
</div>
<div class="col s12 m5"> <div class="col s12 m5">
<h1>nopaque</h1> <h1>nopaque</h1>
<p class="light">Patrick Jentsch, Stephan Porada und Helene Schlicht</p> <p>From text to data to analysis</p>
<p class="light">Patrick Jentsch, Stephan Porada and Helene Schlicht</p>
</div> </div>
<div class="col s12 m7"> <div class="col s12 m7">
<p>&nbsp;</p>
<div class="card"> <div class="card">
<div class="card-content"> <div class="card-content">
<div class="row"> <div class="row">

View File

@ -157,55 +157,68 @@
<footer class="page-footer"> <footer class="page-footer">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col s12 m4"> <div class="col s6 m3">
<a href="https://www.dfg.de/"> <a href="https://www.dfg.de/">
<img class="responsive-img" src="{{ url_for('static', filename='images/logo_-_dfg.gif') }}"> <img class="responsive-img" src="{{ url_for('static', filename='images/logo_-_dfg.gif') }}">
</a> </a>
</div> </div>
<div class="col s12 m4">
<h5 class="white-text">Contact</h5>
<ul>
<li>Patrick Jentsch: p.jentsch@uni-bielefeld.de</li>
<li>Stephan Porada: sporada@uni-bielefeld.de</li>
<li>Helene Schlicht: helene.schlicht@uni-bielefeld.de</li>
</ul>
</div>
<div class="col s12 m3">
<h5 class="white-text">Reminder</h5>
<p>
More information regarding nopaques upcomming release will follow in the near future on our website.<br>
<small>www.uni-bielefeld.de/sfb1288/projekte/inf.html</small>
</p>
</div>
<div class="col s12 m1">
<p>&nbsp;</p>
<img class="responsive-img" src="{{ url_for('static', filename='images/qr_-_inf.svg') }}">
</div>
<!--
<div class="col s6 m3 offset-m1 center-align"> <div class="col s6 m3 offset-m1 center-align">
<a href="https://www.uni-bielefeld.de/sfb1288/"> <a href="https://www.uni-bielefeld.de/sfb1288/">
<img class="responsive-img" src="{{ url_for('static', filename='images/logo_-_sfb_1288.png') }}"> <img class="responsive-img" src="{{ url_for('static', filename='images/logo_-_sfb_1288.png') }}">
</a> </a>
</div> </div>
<div class="col s12 m3 offset-m1"> <div class="col s12 m3 offset-m1">
<ul>
<h5 class="white-text">Links</h5> <h5 class="white-text">Links</h5>
<li style="overflow: hidden;"><a class="grey-text text-lighten-3" href="#!"><i class="material-icons left">feedback</i>Feedback</a></li> <ul>
<li style="overflow: hidden;"><a class="grey-text text-lighten-3" href="https://gitlab.ub.uni-bielefeld.de/sfb1288inf/opaque"><i class="material-icons left">code</i>GitLab</a></li> <li><a class="grey-text text-lighten-3" href="#!"><i class="material-icons tiny">feedback</i> Feedback</a></li>
<li><a class="grey-text text-lighten-3" href="https://gitlab.ub.uni-bielefeld.de/sfb1288inf/opaque"><i class="material-icons tiny">code</i> GitLab</a></li>
</ul> </ul>
</div> </div>
-->
</div> </div>
</div> </div>
<!--
<div class="footer-copyright"> <div class="footer-copyright">
<div class="container"> <div class="container">
© 2020 Bielefeld University © 2020 Bielefeld University
<a class="grey-text text-lighten-4 right" href="#!">Legal notice</a> <a class="grey-text text-lighten-4 right" href="#!">Legal notice</a>
</div> </div>
</div> </div>
-->
</footer> </footer>
<!--
<footer class="page-footer">
<div class="container">
<div class="row">
<div class="col s12 m3">
<a href="https://www.dfg.de/">
<img class="responsive-img" src="{{ url_for('static', filename='images/logo_-_dfg.gif') }}">
</a>
</div>
<div class="col s12 m6">
<h5 class="white-text" style="margin-left: -15px;">Contact</h5>
<div class="row">
<p>Contact our interdisciplinary team via email: <b>inf_sfb1288@lists.uni-bielefeld.de</b></p>
<p>Silke Schwandt (Digital History), Johanna Vompras (Research Data Management), Julia Becker (Cultural Studies), Patrick Jentsch (Cognitive Informatics), Anna Neubert (Digital Humanities), Stephan Porada (Interdisciplinary Media Studies), Helene Schlicht (History, Philosophy)
</div>
</div>
<div class="col s12 m3">
<div class="row">
<div class="col s8">
<h5 class="white-text">Reminder</h5>
<p>
Check out our website for nopaque's upcomming release:<br>
<small>www.uni-bielefeld.de/sfb1288/projekte/inf.html</small>
</p>
</div>
<div class="col s4">
<p>&nbsp;</p>
<img class="responsive-img" src="{{ url_for('static', filename='images/qr_-_inf.svg') }}">
</div>
</div>
</div>
</div>
</div>
</footer>
-->
<script src="{{ url_for('static', filename='js/Materialize/materialize.min.js') }}"></script> <script src="{{ url_for('static', filename='js/Materialize/materialize.min.js') }}"></script>
<script> <script>
document.addEventListener("DOMContentLoaded", function() { document.addEventListener("DOMContentLoaded", function() {