Skip to content
Snippets Groups Projects
Commit 2e61c6db authored by Karl Hasselbring's avatar Karl Hasselbring
Browse files

Merge branch '271-style-css-fehlerhaft' into 'development' 

Soweit ich das überprüfen konnte werden alle Seiten jetzt wieder korrekt angezeigt

Closes #271

See merge request !441
parents 0b39ef75 1c836bb8
No related branches found
No related tags found
2 merge requests!442Development,!441Soweit ich das überprüfen konnte werden alle Seiten jetzt wieder korrekt angezeigt
Hide whitespace changes
Inline Side-by-side
public/css/style.css
+ 330
− 328
View file @ 2e61c6db
/* * {
font-family: Liberation Sans, sans-serif;
By ID }
*/ label a {
color: inherit;
}
#color-chooser #standard { label a:hover {
background-color: rgb(255, 194, 107); text-decoration: none;
color: inherit;
} }
#color-chooser #standardHard { li#info {
background-color: rgb(255, 128, 0); white-space: pre-line;
} }
#color-chooser #green { .navbar-default {
background-color: rgb(177, 226, 163); background-color: white;
border-radius: 0;
} }
#color-chooser #greenHard { .row {
background-color: rgb(127, 175, 27); margin-left: 0;
margin-right: 0;
} }
#color-chooser #blue { .mg-panel {
background-color: rgb(164, 192, 230); text-align: left;
margin: 0 auto;
margin-top: 20px;
padding: 10px 20px;
margin-bottom: 0;
background-color: white;
-webkit-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
-moz-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
} }
#color-chooser #blueHard { .input-group-addon {
background-color: rgb(2, 93, 140); padding: 0;
} }
#color-chooser #red { .form-group {
background-color: rgb(255, 92, 92); font-family: sans-serif;
font-size: 16px;
color: black;
background-color: transparent;
text-align: center;
} }
#color-chooser #redHard { section {
background-color: rgb(255, 0, 0); padding: 10px;
box-shadow: 5px 5px 10px 0px rgba(0, 0, 0, 0.55);
-moz-box-shadow: 5px 5px 10px 0px rgba(0, 0, 0, 0.55);
-moz-box-shadow: 5px 5px 10px 0px rgba(0, 0, 0, 0.55);
} }
#color-chooser #pink { body > div {
background-color: rgb(255, 196, 246); background-color: transparent;
padding-top: 70px;
} }
#color-chooser #pinkHard { footer ul.list-inline {
background-color: rgb(254, 67, 101); width: 100%;
} }
#color-chooser #black { footer li {
background-color: rgb(238, 238, 238); width: 33%;
text-align: center;
} }
#color-chooser #blackHard { footer img {
background-color: rgb(50, 50, 50); max-width: 100%;
} }
#color-chooser { span.glyphicon {
padding: 0; background-color: transparent;
} }
#color-chooser a { footer {
display: block; margin-top: 8%;
width: 50px; bottom: 0;
height: 50px; width: 100%;
} }
#color-chooser li { main ul li {
width: 50px; margin: 0 10px;
margin: 0;
} }
#moreInformation { body ul {
box-shadow: none; list-style-type: none;
margin-top: 5%;
text-align: center; text-align: center;
-moz-box-shadow: none; margin-left: 0!important;
margin-top: 10px;
} }
#moreInformation ul { fieldset input[type=text] {
/* text-align: left; */ width: 100%;
padding: 0; padding-left: 10px;
padding-right: 10px;
border-width: 1px;
overflow: visible;
} }
#moreInformation ul li { main fieldset {
color: grey; border: 0;
} }
#moreInformation > div { main fieldset#foki {
font-size: 15px; margin: 5px 0;
text-align: center;
} }
#moreInformation h2 { a.content.hidden-xs {
color: grey; color: #333;
font-size: 25px;
} }
#moreInformation a:hover { header nav a {
text-decoration: underline; text-decoration: none;
color: rgb(119, 119, 119);
} }
#searchForm button { a.navbar-brand {
width: 50px; line-height: 100%!important;
line-height: 100%;
height: 28px;
border: 0;
background-color: transparent;
padding: 0; padding: 0;
} }
#mglogo { nav .navbar-brand > div.logo {
width: 100%; height: 100%;
text-align: center;
} }
#mglogo > a { nav h1 {
display: block; margin: 0;
width: 200px; height: 100%;
text-decoration: none; padding-left: 20px;
font-size: 1.1em; padding-top: 8px;
font-family: Liberation Sans, sans-serif; font-family: sans-serif;
font-weight: bold;
font-style: italic; font-style: italic;
font-size: 1.0em; margin: 0;
font-weight: bold;
line-height: 1; line-height: 1;
white-space: nowrap; white-space: nowrap;
padding: 0.4em 0;
border-radius: .25em;
margin: 0 auto;
} }
#sponsors a { body {
font-size: 0.8em; margin: 0;
} }
#sponsors h2 { header {
font-size: 1.5em!important; position: fixed;
background-color: white;
z-index: 500;
width: 100%;
height: 50px;
} }
#foki label > span { .dotlist {
margin-right: 5px; list-style-type: disc;
text-align: left;
} }
#foki label span { .dotlist li {
background-color: transparent; margin-bottom: 5px;
} }
#foki input { .well-sm {
visibility: hidden; margin: 10px 0px;
} }
#foki input:checked + label { address {
font-weight: bold; white-space: pre;
background-color: #e3e3e3;
} }
#foki input + label { .subheading {
border-radius: 4px; font-size: 20px;
padding: 7px 20px; margin: 20px 0px;
font-weight: normal; white-space: pre-wrap;
} }
#foki input + label:hover { p {
cursor: pointer; white-space: pre-wrap;
background-color: #f6f6f6;
} }
#anpassen-label a.content { form {
color: inherit; margin: 10px 0px;
} }
#plugin-modal ol > li { div#right {
margin-bottom: 5px; background-color: #FFDCC1;
border-radius: 5px;
padding: 20px;
padding-top: 0;
} }
#spruch { div#right p {
margin-bottom: 20px; white-space: normal;
padding: 5px; border-bottom: 1px solid black;
line-height: 1.2 !important; margin-bottom: 15px;
color: #070; padding-bottom: 15px;
border-left: 3px solid #070;
font-size: 16px;
font-family: Georgia, "Times New Roman", Palatino, Times, serif;
} }
.bitcoins {
/* text-align: center;
By Class
*/
.mg-panel {
text-align: left;
margin: 0 auto;
margin-top: 20px;
padding: 10px 20px;
margin-bottom: 0;
background-color: white;
-webkit-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
-moz-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
} }
.dotlist { div#left {
list-style-type: disc; padding-right: 35px;
text-align: left;
} }
.dotlist li { .bold {
margin-bottom: 5px; font-weight: bold;
} }
.subheading { code {
font-size: 20px;
margin: 20px 0px;
white-space: pre-wrap; white-space: pre-wrap;
word-break: break-word;
} }
.settings-checkbox .settings-glyphicon { form.contact {
margin-left: 5px; max-width: 500px;
font-size: 12px;
} }
.metager-searchinput { textarea#message {
height: 30px; height: 200px;
padding: 6px 12px; }
.checkbox {
margin-top: 5px;
margin-bottom: 5px;
}
label.select-label {
margin-bottom: 0;
margin-top: 10px;
}
.settings-btn {
margin-top: 25px;
}
.settings-btn + .settings-btn {
margin-left: 10px;
}
.fokus-category {
font-size: 20px;
}
.settings-form-control {
width: 200px;
margin-top: 10px;
}
a:hover {
cursor: pointer;
}
.settings-checkbox .settings-glyphicon {
margin-left: 5px;
font-size: 12px;
}
/* Widgets */
.metager-searchinput {
height: 30px;
padding: 6px 12px;
font-size: 14px; font-size: 14px;
line-height: 1.42857; line-height: 1.42857;
color: #555; color: #555;
...@@ -262,6 +307,21 @@ ...@@ -262,6 +307,21 @@
margin-right: 3px; margin-right: 3px;
} }
code {
overflow-wrap: break-word;
word-wrap: break-word;
}
.non-bold {
font-weight: normal;
}
@media print {
.noprint {
display: none!important;
}
}
.donation-form-group label { .donation-form-group label {
font-weight: bold; font-weight: bold;
} }
...@@ -275,233 +335,217 @@ ...@@ -275,233 +335,217 @@
text-align: left; text-align: left;
} }
.mutelink { #color-chooser #standard {
color: grey; background-color: rgb(255, 194, 107);
} }
.quicktip { #color-chooser #standardHard {
margin-bottom: 15px; background-color: rgb(255, 128, 0);
padding: 10px;
line-height: 1.2 !important;
font-family: Georgia, "Times New Roman", Palatino, Times, serif;
color: #000;
border-left: 3px solid #FB0;
font-size: 14px;
} }
.wikiqtextract { #color-chooser #green {
font-family: Georgia, "Times New Roman", Palatino, Times, serif; background-color: rgb(177, 226, 163);
} }
.wikiqtextract p { #color-chooser #greenHard {
margin-bottom: 0; background-color: rgb(127, 175, 27);
} }
.qtheader { #color-chooser #blue {
font-family: verdana, arial, helvetica, sans-serif; background-color: rgb(164, 192, 230);
} }
.author { #color-chooser #blueHard {
float: right !important; background-color: rgb(2, 93, 140);
} }
.quicktip.aufruf { #color-chooser #red {
border-left: 3px solid #FF4000; background-color: rgb(255, 92, 92);
color: #FF4000;
} }
.language-textarea { #color-chooser #redHard {
resize: none; background-color: rgb(255, 0, 0);
overflow: hidden;
} }
.language-name { #color-chooser #pink {
white-space: pre; background-color: rgb(255, 196, 246);
} }
.kontakt-form-group { #color-chooser #pinkHard {
text-align: left; background-color: rgb(254, 67, 101);
font-size: 14px;
} }
.settings-btn { #color-chooser #black {
margin-top: 25px; background-color: rgb(238, 238, 238);
} }
.fokus-category { #color-chooser #blackHard {
font-size: 20px; background-color: rgb(50, 50, 50);
} }
.settings-form-control { #color-chooser {
width: 200px; padding: 0;
margin-top: 10px;
} }
.bold { #color-chooser a {
font-weight: bold; display: block;
width: 50px;
height: 50px;
} }
.non-bold { #color-chooser li {
font-weight: normal; width: 50px;
margin: 0;
} }
.bitcoins { #moreInformation {
box-shadow: none;
margin-top: 5%;
text-align: center; text-align: center;
-moz-box-shadow: none;
} }
#moreInformation ul {
/* Bootstrap */ /* text-align: left; */
.input-group-addon {
padding: 0; padding: 0;
} }
.form-group { #moreInformation ul li {
font-family: sans-serif; color: grey;
font-size: 16px;
color: black;
background-color: transparent;
text-align: center;
} }
.modal-content { #moreInformation > div {
border-radius: 0; font-size: 15px;
-webkit-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
-moz-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
} }
.navbar-default { #moreInformation h2 {
background-color: white; color: grey;
border-radius: 0; font-size: 25px;
} }
.well-sm { #moreInformation a:hover {
margin: 10px 0px; text-decoration: underline;
} }
.row { #searchForm button {
margin-left: 0; width: 50px;
margin-right: 0; line-height: 100%;
height: 28px;
border: 0;
background-color: transparent;
padding: 0;
} }
.checkbox { #mglogo {
margin-top: 5px; width: 100%;
margin-bottom: 5px; text-align: center;
} }
.logo h1 { #mglogo > a {
margin: 0; display: block;
height: 100%; width: 200px;
padding-left: 20px; text-decoration: none;
padding-top: 8px; font-size: 1.1em;
font-family: sans-serif; font-family: Liberation Sans, sans-serif;
font-style: italic;
margin: 0;
font-weight: bold; font-weight: bold;
font-style: italic;
font-size: 1.0em;
line-height: 1; line-height: 1;
white-space: nowrap; white-space: nowrap;
padding: 0.4em 0;
border-radius: .25em;
margin: 0 auto;
} }
#sponsors a {
/* font-size: 0.8em;
By Element
*/
* {
font-family: Liberation Sans, sans-serif;
} }
header nav a { #sponsors h2 {
text-decoration: none; font-size: 1.5em!important;
color: rgb(119, 119, 119);
} }
body > div { #foki label > span {
background-color: transparent; margin-right: 5px;
padding-top: 70px;
} }
body ul { #foki label span {
list-style-type: none; background-color: transparent;
text-align: center;
margin-left: 0!important;
margin-top: 10px;
} }
footer { #foki input {
margin-top: 8%; visibility: hidden;
bottom: 0;
width: 100%;
} }
footer li { #foki input:checked + label {
width: 33%; font-weight: bold;
text-align: center; background-color: #e3e3e3;
} }
footer img { #foki input + label {
max-width: 100%; border-radius: 4px;
padding: 7px 20px;
font-weight: normal;
} }
main ul li { #foki input + label:hover {
margin: 0 10px; cursor: pointer;
background-color: #f6f6f6;
} }
main fieldset { .modal-content {
border: 0; border-radius: 0;
-webkit-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
-moz-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
} }
code { #anpassen-label a.content {
overflow-wrap: break-word; color: inherit;
word-wrap: break-word;
} }
label a { .mutelink {
color: inherit; color: grey;
} }
label a:hover { #plugin-modal ol > li {
text-decoration: none; margin-bottom: 5px;
color: inherit;
} }
section { .quicktip {
margin-bottom: 15px;
padding: 10px; padding: 10px;
box-shadow: 5px 5px 10px 0px rgba(0, 0, 0, 0.55); line-height: 1.2 !important;
-moz-box-shadow: 5px 5px 10px 0px rgba(0, 0, 0, 0.55); font-family: Georgia, "Times New Roman", Palatino, Times, serif;
-moz-box-shadow: 5px 5px 10px 0px rgba(0, 0, 0, 0.55); color: #000;
border-left: 3px solid #FB0;
font-size: 14px;
} }
.wikiqtextract {
/* font-family: Georgia, "Times New Roman", Palatino, Times, serif;
Mixed
*/
.settings-btn + .settings-btn {
margin-left: 10px;
} }
@media print { .wikiqtextract p {
.noprint { margin-bottom: 0;
display: none!important;
}
} }
a:hover { .qtheader {
cursor: pointer; font-family: verdana, arial, helvetica, sans-serif;
} }
footer ul.list-inline { #spruch {
width: 100%; margin-bottom: 20px;
padding: 5px;
line-height: 1.2 !important;
color: #070;
border-left: 3px solid #070;
font-size: 16px;
font-family: Georgia, "Times New Roman", Palatino, Times, serif;
} }
span.glyphicon { .author {
background-color: transparent; float: right !important;
} }
.quicktip h1 { .quicktip h1 {
...@@ -509,63 +553,21 @@ span.glyphicon { ...@@ -509,63 +553,21 @@ span.glyphicon {
margin-top: 0px; margin-top: 0px;
} }
fieldset input[type=text] { .quicktip.aufruf {
width: 100%; border-left: 3px solid #FF4000;
padding-left: 10px; color: #FF4000;
padding-right: 10px;
border-width: 1px;
overflow: visible;
}
main fieldset#foki {
margin: 5px 0;
text-align: center;
}
a.content.hidden-xs {
color: #333;
}
a.navbar-brand {
line-height: 100%!important;
padding: 0;
}
nav .navbar-brand > div.logo {
height: 100%;
}
div#right {
background-color: #FFDCC1;
border-radius: 5px;
padding: 20px;
padding-top: 0;
}
div#right p {
white-space: normal;
border-bottom: 1px solid black;
margin-bottom: 15px;
padding-bottom: 15px;
}
div#left {
padding-right: 35px;
}
form.contact {
max-width: 500px;
} }
textarea#message { .language-textarea {
height: 200px; resize: none;
overflow: hidden;
} }
label.select-label { .language-name {
margin-bottom: 0; white-space: pre;
margin-top: 10px;
} }
li#info { .kontakt-form-group {
white-space: pre-line; text-align: left;
font-size: 14px;
} }
\ No newline at end of file
resources/lang/de/team.php
+ 1
− 2
View file @ 2e61c6db
...@@ -9,7 +9,6 @@ return [ ...@@ -9,7 +9,6 @@ return [
'role.6' => 'Programmierer', 'role.6' => 'Programmierer',
'role.7' => 'Sekretariat', 'role.7' => 'Sekretariat',
'contact.1' => 'Fragen/Probleme zu MetaGer etc. bitte immer an 'contact.1' => 'Fragen/Probleme zu MetaGer etc. bitte immer an <a href="mailto:office@suma-ev.de">office@suma-ev.de</a> mailen, oder das <a href="/kontakt/">Kontaktformular mit Verschlüsselung</a> benutzten, oder am besten: ins <a href="http://forum.suma-ev.de/" target="_blank">MetaGer-Forum</a> schreiben. Wir können bei der Vielzahl der Anfragen nicht immer zeitnah antworten - im <a href="http://forum.suma-ev.de/" target="_blank">MetaGer-Forum</a> können Ihnen wahrscheinlich auch andere MetaGer-Nutzer weiterhelfen, und von den Fragen und Antworten profitieren ALLE.',
<a href="mailto:office@suma-ev.de">office@suma-ev.de</a> mailen, oder das <a href="/kontakt/">Kontaktformular mit Verschlüsselung</a> benutzten, oder am besten: ins <a href="http://forum.suma-ev.de/" target="_blank">MetaGer-Forum</a> schreiben. Wir können bei der Vielzahl der Anfragen nicht immer zeitnah antworten - im <a href="http://forum.suma-ev.de/" target="_blank">MetaGer-Forum</a> können Ihnen wahrscheinlich auch andere MetaGer-Nutzer weiterhelfen, und von den Fragen und Antworten profitieren ALLE.',
'contact.2' => 'Nur in begründeten Ausnahmefällen, wenn Sie bestimmte Personen direkt erreichen wollen, sollten Sie an diese mailen. Denn Team-Mitglieder können Urlaub haben, krank sein usw.', 'contact.2' => 'Nur in begründeten Ausnahmefällen, wenn Sie bestimmte Personen direkt erreichen wollen, sollten Sie an diese mailen. Denn Team-Mitglieder können Urlaub haben, krank sein usw.',
]; ];
resources/lang/en/team.php
+ 1
− 2
View file @ 2e61c6db
...@@ -9,7 +9,6 @@ return [ ...@@ -9,7 +9,6 @@ return [
'role.6' => 'programmer', 'role.6' => 'programmer',
'role.7' => 'secretary', 'role.7' => 'secretary',
'contact.1' => 'Please mail your questions/problems about MetaGer etc. to 'contact.1' => 'Please mail your questions/problems about MetaGer etc. to <a href="mailto:office@suma-ev.de">office@suma-ev.de</a> or use the <a href="/en/kontakt/">contact form with encryption</a>, or preferably make a post in the <a href="http://forum.suma-ev.de/" target="_blank">MetaGer-forum</a>. Due to the amount of requests, we can not always answer promptly - in the <a href="http://forum.suma-ev.de/" target="_blank">MetaGer-forum</a> there are probably other users which can help you aswell, and the questions and answers benefit everyone.',
<a href="mailto:office@suma-ev.de">office@suma-ev.de</a> or use the <a href="/en/kontakt/">contact form with encryption</a>, or preferably make a post in the <a href="http://forum.suma-ev.de/" target="_blank">MetaGer-forum</a>. Due to the amount of requests, we can not always answer promptly - in the <a href="http://forum.suma-ev.de/" target="_blank">MetaGer-forum</a> there are probably other users which can help you aswell, and the questions and answers benefit everyone.',
'contact.2' => 'Only in reasoned exceptions, if you want to rech someone directly, you should mail them. Because team members might be on vacation, sick etc.', 'contact.2' => 'Only in reasoned exceptions, if you want to rech someone directly, you should mail them. Because team members might be on vacation, sick etc.',
]; ];
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