Merge pull request 'Master wieder auf Stand von Deploy' (#14) from deploy into master

Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/14
This commit is contained in:
Peter 2021-09-08 15:01:23 +02:00
commit b6f8c4d09b
4 changed files with 95 additions and 22 deletions

View File

@ -18,7 +18,7 @@
<span class="icon fa-wrench"></span>
<div class="content">
<h3>Repair Café</h3>
<p>Alle Termine sind zur Zeit wegen der aktuellen Situation durch <strong>COVID-19</strong> ausgesetzt.</p>
<p>Das nächste Repair Café findet am 28.08.2021 bei uns in der Mühlgasse 8 statt. Mehr Infos dazu gibts im <a href="https://usrspace.at/repaircafe">Wiki</a></p>
</div>
</article>
<article>
@ -52,7 +52,6 @@
<span class="icon fa-calendar"></span>
<div class="content">
<h3>Termine</h3>
<p><strong>ACHTUNG!</strong> Durch die aktuelle Situation mit <strong>COVID-19</strong> sind derzeit alle Termine abgesehen vom Stammtisch ausgesetzt. Stammtische finden entsprechend unseren <a href="https://wiki.usrspace.at/wiki/COVID-19">aktuellen COVID-19 Maßnahmen</a> statt. Manche Termine im Kalender sind von anderen Veranstaltern, bitte Informieren Sie sich direkt dort nach der Gültigkeit.</p>
<p>Aktuelle Termine und Veranstaltungen findest du im <a href="https://usrspace.at/termine">Kalender</a> oder im <a href="https://wiki.usrspace.at/">Wiki</a>.</p>
</div>
</article>

View File

@ -1,3 +1,11 @@
<!-- Section -->
<section style="border-bottom:0; margin:0; padding:0;">
<span class="image logo">
<img src="https://www.usrspace.at/images/1_MainLogo_2021.svg" alt="Logo">
</span>
</section>
<!-- Menu -->
<nav id="menu">
<header class="major">

View File

@ -2167,13 +2167,13 @@
-ms-transition: color 0.2s ease-in-out, border-bottom-color 0.2s ease-in-out;
transition: color 0.2s ease-in-out, border-bottom-color 0.2s ease-in-out;
border-bottom: dotted 1px;
color: #0083f8;
color: #2aa1bf;
text-decoration: none;
}
a:hover {
border-bottom-color: #0083f8;
color: #0083f8 !important;
border-bottom-color: #2aa1bf;
color: #2aa1bf !important;
}
a:hover strong {
@ -2342,7 +2342,7 @@
}
header.major > :last-child {
border-bottom: solid 3px #0083f8;
border-bottom: solid 3px #2aa1bf;
display: inline-block;
margin: 0 0 2em 0;
padding: 0 0.75em 0.5em 0;
@ -2409,8 +2409,8 @@
input[type="url"]:focus,
select:focus,
textarea:focus {
border-color: #0083f8;
box-shadow: 0 0 0 1px #0083f8;
border-color: #2aa1bf;
box-shadow: 0 0 0 1px #2aa1bf;
}
.select-wrapper {
@ -2523,8 +2523,8 @@
input[type="checkbox"]:focus + label:before,
input[type="radio"]:focus + label:before :not(#leaflet-control-layers-selector){
border-color: #0083f8;
box-shadow: 0 0 0 1px #0083f8;
border-color: #2aa1bf;
box-shadow: 0 0 0 1px #2aa1bf;
}
input[type="checkbox"] + label:before {
@ -2646,6 +2646,18 @@
width: 100%;
}
.image.logo {
display: block;
margin: 0 0 2em 0;
width: 100%;
}
.image.logo img {
width: 60%;
margin-left: auto;
margin-right: auto;
}
.image.main {
display: block;
margin: 0 0 3em 0;
@ -2757,7 +2769,7 @@
}
ul.contact li:before {
color: #0083f8;
color: #2aa1bf;
display: inline-block;
font-size: 1.5em;
height: 1.125em;
@ -2881,7 +2893,7 @@
}
ul.pagination li > .page.active {
background-color: #0083f8;
background-color: #2aa1bf;
color: #ffffff !important;
}
@ -3013,8 +3025,8 @@
background-color: transparent;
border-radius: 0.375em;
border: 0;
box-shadow: inset 0 0 0 2px #0083f8;
color: #0083f8 !important;
box-shadow: inset 0 0 0 2px #2aa1bf;
color: #2aa1bf !important;
cursor: pointer;
display: inline-block;
font-family: "Roboto Slab", serif;
@ -3087,7 +3099,7 @@
input[type="button"].special,
button.special,
.button.special {
background-color: #0083f8;
background-color: #2aa1bf;
box-shadow: none;
color: #ffffff !important;
}
@ -3207,7 +3219,7 @@
}
.features article .icon:before {
color: #0083f8;
color: #2aa1bf;
font-size: 2.75rem;
position: relative;
top: 0.05em;
@ -3854,7 +3866,7 @@
display: -webkit-flex;
display: -ms-flex;
display: flex;
border-bottom: solid 5px #0083f8;
border-bottom: solid 5px #2aa1bf;
padding: 1em 0 1em 0;
position: relative;
}
@ -4049,7 +4061,7 @@
}
#menu ul a:hover, #menu ul span:hover {
color: #0083f8;
color: #2aa1bf;
}
#menu ul a.opener, #menu ul span.opener {
@ -4083,7 +4095,7 @@
}
#menu ul a.opener:hover:before, #menu ul span.opener:hover:before {
color: #0083f8;
color: #2aa1bf;
}
#menu ul a.opener.active + ul, #menu ul span.opener.active + ul {
@ -4130,13 +4142,13 @@
#stammMap {
height: 600px;
}
@media screen and (max-width: 980px) {
#stammMap {
height: 300px;
}
}
/* Calendar */
.cal_event > a {
@ -4169,4 +4181,4 @@
text-align: center;
vertical-align: middle;
font-size: 1.1em;
}
}

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 8.4 KiB