Commit 36007f3f authored by Axel Dürkop's avatar Axel Dürkop
Browse files

Merge branch '2019' into 'master'

2019

See merge request hoou/tekethics!9
parents 4a5969c8 d2555044
Pipeline #62774 passed with stages
in 3 minutes and 35 seconds
Jekyll Site for tekethics
## Entwicklung der Website
Die Website basiert auf Jekyll und kann lokal mit einem Docker Image entwickelt werden:
docker run --rm --label=jekyll --volume=`pwd`:/srv/jekyll -it -p 4000:4000 jekyll/jekyll jekyll serve -w
<footer class="site-footer">
<p><strong>tekethics</strong> | is an open learning project of <a href="https://www.tuhh.de/tuhh/startseite.html" target="_blank">Hamburg University of Technology (TUHH)</a> in cooperation with the IMT School for Advanced Studies in Lucca and the UNESCO Chair in Bioethics and Human Rights in Rome funded by the <a href="http://www.hoou.de/p/" target="_blank">Hamburg Open Online University (HOOU)</a>.</p>
<p><strong>tekethics</strong> | ist ein Lernangebot der <a href="https://www.tuhh.de/tuhh/startseite.html" target="_blank">Technischen Universität Hamburg (TUHH)</a> in Zusammenarbeit mit der IMT School for Advanced Studies in Lucca, dem UNESCO Chair in Bioethics and Human Rights in Rom sowie den Hamburger Öffentlichen Bücherhallen gefördert von der <a href="http://www.hoou.de/p/" target="_blank">Hamburg Open Online University (HOOU)</a>.</p>
<div class="logo-widget">
<a href="https://www.tuhh.de/tuhh/startseite.html" target="_blank"><img src="assets/images/tuhh-logo.svg" alt="TUHH-Logo"></a>
......@@ -7,7 +7,7 @@
</div>
<div id="footer-nav">
<a href="{% link imprint.md %}">Legal Notice</a>
<a href="{% link imprint.md %}">Impressum und Datenschutzerklärung</a>
</div>
</footer>
<script src="assets/js/jquery.nav.js"></script>
......@@ -3,7 +3,7 @@
<div class="nav-wrapper">
<a href="#top"><img class="logo" src="assets/images/Logo_tekethics_72dpi.png" alt="{{ site.title | escape }}"></a>
<a href="http://www.hoou.de/" target="_blank"><img id="hoou_logo" src="assets/images/HOOU_Logo_kurz_Zusatz_kl.svg" alt="{{ site.title | escape }}"></a>
<a href="https://www.hoou.de/" target="_blank"><img id="hoou_logo" src="assets/images/hoou-logo_neu.svg" alt="{{ site.title | escape }}"></a>
<nav>
<input type="checkbox" id="nav-trigger" class="nav-trigger" />
......@@ -17,16 +17,16 @@
</span>
</label>
<div class="trigger">
<a class="page-link" href="#start">Let's Get Started</a>
<a class="page-link" href="#course">About The Course</a>
<a class="page-link" href="#about">About Us</a>
<a class="page-link" href="#downloads">Resources</a>
<a class="page-link" href="#start">Das Projekt</a>
<a class="page-link" href="#course">Lernangebote</a>
<a class="page-link" href="#team">Team</a>
<a class="page-link" href="#downloads">Lernmaterial</a>
</div>
</nav>
</div>
</div>
<h3 class="center">Have you ever wondered...</h3>
<h3 class="center">Haben Sie sich jemals gefragt...</h3>
<div class="symbols_wrapper">
<a class="symbolbox" href="#course">
......@@ -34,7 +34,7 @@
<i class="fa fa-circle-thin fa-stack-2x circle"></i>
<i class="fa fa-cog fa-stack-1x" aria-hidden="true"></i>
</span>
<h2 class="center">... should we <span class="bold">fear robots</span> to become sort of <span class="bold">terminators</span> in a not too distant <span class="bold">future?</span></h2>
<h2 class="center">... ob aus den <span class="bold">Robotern</span> von heute bald <span class="bold">Terminator</span> werden?</h2>
</a>
<a class="symbolbox" href="#course">
<span class="fa-stack fa-lg fa-5x">
......@@ -42,7 +42,7 @@
<i class="fa fa-circle-thin fa-stack-2x circle"></i>
<i class="fa fa-user fa-stack-1x" aria-hidden="true"></i>
</span>
<h2 class="center">... how far should <span class="bold">human enhancement</span> go?</h2>
<h2 class="center">... welche Chancen und Risiken in <span class="bold">Künstlicher Intelligenz</span> liegen?</h2>
</a>
<a class="symbolbox" href="#course">
......@@ -50,7 +50,7 @@
<i class="fa fa-circle-thin fa-stack-2x circle"></i>
<i class="fa fa-leaf fa-stack-1x" aria-hidden="true"></i>
</span>
<h2 class="center">... what kind of <span class="bold">duties</span> do we have <span class="bold">towards nature,</span> and why?</h2>
<h2 class="center">... welche <span class="bold">Pflichten</span> wir gegenüber der <span class="bold">Natur</span> haben und warum?</h2>
</a>
</div>
......
......@@ -3,7 +3,7 @@
<div class="nav-wrapper">
<a href="#top"><img class="logo" src="assets/images/Logo_tekethics_72dpi.png" alt="{{ site.title | escape }}"></a>
<a href="http://www.hoou.de/" target="_blank"><img id="hoou_logo" src="assets/images/HOOU_Logo_kurz_Zusatz_kl.svg" alt="{{ site.title | escape }}"></a>
<a href="https://www.hoou.de/" target="_blank"><img id="hoou_logo" src="assets/images/hoou-logo_neu.svg" alt="{{ site.title | escape }}"></a>
<nav>
<input type="checkbox" id="nav-trigger" class="nav-trigger" />
......
......@@ -3,24 +3,24 @@
<div class="imprint-wrapper">
<a href="{{ "/" | relative_url }}"><img class="logo" src="assets/images/Logo_tekethics_72dpi.png" alt="{{ site.title | escape }}"></a>
<a href="http://www.hoou.de/" target="_blank"><img id="hoou_logo" src="assets/images/HOOU_Logo_kurz_Zusatz_kl.svg" alt="{{ site.title | escape }}"></a>
<a href="https://www.hoou.de/" target="_blank"><img id="hoou_logo" src="assets/images/hoou-logo_neu.svg" alt="{{ site.title | escape }}"></a>
<nav class="site-nav">
<input type="checkbox" id="nav-trigger" class="nav-trigger" />
<label for="nav-trigger">
<span class="menu-icon">
<svg viewBox="0 0 18 15" width="18px" height="15px">
<path fill="#424242" d="M18,1.484c0,0.82-0.665,1.484-1.484,1.484H1.484C0.665,2.969,0,2.304,0,1.484l0,0C0,0.665,0.665,0,1.484,0 h15.031C17.335,0,18,0.665,18,1.484L18,1.484z"/>
<path fill="#424242" d="M18,7.516C18,8.335,17.335,9,16.516,9H1.484C0.665,9,0,8.335,0,7.516l0,0c0-0.82,0.665-1.484,1.484-1.484 h15.031C17.335,6.031,18,6.696,18,7.516L18,7.516z"/>
<path fill="#424242" d="M18,13.516C18,14.335,17.335,15,16.516,15H1.484C0.665,15,0,14.335,0,13.516l0,0 c0-0.82,0.665-1.484,1.484-1.484h15.031C17.335,12.031,18,12.696,18,13.516L18,13.516z"/>
</svg>
</span>
</label>
<div class="trigger">
<a class="page-link" href="/#start">Let's Get Started</a>
<a class="page-link" href="/#course">About The Course</a>
<a class="page-link" href="/#about">About Us</a>
</div>
</nav>
</div>
<nav class="site-nav">
<input type="checkbox" id="nav-trigger" class="nav-trigger" />
<label for="nav-trigger">
<span class="menu-icon">
<svg viewBox="0 0 18 15" width="18px" height="15px">
<path fill="#424242" d="M18,1.484c0,0.82-0.665,1.484-1.484,1.484H1.484C0.665,2.969,0,2.304,0,1.484l0,0C0,0.665,0.665,0,1.484,0 h15.031C17.335,0,18,0.665,18,1.484L18,1.484z"/>
<path fill="#424242" d="M18,7.516C18,8.335,17.335,9,16.516,9H1.484C0.665,9,0,8.335,0,7.516l0,0c0-0.82,0.665-1.484,1.484-1.484 h15.031C17.335,6.031,18,6.696,18,7.516L18,7.516z"/>
<path fill="#424242" d="M18,13.516C18,14.335,17.335,15,16.516,15H1.484C0.665,15,0,14.335,0,13.516l0,0 c0-0.82,0.665-1.484,1.484-1.484h15.031C17.335,12.031,18,12.696,18,13.516L18,13.516z"/>
</svg>
</span>
</label>
<div class="trigger">
<a class="page-link" href="/#start">Das Projekt</a>
<a class="page-link" href="/#course">Lernangebote</a>
<a class="page-link" href="/#team">Team</a>
<a class="page-link" href="/#downloads">Lernmaterial</a>
</div>
</nav>
</header>
This diff is collapsed.
@charset "utf-8";
// Define defaults for each variable.
@import url('https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i,700,700i');
@import url("https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i,700,700i");
$base-font-family: "Open Sans", Arial, sans-serif !default;
$base-font-size: 16px !default;
$base-font-size: 16px !default;
$base-font-weight: 400 !default;
$small-font-size: $base-font-size * 0.840 !default;
$small-font-size: $base-font-size * 0.84 !default;
$base-line-height: 1.5 !default;
$spacing-unit: 30px !default;
$spacing-unit: 30px !default;
$hoou_blue: #1c9db8;
$hoou_gold: #d1af66;
......@@ -18,19 +18,19 @@ $hoou_green: #95c11e;
$hoou_yellow: #ffcc00;
$hoou_lightblue: #dce5f6;
$text-color: #354151 !default;
$text-color: #354151 !default;
$background-color: #fdfdfd !default;
$brand-color: #354151 !default;
$brand-color: #354151 !default;
$grey-color: #828282 !default;
$grey-color: #828282 !default;
$grey-color-light: lighten($grey-color, 40%) !default;
$grey-color-dark: darken($grey-color, 25%) !default;
$grey-color-dark: darken($grey-color, 25%) !default;
// Width of the content area
$content-width: 800px !default;
$content-width: 800px !default;
$on-palm: 600px !default;
$on-laptop: 1050px !default;
$on-palm: 600px !default;
$on-laptop: 1050px !default;
// Use media queries like this:
// @include media-query($on-palm) {
......@@ -50,10 +50,5 @@ $on-laptop: 1050px !default;
}
// Import partials.
@import
"partials/base",
"partials/layout",
"partials/timeline",
"partials/flipCard",
"partials/stoerer"
;
@import "partials/base", "partials/layout", "partials/timeline",
"partials/stoerer", "partials/team", "partials/events", "partials/resources";
.event {
border: 2px solid #ddd;
padding: 20px;
margin-bottom: 40px;
#zugete-flyer {
border: 1px solid #ddd;
margin: 10px 0 20px 0;
}
#bib-image {
margin-bottom: 30px;
}
h3 {
font-weight: bold;
color: #95bd43;
}
h4 {
font-weight: bold;
}
.koop {
display: flex;
span.buech-logo {
padding: 10px;
background: #008dc7;
display: inline-block;
svg {
width: 150px;
height: 76px;
}
}
p {
margin-left: 20px;
color: #999;
}
}
}
.dates {
text-align: left;
font-size: 16px;
margin: 10px 0 20px 0;
th,
td {
padding: 4px 4px 4px 0;
}
th {
padding-bottom: 10px;
color: #003756;
&:nth-child(1) {
width: 28%;
}
&:nth-child(2) {
width: 30%;
}
}
}
......@@ -52,8 +52,8 @@
transform: translateX(-50%);
#hoou_logo{
margin-top: 1.4rem;
height: 2.3rem;
margin-top: .8rem;
height: 4rem;
}
@include media-query($on-laptop) {
......@@ -463,6 +463,10 @@ footer{
.post-content {
margin-bottom: $spacing-unit;
.copy {
font-weight: bold;
}
h1,h2,h3,h4,h5 {
color: darken($brand-color, 5%);
}
......@@ -492,6 +496,18 @@ footer{
@include relative-font-size(1.125);
}
}
ul li {
margin-bottom: 5px;
}
.flex-list {
display: flex;
justify-content: space-between;
ul {
}
}
}
/*
......@@ -582,3 +598,7 @@ footer{
#worldmap{
margin: 1rem 0;
}
#start, #course, #team, #download {
margin-bottom: 80px;
}
\ No newline at end of file
.resource-container {
border: 2px solid #ddd;
display: flex;
padding: 8px 20px;
margin-bottom: 30px;
figure {
width: 200px;
margin-right: 30px;
&.bib-image {
margin-top: 28px;
}
&.video {
margin-top: 28px;
}
}
.description {
display: flex;
flex-direction: column;
justify-content: space-between;
width: 75%;
padding: 20px 0;
p {
display: block;
}
a {
display: inline;
width: 350px;
text-align: center;
padding: 10px;
border-radius: 5px;
background: #afd85c;
color: #003756;
margin-bottom: 20px;
}
}
}
.bio-container {
.member {
display: flex;
align-items: center;
margin: 40px 0;
figure {
display: block;
width: 25%;
margin-right: 40px;
img {
width: 200px;
border-radius: 50%;
}
figcaption {
margin-top: 10px;
font-size: 12px;
color: #999;
text-align: center;
}
}
.bio {
width: 75%;
padding-bottom: 40px;
}
}
}
.also-team {
font-size: 12px;
strong {
margin-right: 6px;
font-size: 11px;
}
}
\ No newline at end of file
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1343 379"><defs><style>.cls-1,.cls-2{fill:none;stroke:#000;}.cls-1{stroke-linejoin:round;stroke-width:5.902px;}.cls-2{stroke-miterlimit:1;stroke-width:6px;}</style></defs><title>_</title><g id="Kreise"><path class="cls-1" d="M399.493,189.4a120.5,120.5,0,1,0-120.5,120.5,120.5,120.5,0,0,0,120.5-120.5"/><path class="cls-2" d="M681.467,189.4a184,184,0,1,0-184,184,184,184,0,0,0,184-184"/></g><g id="HOOU"><path d="M647.507,125.821h0v79.094c0,16.935,11.478,53.242,64.476,53.242,53.109,0,64.477-36.061,64.477-53.117V125.821h-44.3v75.133c0,10.584-3.8,21.516-20.085,21.516-16.1,0-20.265-10.932-20.265-21.516V125.821Z"/><path d="M524.721,189.4c0,15.755-9.873,28.525-27.254,28.525-17.342,0-27.254-12.77-27.254-28.525s9.912-28.526,27.254-28.526c17.381,0,27.254,12.77,27.254,28.526m45.01,0c0-37.972-29.856-68.755-72.264-68.755-42.625,0-72.264,30.783-72.264,68.755s29.639,68.754,72.264,68.754c42.408,0,72.264-30.782,72.264-68.754"/><path d="M306.247,189.4c0,15.755-9.874,28.525-27.254,28.525-17.343,0-27.254-12.77-27.254-28.525s9.911-28.526,27.254-28.526c17.38,0,27.254,12.77,27.254,28.526m45.01,0c0-37.972-29.856-68.755-72.264-68.755-42.625,0-72.264,30.783-72.264,68.755s29.639,68.754,72.264,68.754c42.408,0,72.264-30.782,72.264-68.754"/><polygon points="85.878 125.82 85.878 171.845 43.073 171.845 43.073 125.82 0 125.82 0 252.312 43.073 252.312 43.073 209.483 85.878 209.483 85.878 252.312 128.953 252.312 128.953 125.82 85.878 125.82"/><path d="M888.527,103.832H874.821V119.11h-7.476V82.271h7.476V97.332h13.706V82.271H896V119.11h-7.476Z"/><path d="M924.388,82.271h14.194l8.289,36.839H939.4l-1.463-6.664H925.038l-1.463,6.664H916.1Zm2.059,23.674h10.076l-3.738-17.5h-2.6Z"/><path d="M966.968,82.271H979.7l6.5,26.871,6.5-26.871h12.732V119.11h-7.477v-28.5h-.813l-7.205,26.87h-7.476l-7.205-26.87h-.813v28.5h-7.475Z"/><path d="M1043.08,82.271c7.422,0,11.485,2.709,11.485,9.751,0,4.172-1.138,6.285-4.063,8.126,3.142,1.355,4.767,3.63,4.767,8.4,0,7.368-4.605,10.565-11.973,10.565h-14.681V82.271Zm-6.989,6.393v8.775h6.664c2.925,0,4.225-1.516,4.225-4.442,0-3.033-1.462-4.333-4.279-4.333Zm0,15.06v8.993h6.826c3.088,0,4.768-.921,4.768-4.551,0-3.034-1.788-4.442-4.768-4.442Z"/><path d="M1090.481,113.259c4.388,0,6.555-2.113,6.555-6.447V82.271h7.476v24.378c0,9.21-4.821,13.111-14.031,13.111s-14.031-3.9-14.031-13.111V82.271h7.476v24.541C1083.926,111.2,1086.093,113.259,1090.481,113.259Z"/><path d="M1134.848,106.758V119.11h-7.476V82.271h14.3c8.4,0,13,3.738,13,12.135,0,5.092-2.059,8.5-5.418,10.618l5.255,14.086h-8.18l-4.28-12.352Zm6.826-18.094h-6.826v11.7h6.934c3.738,0,5.255-2.6,5.255-5.851C1147.037,90.993,1145.249,88.664,1141.674,88.664Z"/><path d="M1191.459,99.39h10.726v19.123a102.74,102.74,0,0,1-12.568,1.247c-12.027,0-15.061-6.718-15.061-19.07,0-13.435,3.9-19.069,14.79-19.069a74.667,74.667,0,0,1,12.839,1.517l-.216,5.8s-6.5-.7-11.432-.7c-6.392,0-8.288,2.113-8.288,12.46,0,9.806,1.354,12.569,8.072,12.569,2.221,0,4.5-.217,4.5-.217v-7.151h-3.358Z"/><path d="M865.72,189.784c0-12.46,3.683-19.286,15.277-19.286s15.277,6.826,15.277,19.286S892.59,208.637,881,208.637,865.72,202.244,865.72,189.784Zm22.861,0c0-8.5-1.517-12.785-7.584-12.785s-7.585,4.28-7.585,12.785,1.517,12.352,7.585,12.352S888.581,198.29,888.581,189.784Z"/><path d="M925.309,197.26v10.727h-7.476V171.148h13.544c8.668,0,13.11,4.226,13.11,12.785s-4.442,13.327-13.11,13.327Zm6.014-6.392c3.738,0,5.58-2.276,5.58-6.935,0-4.6-1.842-6.392-5.58-6.392h-6.014v13.327Z"/><path d="M964.909,171.148h23.837v6.5H972.385v8.614H985.5v6.392h-13.11v8.831h16.361v6.5H964.909Z"/><path d="M1010.088,171.148h12.623l8.884,30.338h.542V171.148h7.476v36.839h-12.3l-9.21-30.338h-.542v30.338h-7.476Z"/><path d="M1088.259,189.784c0-12.46,3.684-19.286,15.277-19.286s15.277,6.826,15.277,19.286-3.684,18.853-15.277,18.853S1088.259,202.244,1088.259,189.784Zm22.861,0c0-8.5-1.517-12.785-7.584-12.785s-7.585,4.28-7.585,12.785,1.517,12.352,7.585,12.352S1111.12,198.29,1111.12,189.784Z"/><path d="M1140.373,171.148h12.622l8.885,30.338h.542V171.148h7.476v36.839h-12.3l-9.21-30.338h-.542v30.338h-7.475Z"/><path d="M1193.082,207.987V171.148h7.476v30.23h13.49v6.609Z"/><path d="M1233.82,171.148h7.475v36.839h-7.475Z"/><path d="M1264.481,171.148H1277.1l8.885,30.338h.542V171.148h7.476v36.839h-12.3l-9.21-30.338h-.542v30.338h-7.476Z"/><path d="M1317.191,171.148h23.837v6.5h-16.361v8.614h13.11v6.392h-13.11v8.831h16.361v6.5h-23.837Z"/><path d="M881.051,291.013c4.388,0,6.555-2.112,6.555-6.447V260.025h7.476V284.4c0,9.21-4.822,13.11-14.031,13.11s-14.031-3.9-14.031-13.11V260.025H874.5v24.541C874.5,288.955,876.663,291.013,881.051,291.013Z"/><path d="M917.942,260.025h12.622l8.885,30.338h.542V260.025h7.476v36.839h-12.3l-9.21-30.337h-.542v30.337h-7.475Z"/><path d="M970.651,260.025h7.476v36.839h-7.476Z"/><path d="M1029.1,260.025l-8.559,36.839H1006.73l-8.56-36.839h7.856l6.392,30.338h2.438l6.393-30.338Z"/><path d="M1049.147,260.025h23.837v6.5h-16.361v8.613h13.111v6.393h-13.111v8.83h16.361v6.5h-23.837Z"/><path d="M1101.8,284.512v12.352h-7.476V260.025h14.3c8.4,0,13,3.738,13,12.135,0,5.093-2.059,8.506-5.418,10.619l5.255,14.085h-8.18l-4.28-12.352Zm6.825-18.094H1101.8v11.7h6.934c3.738,0,5.255-2.6,5.255-5.851C1113.992,268.747,1112.2,266.418,1108.628,266.418Z"/><path d="M1165.185,266.743s-7.639-.867-10.781-.867c-4.009,0-5.9,1.463-5.9,3.9,0,2.329,1.462,3.142,7.638,5.092,7.964,2.546,10.4,4.768,10.4,10.889,0,8.018-5.471,11.756-12.731,11.756a68.634,68.634,0,0,1-12.3-1.679l.758-5.8s7.26.975,11.106.975c4.009,0,5.742-1.9,5.742-4.767,0-2.276-1.3-3.305-6.609-4.822-8.288-2.384-11.43-5.2-11.43-11.106,0-7.638,5.092-10.943,12.568-10.943a76.914,76.914,0,0,1,12.135,1.463Z"/><path d="M1187.72,260.025h7.476v36.839h-7.476Z"/><path d="M1215.077,260.025h27.087v6.609h-9.751v30.23h-7.477v-30.23h-9.859Z"/><path d="M1276.888,296.864h-7.477v-14.9l-11.376-21.941h8.288l6.772,14.682,6.772-14.682h8.289l-11.268,21.941Z"/></g></svg>
\ 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