diff --git a/public/css/style.css b/public/css/style.css
index 42738fda712755d17f2bd805e8c3866f908692cd..a3345e22b86dbafd941f1630875c5b4a2bcfef73 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -1,227 +1,272 @@
-/*
-
- By ID
+* {
+ font-family: Liberation Sans, sans-serif;
+}
- */
+label a {
+ color: inherit;
+}
-#color-chooser #standard {
- background-color: rgb(255, 194, 107);
+label a:hover {
+ text-decoration: none;
+ color: inherit;
}
-#color-chooser #standardHard {
- background-color: rgb(255, 128, 0);
+li#info {
+ white-space: pre-line;
}
-#color-chooser #green {
- background-color: rgb(177, 226, 163);
+.navbar-default {
+ background-color: white;
+ border-radius: 0;
}
-#color-chooser #greenHard {
- background-color: rgb(127, 175, 27);
+.row {
+ margin-left: 0;
+ margin-right: 0;
}
-#color-chooser #blue {
- background-color: rgb(164, 192, 230);
+.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);
}
-#color-chooser #blueHard {
- background-color: rgb(2, 93, 140);
+.input-group-addon {
+ padding: 0;
}
-#color-chooser #red {
- background-color: rgb(255, 92, 92);
+.form-group {
+ font-family: sans-serif;
+ font-size: 16px;
+ color: black;
+ background-color: transparent;
+ text-align: center;
}
-#color-chooser #redHard {
- background-color: rgb(255, 0, 0);
+section {
+ 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 {
- background-color: rgb(255, 196, 246);
+body > div {
+ background-color: transparent;
+ padding-top: 70px;
}
-#color-chooser #pinkHard {
- background-color: rgb(254, 67, 101);
+footer ul.list-inline {
+ width: 100%;
}
-#color-chooser #black {
- background-color: rgb(238, 238, 238);
+footer li {
+ width: 33%;
+ text-align: center;
}
-#color-chooser #blackHard {
- background-color: rgb(50, 50, 50);
+footer img {
+ max-width: 100%;
}
-#color-chooser {
- padding: 0;
+span.glyphicon {
+ background-color: transparent;
}
-#color-chooser a {
- display: block;
- width: 50px;
- height: 50px;
+footer {
+ margin-top: 8%;
+ bottom: 0;
+ width: 100%;
}
-#color-chooser li {
- width: 50px;
- margin: 0;
+main ul li {
+ margin: 0 10px;
}
-#moreInformation {
- box-shadow: none;
- margin-top: 5%;
+body ul {
+ list-style-type: none;
text-align: center;
- -moz-box-shadow: none;
+ margin-left: 0!important;
+ margin-top: 10px;
}
-#moreInformation ul {
- /* text-align: left; */
- padding: 0;
+fieldset input[type=text] {
+ width: 100%;
+ padding-left: 10px;
+ padding-right: 10px;
+ border-width: 1px;
+ overflow: visible;
}
-#moreInformation ul li {
- color: grey;
+main fieldset {
+ border: 0;
}
-#moreInformation > div {
- font-size: 15px;
+main fieldset#foki {
+ margin: 5px 0;
+ text-align: center;
}
-#moreInformation h2 {
- color: grey;
- font-size: 25px;
+a.content.hidden-xs {
+ color: #333;
}
-#moreInformation a:hover {
- text-decoration: underline;
+header nav a {
+ text-decoration: none;
+ color: rgb(119, 119, 119);
}
-#searchForm button {
- width: 50px;
- line-height: 100%;
- height: 28px;
- border: 0;
- background-color: transparent;
+a.navbar-brand {
+ line-height: 100%!important;
padding: 0;
}
-#mglogo {
- width: 100%;
- text-align: center;
+nav .navbar-brand > div.logo {
+ height: 100%;
}
-#mglogo > a {
- display: block;
- width: 200px;
- text-decoration: none;
- font-size: 1.1em;
- font-family: Liberation Sans, sans-serif;
- font-weight: bold;
+nav h1 {
+ margin: 0;
+ height: 100%;
+ padding-left: 20px;
+ padding-top: 8px;
+ font-family: sans-serif;
font-style: italic;
- font-size: 1.0em;
+ margin: 0;
+ font-weight: bold;
line-height: 1;
white-space: nowrap;
- padding: 0.4em 0;
- border-radius: .25em;
- margin: 0 auto;
}
-#sponsors a {
- font-size: 0.8em;
+body {
+ margin: 0;
}
-#sponsors h2 {
- font-size: 1.5em!important;
+header {
+ position: fixed;
+ background-color: white;
+ z-index: 500;
+ width: 100%;
+ height: 50px;
}
-#foki label > span {
- margin-right: 5px;
+.dotlist {
+ list-style-type: disc;
+ text-align: left;
}
-#foki label span {
- background-color: transparent;
+.dotlist li {
+ margin-bottom: 5px;
}
-#foki input {
- visibility: hidden;
+.well-sm {
+ margin: 10px 0px;
}
-#foki input:checked + label {
- font-weight: bold;
- background-color: #e3e3e3;
+address {
+ white-space: pre;
}
-#foki input + label {
- border-radius: 4px;
- padding: 7px 20px;
- font-weight: normal;
+.subheading {
+ font-size: 20px;
+ margin: 20px 0px;
+ white-space: pre-wrap;
}
-#foki input + label:hover {
- cursor: pointer;
- background-color: #f6f6f6;
+p {
+ white-space: pre-wrap;
}
-#anpassen-label a.content {
- color: inherit;
+form {
+ margin: 10px 0px;
}
-#plugin-modal ol > li {
- margin-bottom: 5px;
+div#right {
+ background-color: #FFDCC1;
+ border-radius: 5px;
+ padding: 20px;
+ padding-top: 0;
}
-#spruch {
- 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;
+div#right p {
+ white-space: normal;
+ border-bottom: 1px solid black;
+ margin-bottom: 15px;
+ padding-bottom: 15px;
}
-
-/*
-
- 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);
+.bitcoins {
+ text-align: center;
}
-.dotlist {
- list-style-type: disc;
- text-align: left;
+div#left {
+ padding-right: 35px;
}
-.dotlist li {
- margin-bottom: 5px;
+.bold {
+ font-weight: bold;
}
-.subheading {
- font-size: 20px;
- margin: 20px 0px;
+code {
white-space: pre-wrap;
+ word-break: break-word;
}
-.settings-checkbox .settings-glyphicon {
- margin-left: 5px;
- font-size: 12px;
+form.contact {
+ max-width: 500px;
}
-.metager-searchinput {
- height: 30px;
- padding: 6px 12px;
+textarea#message {
+ height: 200px;
+}
+
+.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;
line-height: 1.42857;
color: #555;
@@ -262,6 +307,21 @@
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 {
font-weight: bold;
}
@@ -275,233 +335,217 @@
text-align: left;
}
-.mutelink {
- color: grey;
+#color-chooser #standard {
+ background-color: rgb(255, 194, 107);
}
-.quicktip {
- margin-bottom: 15px;
- 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;
+#color-chooser #standardHard {
+ background-color: rgb(255, 128, 0);
}
-.wikiqtextract {
- font-family: Georgia, "Times New Roman", Palatino, Times, serif;
+#color-chooser #green {
+ background-color: rgb(177, 226, 163);
}
-.wikiqtextract p {
- margin-bottom: 0;
+#color-chooser #greenHard {
+ background-color: rgb(127, 175, 27);
}
-.qtheader {
- font-family: verdana, arial, helvetica, sans-serif;
+#color-chooser #blue {
+ background-color: rgb(164, 192, 230);
}
-.author {
- float: right !important;
+#color-chooser #blueHard {
+ background-color: rgb(2, 93, 140);
}
-.quicktip.aufruf {
- border-left: 3px solid #FF4000;
- color: #FF4000;
+#color-chooser #red {
+ background-color: rgb(255, 92, 92);
}
-.language-textarea {
- resize: none;
- overflow: hidden;
+#color-chooser #redHard {
+ background-color: rgb(255, 0, 0);
}
-.language-name {
- white-space: pre;
+#color-chooser #pink {
+ background-color: rgb(255, 196, 246);
}
-.kontakt-form-group {
- text-align: left;
- font-size: 14px;
+#color-chooser #pinkHard {
+ background-color: rgb(254, 67, 101);
}
-.settings-btn {
- margin-top: 25px;
+#color-chooser #black {
+ background-color: rgb(238, 238, 238);
}
-.fokus-category {
- font-size: 20px;
+#color-chooser #blackHard {
+ background-color: rgb(50, 50, 50);
}
-.settings-form-control {
- width: 200px;
- margin-top: 10px;
+#color-chooser {
+ padding: 0;
}
-.bold {
- font-weight: bold;
+#color-chooser a {
+ display: block;
+ width: 50px;
+ height: 50px;
}
-.non-bold {
- font-weight: normal;
+#color-chooser li {
+ width: 50px;
+ margin: 0;
}
-.bitcoins {
+#moreInformation {
+ box-shadow: none;
+ margin-top: 5%;
text-align: center;
+ -moz-box-shadow: none;
}
-
-/* Bootstrap */
-
-.input-group-addon {
+#moreInformation ul {
+ /* text-align: left; */
padding: 0;
}
-.form-group {
- font-family: sans-serif;
- font-size: 16px;
- color: black;
- background-color: transparent;
- text-align: center;
+#moreInformation ul li {
+ color: grey;
}
-.modal-content {
- 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);
+#moreInformation > div {
+ font-size: 15px;
}
-.navbar-default {
- background-color: white;
- border-radius: 0;
+#moreInformation h2 {
+ color: grey;
+ font-size: 25px;
}
-.well-sm {
- margin: 10px 0px;
+#moreInformation a:hover {
+ text-decoration: underline;
}
-.row {
- margin-left: 0;
- margin-right: 0;
+#searchForm button {
+ width: 50px;
+ line-height: 100%;
+ height: 28px;
+ border: 0;
+ background-color: transparent;
+ padding: 0;
}
-.checkbox {
- margin-top: 5px;
- margin-bottom: 5px;
+#mglogo {
+ width: 100%;
+ text-align: center;
}
-.logo h1 {
- margin: 0;
- height: 100%;
- padding-left: 20px;
- padding-top: 8px;
- font-family: sans-serif;
- font-style: italic;
- margin: 0;
+#mglogo > a {
+ display: block;
+ width: 200px;
+ text-decoration: none;
+ font-size: 1.1em;
+ font-family: Liberation Sans, sans-serif;
font-weight: bold;
+ font-style: italic;
+ font-size: 1.0em;
line-height: 1;
white-space: nowrap;
+ padding: 0.4em 0;
+ border-radius: .25em;
+ margin: 0 auto;
}
-
-/*
-
- By Element
-
-*/
-
-* {
- font-family: Liberation Sans, sans-serif;
+#sponsors a {
+ font-size: 0.8em;
}
-header nav a {
- text-decoration: none;
- color: rgb(119, 119, 119);
+#sponsors h2 {
+ font-size: 1.5em!important;
}
-body > div {
- background-color: transparent;
- padding-top: 70px;
+#foki label > span {
+ margin-right: 5px;
}
-body ul {
- list-style-type: none;
- text-align: center;
- margin-left: 0!important;
- margin-top: 10px;
+#foki label span {
+ background-color: transparent;
}
-footer {
- margin-top: 8%;
- bottom: 0;
- width: 100%;
+#foki input {
+ visibility: hidden;
}
-footer li {
- width: 33%;
- text-align: center;
+#foki input:checked + label {
+ font-weight: bold;
+ background-color: #e3e3e3;
}
-footer img {
- max-width: 100%;
+#foki input + label {
+ border-radius: 4px;
+ padding: 7px 20px;
+ font-weight: normal;
}
-main ul li {
- margin: 0 10px;
+#foki input + label:hover {
+ cursor: pointer;
+ background-color: #f6f6f6;
}
-main fieldset {
- border: 0;
+.modal-content {
+ 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 {
- overflow-wrap: break-word;
- word-wrap: break-word;
+#anpassen-label a.content {
+ color: inherit;
}
-label a {
- color: inherit;
+.mutelink {
+ color: grey;
}
-label a:hover {
- text-decoration: none;
- color: inherit;
+#plugin-modal ol > li {
+ margin-bottom: 5px;
}
-section {
+.quicktip {
+ margin-bottom: 15px;
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);
+ line-height: 1.2 !important;
+ font-family: Georgia, "Times New Roman", Palatino, Times, serif;
+ color: #000;
+ border-left: 3px solid #FB0;
+ font-size: 14px;
}
-
-/*
-
- Mixed
-
-*/
-
-.settings-btn + .settings-btn {
- margin-left: 10px;
+.wikiqtextract {
+ font-family: Georgia, "Times New Roman", Palatino, Times, serif;
}
-@media print {
- .noprint {
- display: none!important;
- }
+.wikiqtextract p {
+ margin-bottom: 0;
}
-a:hover {
- cursor: pointer;
+.qtheader {
+ font-family: verdana, arial, helvetica, sans-serif;
}
-footer ul.list-inline {
- width: 100%;
+#spruch {
+ 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 {
- background-color: transparent;
+.author {
+ float: right !important;
}
.quicktip h1 {
@@ -509,63 +553,21 @@ span.glyphicon {
margin-top: 0px;
}
-fieldset input[type=text] {
- width: 100%;
- padding-left: 10px;
- 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;
+.quicktip.aufruf {
+ border-left: 3px solid #FF4000;
+ color: #FF4000;
}
-textarea#message {
- height: 200px;
+.language-textarea {
+ resize: none;
+ overflow: hidden;
}
-label.select-label {
- margin-bottom: 0;
- margin-top: 10px;
+.language-name {
+ white-space: pre;
}
-li#info {
- white-space: pre-line;
+.kontakt-form-group {
+ text-align: left;
+ font-size: 14px;
}
\ No newline at end of file
diff --git a/resources/lang/de/team.php b/resources/lang/de/team.php
index f0db8ffc9f2ef446a51a8f20e103cc2ff1260d2a..eecdcc5fdadd5202ee79103277dc07f7d31aa470 100644
--- a/resources/lang/de/team.php
+++ b/resources/lang/de/team.php
@@ -9,7 +9,6 @@ return [
'role.6' => 'Programmierer',
'role.7' => 'Sekretariat',
- '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.',
+ '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.',
'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.',
];
diff --git a/resources/lang/en/team.php b/resources/lang/en/team.php
index 95c6910ad99baab553774ed7788361ba730a2dfb..ac3b47374a9f2361b0c681e94c4419734c245a13 100644
--- a/resources/lang/en/team.php
+++ b/resources/lang/en/team.php
@@ -9,7 +9,6 @@ return [
'role.6' => 'programmer',
'role.7' => 'secretary',
- '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.',
+ '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.',
'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.',
];