Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • 016967/stustanet-website
  • antodias/stustanet-website
  • ml/stustanet-website
  • 015250/stustanet-website
  • stustanet/stustanet-website
  • 010296/stustanet-website
  • 005438/stustanet-website
  • 011344/stustanet-website
  • michaelb/stustanet-website
  • 009834/stustanet-website
  • mariem/stustanet-website
  • 010699/stustanet-website
12 results
Show changes
Showing
with 574 additions and 81 deletions
<dl class="vorstand">
<dt>Vorstandsmitglieder</dt>
<dd>
<ul>
<li>Vorsitzender Vorstand: {{ .Site.Data.Vorstand.VV }}</li>
<li>Schatzmeister: {{ .Site.Data.Vorstand.CC }}</li>
<li>1. Technischer Vorstand: {{ .Site.Data.Vorstand.TV1 }}</li>
<li>2. Technischer Vorstand: {{ .Site.Data.Vorstand.TV2 }}</li>
</ul>
<p>
<i>Gültig: {{ .Site.Data.Vorstand.Valid }}</i>
</p>
<dt>{{ i18n "chairman" }}:</dt>
<dd>{{ .Site.Data.Vorstand.VV -}}
{{ if and (fileExists "keys/board/vv.md")
((time (.Page.Sites.First.GetPage "keys/board/vv.md").ExpiryDate).After now)
(gt (len (.Page.Sites.First.GetPage "keys/board/vv.md").Content) 10) -}}
&nbsp;[
<a href="{{ ref . (dict "path" "/keys/board/vv.md" "lang" "de") }}" download="{{ .Site.Data.Vorstand.VV }}.asc">PGP key</a>
{{ if (.Page.Sites.First.GetPage "keys/board/vv.md").Param "fingerprint" -}}
,
<a href="{{ ref . (dict "path" "/keys/board/fingerprints/vv.md" "lang" "de") }}">Fingerprint</a>
{{- end }}
]
{{- end }}
</dd>
<dt>{{ i18n "treasurer" }}:</dt>
<dd>{{ .Site.Data.Vorstand.CC -}}
{{ if and (fileExists "keys/board/cc.md")
((time (.Page.Sites.First.GetPage "keys/board/cc.md").ExpiryDate).After now)
(gt (len (.Page.Sites.First.GetPage "keys/board/cc.md").Content) 10) -}}
&nbsp;[
<a href="{{ ref . (dict "path" "/keys/board/cc.md" "lang" "de") }}" download="{{ .Site.Data.Vorstand.CC }}.asc">PGP key</a>
{{ if (.Page.Sites.First.GetPage "keys/board/cc.md").Param "fingerprint" -}}
,
<a href="{{ ref . (dict "path" "/keys/board/fingerprints/cc.md" "lang" "de") }}">Fingerprint</a>
{{- end }}
]
{{- end }}
</dd>
<dt>{{ i18n "1stcto" }}:</dt>
<dd>{{ .Site.Data.Vorstand.TV1 -}}
{{ if and (fileExists "keys/board/tv1.md")
((time (.Page.Sites.First.GetPage "keys/board/tv1.md").ExpiryDate).After now)
(gt (len (.Page.Sites.First.GetPage "keys/board/tv1.md").Content) 10) }}
&nbsp;[
<a href="{{ ref . (dict "path" "/keys/board/tv1.md" "lang" "de") }}" download="{{ .Site.Data.Vorstand.TV1 }}.asc">PGP key</a>
{{ if (.Page.Sites.First.GetPage "keys/board/tv1.md").Param "fingerprint" -}}
,
<a href="{{ ref . (dict "path" "/keys/board/fingerprints/tv1.md" "lang" "de") }}">Fingerprint</a>
{{- end }}
]
{{- end }}
</dd>
<dt>{{ i18n "2ndcto" }}:</dt>
<dd>{{ .Site.Data.Vorstand.TV2 -}}
{{ if and (fileExists "keys/board/tv2.md")
((time (.Page.Sites.First.GetPage "keys/board/tv2.md").ExpiryDate).After now)
(gt (len (.Page.Sites.First.GetPage "keys/board/tv2.md").Content) 10) -}}
&nbsp;[
<a href="{{ ref . (dict "path" "/keys/board/tv2.md" "lang" "de") }}" download="{{ .Site.Data.Vorstand.TV2 }}.asc">PGP key</a>
{{ if (.Page.Sites.First.GetPage "keys/board/tv2.md").Param "fingerprint" -}}
,
<a href="{{ ref . (dict "path" "/keys/board/fingerprints/tv2.md" "lang" "de") }}">Fingerprint</a>
{{- end }}
]
{{- end }}
</dd>
<dt>{{ i18n "3rdcto" }}:</dt>
<dd>{{ .Site.Data.Vorstand.TV3 -}}
{{ if and (fileExists "keys/board/tv3.md")
((time (.Page.Sites.First.GetPage "keys/board/tv3.md").ExpiryDate).After now)
(gt (len (.Page.Sites.First.GetPage "keys/board/tv3.md").Content) 10) -}}
&nbsp;[
<a href="{{ ref . (dict "path" "/keys/board/tv3.md" "lang" "de") }}" download="{{ .Site.Data.Vorstand.TV3 }}.asc">PGP key</a>
{{ if (.Page.Sites.First.GetPage "keys/board/tv3.md").Param "fingerprint" -}}
,
<a href="{{ ref . (dict "path" "/keys/board/fingerprints/tv3.md" "lang" "de") }}">Fingerprint</a>
{{- end }}
]
{{- end }}
</dd>
</dl>
<p>
<i>{{ i18n "validity" }}: {{ .Site.Data.Vorstand.Valid }}</i>
</p>
<div class="warn">{{ .Inner | markdownify }}</div>
<div class="we-are-not-stuwerk">
<b>HINWEIS</b>: Diese Adresse kann bei Wohnungsanfragen <b>NICHT</b> helfen.
<b>HINWEIS</b>: Diese Adresse kann bei Wohnungsanfragen <b>NICHT</b> helfen.
<a href="http://www.studentenwerk-muenchen.de/wohnen/bewerbung/">Hier ist die richtige Adresse</a>.
<br />
<b>NOTE</b>: This contact <b>CANNOT HELP</b> you get an appartment.
Please see <a href="http://www.studentenwerk-muenchen.de/en/student-accommodation/application/">this page</a>.
</div>
\ No newline at end of file
<b>NOTE</b>: This contact <b>CANNOT</b> help you to get an appartment.
Please see <a href="http://www.studentenwerk-muenchen.de/en/student-accommodation/application/">this page instead</a>.
</div>
......@@ -18,6 +18,7 @@ html, body {
border: 0;
width: 100%;
height: 100%;
min-width: 400px;
}
body {
......@@ -109,16 +110,16 @@ body {
margin: 0;
display: flex;
flex-direction: column;
background: white;
box-shadow: 0 0 8px 0 rgba(0,0,0,0.12);
-webkit-font-smoothing: antialiased;
/* to stop flickering of text in safari */
box-sizing: border-box;
transform-origin: 0% 0%;
transform: translate(308px, 0);
transition: transform 0.5s ease;
list-style-type: none;
......@@ -168,13 +169,6 @@ body {
margin: 0;
}
.hamburger .shorthand {
text-transform: uppercase;
font-size: 14px;
margin-right: 5px;
}
ul.menu {
list-style-type: none;
margin: 0;
......@@ -184,11 +178,34 @@ ul.menu {
ul.menu li {
display: inline-block;
margin: 0 10px 0;
padding: 0;
border-bottom: 3px solid transparent;
}
ul.menu li a {
display: inline-block;
padding: 15px 5px;
padding: 15px 10px 12px;
cursor: pointer;
}
.menu .active {
border-bottom: 3px solid #1b54ac;
color: #CCC;
}
.menu a:hover,
.menu a:active,
.menu a:focus {
text-decoration: none;
}
.menu li:hover {
border-bottom: 3px solid #1b54ac;
}
.hamburger .active {
background: rgba(94, 146, 189, 0.22);
}
.lang-dropdown {
......@@ -206,17 +223,9 @@ ul.menu li a {
cursor: pointer;
}
.lang-dropdown .globe {
display: inline-block;
width: 13px;
height: 13px;
margin: -2px 5px 0 0;
vertical-align: middle;
background: url(/globe.svg) no-repeat;
}
.lang-dropdown.up .globe {
background: url(/globe.up.svg) no-repeat;
.lang-dropdown .fa-globe {
font-size: 16px;
margin-right: 5px;
}
.lang-dropdown ul {
......@@ -246,6 +255,7 @@ ul.menu li a {
position: relative;
line-height: 24px;
vertical-align: middle;
text-align: left;
}
.lang-dropdown li:hover {
background-color:#555;
......@@ -305,8 +315,7 @@ ul.menu li a {
}
article > *,
.container,
header h1 {
.container {
position: relative;
margin-left: auto;
margin-right: auto;
......@@ -320,12 +329,9 @@ nav .container {
white-space: nowrap;
}
.container .lang-dropdown {
nav .container .lang-dropdown {
color: #1b54ac;
}
.container .lang-dropdown {
padding: 15px 5px 15px 25px;
padding: 13px 5px 15px 25px;
}
.lang-dropdown::after {
......@@ -336,7 +342,7 @@ nav .container {
content: '▴';
}
.container .lang-dropdown ul {
nav .container .lang-dropdown ul {
top: 10px;
}
......@@ -344,41 +350,152 @@ header {
position: relative;
display: block;
max-width: 100%;
background-image: url(/header.jpg);
background-image: url(/headers/default.jpg);
background-size: cover;
background-position-y: 30%;
background-position: 50% 10%;
background-blend-mode: soft-light;
}
header h1,
header .subtitle,
#stats {
color: #FFF;
text-shadow: 0px 0px 1px rgba(0,0,0,0.8);
}
.wifi header h1 {
text-shadow: 0px 0px 4px rgba(0,0,0,0.8);
}
header h1 {
margin: 0 auto 15px auto;
padding: 50px 0;
text-shadow: 0px 0px 1px rgba(0,0,0,0.8);
font-size: 2.4em;
}
.big-hero header {
background-position-y: 54px;
background-size: auto 350px;
background-attachment: fixed;
height: 300px;
}
.big-hero header h1 {
padding: 100px 0 0;
font-size: 2.8em;
}
header .subtitle {
display: inline-block;
width: 350px;
font-size: 1.1em;
line-height: 1.4em;
}
.yellow {
.yellow header {
background-color: rgb(255, 232, 89);
box-shadow: 0 0 8px 0 rgba(255, 232, 89, 0.12);
}
.yellow h1 {
.yellow header h1 {
color: black;
text-shadow: none;
}
.red {
.none header {
box-shadow: 0 0 8px 0 rgba(226, 107, 68, 0.12);
}
.none header h1 { color: white; }
.red header {
background-color: rgb(226, 107, 68);
box-shadow: 0 0 8px 0 rgba(226, 107, 68, 0.12);
}
.red h1 { color: white; }
.green {
.red header h1 { color: white; }
.green header {
background-color: rgb(137, 187, 79);
box-shadow: 0 0 8px 0 rgba(137, 187, 79, 0.12);
}
.green h1 { color: white; }
.blue {
.green header h1 { color: white; }
.blue header {
background-color: rgb(94, 146, 189);
box-shadow: 0 0 8px 0 rgba(94, 146, 189, 0.12);
}
.blue h1 { color: white; }
.blue header h1 { color: white; }
#stats {
position: absolute;
top: 35px;
right: 20px;
}
#stats div {
padding: 12px 0;
font-size: 15px;
}
#stats div i {
font-size: 36px;
display: inline-block;
width: 56px;
height: 48px;
float: left;
vertical-align: middle;
}
#stats div span {
display: block;
font-weight: bold;
font-size: 1.5em;
width: 200px;
}
.two-columns:after {
content: "";
display: table;
clear: both;
}
.two-columns .column:first-child {
float: left;
width: 70%;
}
.two-columns .column:last-child {
float: right;
width: 25%;
}
.two-columns .column:last-child > *:first-child,
.two-columns .column:last-child > .flex-item:first-child > * {
margin-top: 0em;
}
.two-columns .column:last-child ul {
list-style: none;
text-indent: 0;
margin: 0;
padding: 0;
}
.two-columns .column:last-child ul.right {
text-align: right;
}
.two-columns .column:last-child ul li {
margin: 0;
padding: 5px 0;
border-top: 1px solid #dee2e6;
}
.two-columns .column:last-child ul li:first-child {
border-top: none;
}
.two-columns .column:last-child ul li .fa {
width: 16px;
margin-right: 4px;
text-align: center;
}
h1,
h2,
......@@ -402,7 +519,7 @@ h2 {
margin-top: 2rem;
}
h3 {
font-size: 1.3rem;
font-size: 1.1rem;
}
h4 {
font-size: 0.707rem;
......@@ -414,7 +531,7 @@ h6 {
font-size: 0.3535rem;
}
h2 + h3 {
margin-top: 0.3rem;
margin-top: 0.5rem;
}
article {
......@@ -425,14 +542,25 @@ article {
flex: 1 1 0;
}
address {
font-style: normal;
}
p, ul, ol {
line-height: 1.5rem;
margin-top: 0.5rem;
margin-bottom: 0;
}
ul, ol {
line-height: 1.5rem;
margin-top: 0.5rem;
margin-bottom: 0;
padding: 0 8px;
list-style-position: inside;
}
ul li,
ol li {
margin-left: 25px;
margin-left: 0;
line-height: 1.5rem;
}
ul ul,
......@@ -445,10 +573,34 @@ ol ol {
dl {
line-height: 1.2;
display: flex;
flex-wrap: wrap;
}
dt {
font-weight: bold;
flex: 0 0 30%;
max-width: 30%;
margin: 0.5em 0 0;
}
dd {
flex: 0 0 70%;
max-width: 70%;
margin: 0.5em 0 0;
}
dt:first-of-type,
dd:first-of-type {
margin-top: 0;
}
dd dl dt {
font-weight: normal;
max-width: 40%;
flex: 0 0 40%;
margin: 0;
}
dd dl dd {
max-width: 60%;
flex: 0 0 60%;
margin: 0 0 0.5em;
}
hr {
......@@ -468,11 +620,35 @@ table {
margin-top: 1.5rem;
border-spacing: 0px;
border-collapse: collapse;
width: 100%;
}
table td,
table th {
padding: 0;
line-height: 33px;
padding: .3em 1em;
vertical-align: top;
}
table th {
border-bottom: 2px solid #dee2e6;
text-align: left;
}
.wifi table th:first-child {
width: 10em;
}
table td {
vertical-align: top;
border-top: 1px solid #dee2e6;
}
.center {
text-align: center;
}
.right {
text-align: right;
}
code {
......@@ -485,42 +661,199 @@ a {
text-decoration: none;
}
a:hover, a:active {
a:hover,
a:active {
text-decoration: underline;
}
.button {
display: inline-block;
padding: 6px 8px 2px;
background: #4f76b1;
border: 1px solid #4f76b1;
border-radius: 5px;
color: #fff;
cursor: pointer;
white-space: nowrap;
line-height: 1.5;
font-weight: 600;
text-align: center;
text-decoration: none;
}
.button.outline {
background: #fff;
border: 1px solid #1b54ac;
color: #1b54ac;
}
.button:hover,
.button-container .button:hover {
background-color: #1b54ac;
color: #fff;
text-decoration: none;
}
.button-container {
text-align: center;
margin: 0.8em 0 2em;
}
.button-container .button {
min-width: 40%;
}
#main {
margin-top: 30px;
}
div.alert,
div.warn,
div.success {
position: relative;
padding: .5rem .8rem;
margin: .5rem 0;
line-height: 1.5;
border: 1px solid #dee2e6;
border-radius: .25rem;
}
div.alert {
color: #721c24;
background: #f8d7da;
border-color: #f5c6cb;
}
div.warn {
color: #856404;
background: #fff3cd;
border-color: #f2d376;
}
div.success {
background: #e1f6e1;
border-color: #a9deaa;
}
.callout {
padding: 20px;
margin: 20px 0;
border: 1px solid #eee;
border-left-width: 0.25rem;
border-radius: 0.25rem;
}
.callout:after {
content: "";
clear: both;
display: table;
}
.callout img.router {
max-width: 40%;
float: right;
}
.callout img.router.small {
max-width: 33%;
}
.callout ul {
list-style-position: outside;
}
.callout ul {
list-style: none;
padding: 0;
}
.callout li {
padding: 0.2em;
padding-left: 2.2em;
}
.callout li i.fa {
text-align: center;
display: inline-block;
margin-left: -2em;
width: 2em;
}
.callout h3,
.callout h4 {
margin-top: 0;
margin-bottom: 5px;
display: inline;
}
.callout p:last-child {
margin-bottom: 0;
}
.callout code {
border-radius: 3px;
}
.callout+.callout {
margin-top: -5px;
}
.callout-default {
border-left-color: #777;
}
.callout-default h4 {
color: #777;
}
.callout-primary {
border-left-color: #428bca;
}
.callout-primary h4 {
color: #428bca;
}
.callout-success {
border-left-color: #5cb85c;
}
.callout-success h4 {
color: #5cb85c;
}
.callout-danger {
border-left-color: #d9534f;
}
.callout-danger h4 {
color: #d9534f;
}
.callout-warning {
border-left-color: #f0ad4e;
}
.callout-warning h4 {
color: #f0ad4e;
}
.callout-info {
border-left-color: #5bc0de;
}
.callout-info h4 {
color: #5bc0de;
}
footer {
background: #363636;
display: flex;
flex-shrink: 0;
white-space: nowrap;
}
footer .container {
display: flex;
position: relative;
}
footer .editPage {
padding: 15px;
padding: 15px 15px 15px 0;
flex: 1 1 0;
text-overflow: clip;
overflow: hidden;
}
footer .editPage a {
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAANlBMVEUAAADv7+/v7+/v7+/v7+/s7Ozs7Ozt7e3t7e3t7e3s7Ozs7Ozs7Ozs7Ozt7e3t7e3t7e3t7e3ECRl9AAAAEXRSTlMAECAwQFBgkJ+gr7C/wNDv8A/g33EAAABLSURBVHjarchBAoAgDAPBUCqISjX//6xyMnh2bztIGw+DtJMNSWB8OfML/XlSxMZPki5+JP8p4R0qsaCZigNeIdJXR0CzGiyYK+0GziYE48hUzCUAAAAASUVORK5CYII=) no-repeat;
padding-left: 20px;
footer .spacer {
flex: 1;
}
footer a {
footer .container,
footer .container a {
color: #EDEDED;
}
footer .center {
footer .links {
padding: 15px;
text-align: center;
flex: 1 1 0;
/*text-align: center;*/
/*flex: 1 1 0;*/
text-align: right;
}
footer .lang-dropdown-container {
flex: 1 1 0;
padding: 15px;
/*flex: 1 1 0;*/
padding: 14px 0 16px 15px;
text-align: right;
}
......@@ -534,7 +867,6 @@ footer .lang-dropdown {
border-radius: 2px;
margin: 5px 0;
padding: 10px 10px 7px 10px;
background: #ffdbdb;
line-height: 1.25;
color: red;
}
......@@ -543,10 +875,6 @@ footer .lang-dropdown {
font-style: italic;
}
.vorstand ul {
padding-left: 0;
}
@media (max-width: 720px) {
main {
padding: 25px 0;
......@@ -565,26 +893,127 @@ footer .lang-dropdown {
h3 {
font-size: 1.2rem;
}
.hamburger {
display: block;
}
.menu, #top-bar .lang-dropdown {
.menu,
#top-bar .lang-dropdown {
display: none;
}
.big-hero header {
background-size: auto 250px;
background-position: 50% 50%;
background-attachment: inherit;
height: 250px;
}
header h1 {
padding: 50px 0 50px;
font-size: 2rem;
line-height: inherit;
}
article > *, article .container {
.big-hero header h1 {
padding: 25px 0 0;
}
article > *,
article .container,
footer .container {
padding: 0 25px;
}
header {
padding: 0;
}
footer .editPage a {
color: transparent;
}
#stats {
position: static;
top: 25px;
right: 0;
display: flex;
flex-wrap: wrap;
padding-top: 12px;
}
#stats div {
display: inline;
white-space: nowrap;
font-size: 12px;
padding: 6px 0;
width: 50%;
}
#stats div span {
font-size: 14px;
width: 175px;
margin-bottom: 4px;
}
#stats div i {
font-size: 32px;
width: 48px;
height: 42px;
}
#stats i.fa {
font-size: 28px;
width: 45px;
height: 32px;
}
dl {
display: block;
}
dt,
dd dl dt,
dd dl dd {
flex: 1;
max-width: 100%;
}
dd {
flex: 1;
margin: 0.8em 1em 1.6em;
}
dd dl dd {
margin: 0.25em 0 1em;
}
.two-columns .column {
float: none !important;
width: 100% !important;
}
.two-columns .column:last-child {
margin-top: 2rem;
display: flex;
flex-wrap: wrap;
}
.two-columns .flex-item {
flex: 1;
}
.two-columns .flex-item:first-child {
margin-right: 1.5rem;
}
.two-columns .flex-item:last-child {
margin-left: 1.5rem;
}
.two-columns .flex-item h2 {
margin-top: 0;
}
.wifi table th:first-child {
width: 8em;
}
}
static/figures/router_full.jpg

82.6 KiB

static/figures/router_m.jpg

26.9 KiB

File moved
static/headers/home.jpg

67.1 KiB

static/headers/imprint.jpg

67 KiB

static/headers/keyboard.jpg

67.7 KiB

static/headers/mainboard.jpg

67.7 KiB

static/headers/outdoor.jpg

380 KiB

User-agent: *
Disallow: /mail/
static/support/routerproblem/ipconfigcmd.png

16.4 KiB

static/support/routerproblem/newips_interface_settings.png

52.6 KiB

static/support/routerproblem/newips_network_settings.png

153 KiB

static/support/routerproblem/searchcmd.png

35.6 KiB

static/support/selftest/nointernetchrome.png

11.5 KiB

static/support/selftest/nointernetfirefox.png

50.3 KiB

static/support/selftest/selftestblock.png

129 KiB