diff --git a/app/Http/Controllers/StartpageController.php b/app/Http/Controllers/StartpageController.php
index 01efe30fcfda9b1bcc86619642e6f0b3d96f6806..9ad1d30708e39dd3c63ef141192436f2dfaf0b5d 100644
--- a/app/Http/Controllers/StartpageController.php
+++ b/app/Http/Controllers/StartpageController.php
@@ -149,7 +149,6 @@ class StartpageController extends Controller
return view('settings')
->with('foki', $foki)
->with('title', 'Einstellungen')
- ->with('css', 'settings.css')
->with('js', ['settings.js'])
->with('navbarFocus', 'suche');
die(var_dump($foki));
diff --git a/app/Http/routes.php b/app/Http/routes.php
index 96423a88fa1b8f6c5c4d4c217890f28f94b4ed52..d297c9cd2ee17ced0e745e6455eef195c148f6a2 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -26,7 +26,6 @@ Route::group(
Route::get('impressum', function () {
return view('impressum')
->with('title', trans('titles.impressum'))
- ->with('css', 'impressum.css')
->with('navbarFocus', 'kontakt');
});
Route::get('impressum.html', function () {
@@ -36,13 +35,11 @@ Route::group(
Route::get('about', function () {
return view('about')
->with('title', trans('titles.about'))
- ->with('css', 'about.css')
->with('navbarFocus', 'kontakt');
});
Route::get('team', function () {
return view('team.team')
->with('title', trans('titles.team'))
- ->with('css', 'team.css')
->with('navbarFocus', 'kontakt');
});
Route::get('team/pubkey-wsb', function () {
@@ -82,8 +79,7 @@ Route::group(
Route::get('partnershops', function () {
return view('spende.partnershops')
->with('title', trans('titles.partnershops'))
- ->with('navbarFocus', 'foerdern')
- ->with('css', 'partnershops.css');
+ ->with('navbarFocus', 'foerdern');
});
Route::get('beitritt', function () {
@@ -107,14 +103,12 @@ Route::group(
Route::get('datenschutz', function () {
return view('datenschutz')
->with('title', trans('titles.datenschutz'))
- ->with('css', 'privacy.css')
->with('navbarFocus', 'datenschutz');
});
Route::get('hilfe', function () {
return view('hilfe')
->with('title', trans('titles.hilfe'))
- ->with('css', 'help.css')
->with('navbarFocus', 'hilfe');
});
diff --git a/public/css/503.css b/public/css/503.css
deleted file mode 100644
index 497bd97249ddcf2ea7a695f7029bb900399fd71c..0000000000000000000000000000000000000000
--- a/public/css/503.css
+++ /dev/null
@@ -1,29 +0,0 @@
-html, body {
- height: 100%;
-}
-
-body {
- margin: 0;
- padding: 0;
- width: 100%;
- color: #B0BEC5;
- display: table;
- font-weight: 100;
- font-family: 'Lato';
-}
-
-.container {
- text-align: center;
- display: table-cell;
- vertical-align: middle;
-}
-
-.content {
- text-align: center;
- display: inline-block;
-}
-
-.title {
- font-size: 72px;
- margin-bottom: 40px;
-}
diff --git a/public/css/about.css b/public/css/about.css
deleted file mode 100644
index d93360a978b2b5566d7e47faa5e4e68c5c879712..0000000000000000000000000000000000000000
--- a/public/css/about.css
+++ /dev/null
@@ -1,16 +0,0 @@
-main ul {
- margin-top: 20px;
-}
-
-main li {
- margin-bottom: 15px;
-}
-
-#about-list {
- list-style-type: disc;
- text-align: left;
-}
-
-#about-list li {
- margin-bottom: 15px;
-}
\ No newline at end of file
diff --git a/public/css/beitritt.css b/public/css/beitritt.css
index 18db3ed67fee9f2eead752a882f1d7802ed7996c..4c202d84a44733fd1190aa30aa2a0a404f606c68 100644
--- a/public/css/beitritt.css
+++ b/public/css/beitritt.css
@@ -1,25 +1,4 @@
-.form-group {
- text-align: left;
-}
-
-label.non-bold {
- font-weight: normal;
- font-size: 16px;
-}
-
-ul {
- list-style-type: initial!important;
- text-align: left!important;
-}
-
-hr {
- margin: 10px 0!important;
-}
-
@media print {
- .noprint {
- display: none!important;
- }
#spendenaufruf {
display: none!important;
}
diff --git a/public/css/danke.css b/public/css/danke.css
deleted file mode 100644
index 03eee205d4046316970f69eaaa94ea13f3b8963b..0000000000000000000000000000000000000000
--- a/public/css/danke.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@media print {
- .noprint {
- display: none!important;
- }
-}
\ No newline at end of file
diff --git a/public/css/donation.css b/public/css/donation.css
deleted file mode 100644
index 8ef5bfc7a0be3924fb11157a47c040115347ec33..0000000000000000000000000000000000000000
--- a/public/css/donation.css
+++ /dev/null
@@ -1,82 +0,0 @@
-div#right {
- background-color: #FFDCC1;
- border-radius: 5px;
- padding: 20px;
- padding-top: 0;
-}
-
-body {
- font-size: 14px;
-}
-
-button.btn.btn-default {
- width: 100px;
- line-height: 100%;
-}
-
-.form-group label {
- font-weight: bold;
-}
-
-.form-group {
- text-align: left;
- font-size: 12px;
-}
-
-.others {}
-
-div#left {
- padding-right: 35px;
-}
-
-.ppbc {
- text-align: center;
-}
-
-p {
- white-space: pre-wrap;
-}
-
-h1 {
- margin-bottom: 25px;
-}
-
-p {
- margin: 10px 0 10px 0;
-}
-
-main {
- text-align: left;
-}
-
-div#right p {
- white-space: normal;
- border-bottom: 1px solid black;
- margin-bottom: 15px;
- padding-bottom: 15px;
-}
-
-h2 {
- font-size: 20px;
- margin-top: 10px;
-}
-
-h2#lastschrift {
- margin-top: 25px;
-}
-
-address {
- white-space: pre;
-}
-
-accountdata {
- white-space: pre;
-}
-
-donationReceipt {
- white-space: pre;
-}
-
-right {
- background-color: #FFDCC1;
-}
\ No newline at end of file
diff --git a/public/css/editLanguage.css b/public/css/editLanguage.css
deleted file mode 100644
index bae0c657373601a94346d03feb15cbeee92c4db6..0000000000000000000000000000000000000000
--- a/public/css/editLanguage.css
+++ /dev/null
@@ -1,8 +0,0 @@
-td.name {
- white-space: pre;
-}
-
-textarea {
- resize: none;
- overflow: hidden;
-}
\ No newline at end of file
diff --git a/public/css/help.css b/public/css/help.css
deleted file mode 100644
index 30a18ddf590c0112e8b5d234ab18f0e9051aeaee..0000000000000000000000000000000000000000
--- a/public/css/help.css
+++ /dev/null
@@ -1,37 +0,0 @@
-p {
- white-space: pre-wrap;
-}
-
-h1 {
- margin-bottom: 25px;
-}
-
-h3 {
- font-size: 21px;
- margin-bottom: 5px;
-}
-
-h1 + h2 {
- margin-top: 0;
-}
-
-h2 + h3 {
- margin-top: 0;
-}
-
-main {
- text-align: left;
-}
-
-address {
- white-space: pre;
-}
-
-main ul {
- list-style-type: disc;
- text-align: left;
-}
-
-.well-sm {
- margin: 10px 0px;
-}
\ No newline at end of file
diff --git a/public/css/impressum.css b/public/css/impressum.css
deleted file mode 100644
index 7bb3df619e9578dde7918671a95c15fedd3a77ea..0000000000000000000000000000000000000000
--- a/public/css/impressum.css
+++ /dev/null
@@ -1,21 +0,0 @@
-p {
- white-space: pre-wrap;
- margin: 20px 0;
-}
-
-h1 {
- margin-bottom: 25px;
-}
-
-h2 {
- font-size: 20px;
- margin-top: 10px;
-}
-
-main {
- text-align: left;
-}
-
-address {
- white-space: pre;
-}
\ No newline at end of file
diff --git a/public/css/index.css b/public/css/index.css
deleted file mode 100644
index d0c104b3dbe681af2c61b878b9a0c7b236b319de..0000000000000000000000000000000000000000
--- a/public/css/index.css
+++ /dev/null
@@ -1,176 +0,0 @@
-#color-chooser #standard {
- background-color: rgb(255, 194, 107);
-}
-
-#color-chooser #standardHard {
- background-color: rgb(255, 128, 0);
-}
-
-#color-chooser #green {
- background-color: rgb(177, 226, 163);
-}
-
-#color-chooser #greenHard {
- background-color: rgb(127, 175, 27);
-}
-
-#color-chooser #blue {
- background-color: rgb(164, 192, 230);
-}
-
-#color-chooser #blueHard {
- background-color: rgb(2, 93, 140);
-}
-
-#color-chooser #red {
- background-color: rgb(255, 92, 92);
-}
-
-#color-chooser #redHard {
- background-color: rgb(255, 0, 0);
-}
-
-#color-chooser #pink {
- background-color: rgb(255, 196, 246);
-}
-
-#color-chooser #pinkHard {
- background-color: rgb(254, 67, 101);
-}
-
-#color-chooser #black {
- background-color: rgb(238, 238, 238);
-}
-
-#color-chooser #blackHard {
- background-color: rgb(50, 50, 50);
-}
-
-ul#color-chooser {
- padding: 0;
-}
-
-ul#color-chooser a {
- display: block;
- width: 50px;
- height: 50px;
-}
-
-#color-chooser li {
- width: 50px;
- margin: 0;
-}
-
-#moreInformation {
- box-shadow: none;
- margin-top: 5%;
- text-align: center;
- -moz-box-shadow: none;
-}
-
-#moreInformation ul {
- /* text-align: left; */
- padding: 0;
-}
-
-#moreInformation ul li {
- color: grey;
-}
-
-#moreInformation > div {
- font-size: 15px;
-}
-
-#moreInformation h2 {
- color: grey;
- font-size: 25px;
-}
-
-#moreInformation a:hover {
- text-decoration: underline;
-}
-
-#searchForm button {
- width: 50px;
- line-height: 100%;
- height: 28px;
- border: 0;
- background-color: transparent;
- padding: 0;
-}
-
-#mglogo {
- width: 100%;
- text-align: center;
-}
-
-#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;
-}
-
-#sponsors a {
- font-size: 0.8em;
-}
-
-#sponsors h2 {
- font-size: 1.5em!important;
-}
-
-#foki label > span {
- margin-right: 5px;
-}
-
-#foki label span {
- background-color: transparent;
-}
-
-#foki input {
- visibility: hidden;
-}
-
-#foki input:checked + label {
- font-weight: bold;
- background-color: #e3e3e3;
-}
-
-#foki input + label {
- border-radius: 4px;
- padding: 7px 20px;
- font-weight: normal;
-}
-
-#foki input + label:hover {
- cursor: pointer;
- background-color: #f6f6f6;
-}
-
-.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);
-}
-
-#anpassen-label a.content {
- color: inherit;
-}
-
-.mutelink {
- color: grey;
-}
-
-#plugin-modal ol > li {
- margin-bottom: 5px;
-}
\ No newline at end of file
diff --git a/public/css/kontakt.css b/public/css/kontakt.css
deleted file mode 100644
index e680e9db901c1237405414a4f7bc5d0e7be24313..0000000000000000000000000000000000000000
--- a/public/css/kontakt.css
+++ /dev/null
@@ -1,44 +0,0 @@
-*{
-
-}
-
-textarea#message {
- height: 200px;
-}
-
-form.contact {
- max-width: 500px;
-}
-
-adress {
- white-space: pre;
-}
-
-code {
- white-space: pre-wrap;
- word-break: break-word;
-}
-
-.form-group {
- text-align: left;
- font-size: 14px;
-}
-
-button.btn.btn-default {
- line-height: 100%;
-}
-
-p {
- white-space: pre-wrap;
-}
-
-main.mg-panel {
- text-align: left;
-}
-
-form {
-}
-
-.bold {
- font-weight: bold;
-}
\ No newline at end of file
diff --git a/public/css/partnershops.css b/public/css/partnershops.css
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/public/css/privacy.css b/public/css/privacy.css
deleted file mode 100644
index a0c573b1a3af2f6d896f3b248322e45634ddbe73..0000000000000000000000000000000000000000
--- a/public/css/privacy.css
+++ /dev/null
@@ -1,20 +0,0 @@
-*{
-
-}
-
-main li {
- margin-bottom: 5px;
-}
-
-mg-panel li {
- margin-top: 10px;
-}
-
-#privacyList {
- list-style-type: disc;
- text-align: left;
-}
-
-#privacyList li {
- margin-bottom: 5px;
-}
\ No newline at end of file
diff --git a/public/css/quicktips.css b/public/css/quicktips.css
deleted file mode 100644
index 4fdce19610bb766a73ef526cecf1b24fac9c0bb6..0000000000000000000000000000000000000000
--- a/public/css/quicktips.css
+++ /dev/null
@@ -1,49 +0,0 @@
-.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;
-}
-
-.wikiqtextract {
- font-family: Georgia,"Times New Roman",Palatino,Times,serif;
-}
-
-.wikiqtextract p {
- margin-bottom:0;
-}
-
-.qtheader {
- font-family: verdana,arial,helvetica,sans-serif;
-}
-
-.mutelink {
- color:black!important;
-}
-
-#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;
-}
-
-.author {
- float: right !important;
-}
-
-.quicktip h1 {
- font-size: 22px;
- margin-top: 0px;
-}
-
-.quicktip.aufruf {
- border-left: 3px solid #FF4000;
- color: #FF4000;
-}
diff --git a/public/css/settings.css b/public/css/settings.css
deleted file mode 100644
index 2b4e899346a087b9a87afdb0929334aee43e16cc..0000000000000000000000000000000000000000
--- a/public/css/settings.css
+++ /dev/null
@@ -1,44 +0,0 @@
-*{
-
-}
-
-label.select-label {
- margin-bottom: 0;
- margin-top: 10px;
-}
-
-select.form-control {
- width: 200px;
- margin-top: 10px;
-}
-
-div.checkbox a.glyphicon {
- margin-left: 5px;
- font-size: 12px;
-}
-
-a:hover {
- cursor: pointer;
-}
-
-.btn-danger {
- margin-top: 25px;
-}
-
-input.btn.btn-primary {
- margin-top: 25px;
- margin-right: 10px;
-}
-
-h3 {
- font-size: 20px;
-}
-
-.checkbox {
- margin-top: 5px;
- margin-bottom: 5px;
-}
-
-#lead {
- white-space: pre-wrap;
-}
\ No newline at end of file
diff --git a/public/css/sitesearch.css b/public/css/sitesearch.css
deleted file mode 100644
index 6f136ed0f51eda78045f4e35cf08322c141c98d7..0000000000000000000000000000000000000000
--- a/public/css/sitesearch.css
+++ /dev/null
@@ -1,68 +0,0 @@
-button.metager-searchbutton {
- height: 30px!important;
- width: 100px!important;
- border-left: 0px none;
- border-top-right-radius: 4px;
- border-bottom-right-radius: 4px;
- border-top-left-radius: 0px;
- border-bottom-left-radius: 0px;
- border: 1px solid #CCC!important;
- padding: 6px 12px!important;
- margin:0px;
- font-size: 14px;
- font-weight: normal;
- line-height: 1!important;
- white-space: nowrap;
- color: #555;
- text-align: center;
- background-color: #EEE!important;
-}
-
-main.mg-panel {
- text-align: left;
-}
-
-code {
- overflow-wrap: break-word;
- word-wrap: break-word;
-}
-
-.metager-searchinput {
- height: 30px;
- padding: 6px 12px;
- font-size: 14px;
- line-height: 1.42857;
- color: #555;
- background-color: #FFF;
- background-image: none;
- border: 1px solid #CCC;
- border-right: 0px none;
- border-radius: 4px;
- border-top-right-radius: 0px;
- border-bottom-right-radius: 0px;
- margin:0px;
-}
-.metager-searchbutton {
- height: 30px;
- border-left: 0px none;
- border-top-right-radius: 4px;
- border-bottom-right-radius: 4px;
- border-top-left-radius: 0px;
- border-bottom-left-radius: 0px;
- border: 1px solid #CCC;
- padding: 6px 12px;
- margin:0px;
- font-size: 14px;
- font-weight: normal;
- line-height: 1;
- white-space: nowrap;
- color: #555;
- text-align: center;
- background-color: #EEE;
-}
-.metager-logo {
- height: 30px;
- float: left;
- top:-2px;
- margin-right: 3px;
-}
\ No newline at end of file
diff --git a/public/css/style.css b/public/css/style.css
index a2b453212f45cd3d71d3982f65bb544a8a9ae13d..a92aca55a71c4d25c19b6915e736c382adc4d14d 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -3,8 +3,9 @@
}
.mg-panel {
+ text-align: left;
margin: 0 auto;
- margin-top: 7%;
+ margin-top: 20px;
padding: 10px 20px;
margin-bottom: 0;
background-color: white;
@@ -154,4 +155,421 @@ header {
z-index: 500;
width: 100%;
height: 50px;
+}
+
+.dotlist {
+ list-style-type: disc;
+ text-align: left;
+}
+
+.dotlist li {
+ margin-bottom: 5px;
+}
+
+.well-sm {
+ margin: 10px 0px;
+}
+
+address {
+ white-space: pre;
+}
+
+.subheading {
+ font-size: 20px;
+ margin: 20px 0px;
+ white-space: pre-wrap;
+}
+
+p {
+ white-space: pre-wrap;
+}
+
+form {
+ margin: 10px 0px;
+}
+
+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;
+}
+
+.bitcoins {
+ text-align: center;
+}
+
+div#left {
+ padding-right: 35px;
+}
+
+.bold {
+ font-weight: bold;
+}
+
+code {
+ white-space: pre-wrap;
+ word-break: break-word;
+}
+
+form.contact {
+ max-width: 500px;
+}
+
+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;
+ background-color: #FFF;
+ background-image: none;
+ border: 1px solid #CCC;
+ border-right: 0px none;
+ border-radius: 4px;
+ border-top-right-radius: 0px;
+ border-bottom-right-radius: 0px;
+ margin: 0px;
+}
+
+.metager-searchbutton {
+ height: 30px;
+ width: 100px;
+ border-left: 0px none;
+ border-top-right-radius: 4px;
+ border-bottom-right-radius: 4px;
+ border-top-left-radius: 0px;
+ border-bottom-left-radius: 0px;
+ border: 1px solid #CCC;
+ padding: 6px 12px;
+ margin: 0px;
+ font-size: 14px;
+ font-weight: normal;
+ line-height: 1;
+ white-space: nowrap;
+ color: #555;
+ text-align: center;
+ background-color: #EEE;
+}
+
+.metager-logo {
+ height: 30px;
+ float: left;
+ top: -2px;
+ 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;
+}
+
+.donation-form-group {
+ text-align: left;
+ font-size: 12px;
+}
+
+.beitritt-form-group {
+ text-align: left;
+}
+
+#color-chooser #standard {
+ background-color: rgb(255, 194, 107);
+}
+
+#color-chooser #standardHard {
+ background-color: rgb(255, 128, 0);
+}
+
+#color-chooser #green {
+ background-color: rgb(177, 226, 163);
+}
+
+#color-chooser #greenHard {
+ background-color: rgb(127, 175, 27);
+}
+
+#color-chooser #blue {
+ background-color: rgb(164, 192, 230);
+}
+
+#color-chooser #blueHard {
+ background-color: rgb(2, 93, 140);
+}
+
+#color-chooser #red {
+ background-color: rgb(255, 92, 92);
+}
+
+#color-chooser #redHard {
+ background-color: rgb(255, 0, 0);
+}
+
+#color-chooser #pink {
+ background-color: rgb(255, 196, 246);
+}
+
+#color-chooser #pinkHard {
+ background-color: rgb(254, 67, 101);
+}
+
+#color-chooser #black {
+ background-color: rgb(238, 238, 238);
+}
+
+#color-chooser #blackHard {
+ background-color: rgb(50, 50, 50);
+}
+
+#color-chooser {
+ padding: 0;
+}
+
+#color-chooser a {
+ display: block;
+ width: 50px;
+ height: 50px;
+}
+
+#color-chooser li {
+ width: 50px;
+ margin: 0;
+}
+
+#moreInformation {
+ box-shadow: none;
+ margin-top: 5%;
+ text-align: center;
+ -moz-box-shadow: none;
+}
+
+#moreInformation ul {
+ /* text-align: left; */
+ padding: 0;
+}
+
+#moreInformation ul li {
+ color: grey;
+}
+
+#moreInformation > div {
+ font-size: 15px;
+}
+
+#moreInformation h2 {
+ color: grey;
+ font-size: 25px;
+}
+
+#moreInformation a:hover {
+ text-decoration: underline;
+}
+
+#searchForm button {
+ width: 50px;
+ line-height: 100%;
+ height: 28px;
+ border: 0;
+ background-color: transparent;
+ padding: 0;
+}
+
+#mglogo {
+ width: 100%;
+ text-align: center;
+}
+
+#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;
+}
+
+#sponsors a {
+ font-size: 0.8em;
+}
+
+#sponsors h2 {
+ font-size: 1.5em!important;
+}
+
+#foki label > span {
+ margin-right: 5px;
+}
+
+#foki label span {
+ background-color: transparent;
+}
+
+#foki input {
+ visibility: hidden;
+}
+
+#foki input:checked + label {
+ font-weight: bold;
+ background-color: #e3e3e3;
+}
+
+#foki input + label {
+ border-radius: 4px;
+ padding: 7px 20px;
+ font-weight: normal;
+}
+
+#foki input + label:hover {
+ cursor: pointer;
+ background-color: #f6f6f6;
+}
+
+.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);
+}
+
+#anpassen-label a.content {
+ color: inherit;
+}
+
+.mutelink {
+ color: grey;
+}
+
+#plugin-modal ol > li {
+ margin-bottom: 5px;
+}
+
+.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;
+}
+
+.wikiqtextract {
+ font-family: Georgia, "Times New Roman", Palatino, Times, serif;
+}
+
+.wikiqtextract p {
+ margin-bottom: 0;
+}
+
+.qtheader {
+ font-family: verdana, arial, helvetica, sans-serif;
+}
+
+#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;
+}
+
+.author {
+ float: right !important;
+}
+
+.quicktip h1 {
+ font-size: 22px;
+ margin-top: 0px;
+}
+
+.quicktip.aufruf {
+ border-left: 3px solid #FF4000;
+ color: #FF4000;
+}
+
+.language-textarea {
+ resize: none;
+ overflow: hidden;
+}
+
+.language-name {
+ white-space: pre;
+}
+
+.kontakt-form-group {
+ text-align: left;
+ font-size: 14px;
}
\ No newline at end of file
diff --git a/public/css/team.css b/public/css/team.css
deleted file mode 100644
index 7264944f357e5a631a83fabbd55e3ab0aff162c1..0000000000000000000000000000000000000000
--- a/public/css/team.css
+++ /dev/null
@@ -1,4 +0,0 @@
-#teamList {
- list-style-type: disc;
- text-align: left;
-}
\ No newline at end of file
diff --git a/public/css/websearch.css b/public/css/websearch.css
deleted file mode 100644
index 2b96d29bf3a84bff6491a8f7d0756fda2f8f90ce..0000000000000000000000000000000000000000
--- a/public/css/websearch.css
+++ /dev/null
@@ -1,50 +0,0 @@
-main.mg-panel {
- text-align: left;
-}
-
-code {
- overflow-wrap: break-word;
- word-wrap: break-word;
-}
-
-.metager-searchinput {
- height: 30px;
- padding: 6px 12px;
- font-size: 14px;
- line-height: 1.42857;
- color: #555;
- background-color: #FFF;
- background-image: none;
- border: 1px solid #CCC;
- border-right: 0px none;
- border-radius: 4px;
- border-top-right-radius: 0px;
- border-bottom-right-radius: 0px;
- margin:0px;
-}
-
-.metager-searchbutton {
- height: 30px;
- border-left: 0px none;
- border-top-right-radius: 4px;
- border-bottom-right-radius: 4px;
- border-top-left-radius: 0px;
- border-bottom-left-radius: 0px;
- border: 1px solid #CCC;
- padding: 6px 12px;
- margin:0px;
- font-size: 14px;
- font-weight: normal;
- line-height: 1;
- white-space: nowrap;
- color: #555;
- text-align: center;
- background-color: #EEE;
-}
-
-.metager-logo {
- height: 30px;
- float: left;
- top:-2px;
- margin-right: 3px;
-}
\ No newline at end of file
diff --git a/public/css/welcome.css b/public/css/welcome.css
deleted file mode 100644
index ba69802a283394b6b19577df300767800c327af6..0000000000000000000000000000000000000000
--- a/public/css/welcome.css
+++ /dev/null
@@ -1,27 +0,0 @@
-html, body {
- height: 100%;
-}
-
-body {
- margin: 0;
- padding: 0;
- width: 100%;
- display: table;
- font-weight: 100;
- font-family: 'Lato';
-}
-
-.container {
- text-align: center;
- display: table-cell;
- vertical-align: middle;
-}
-
-.content {
- text-align: center;
- display: inline-block;
-}
-
-.title {
- font-size: 96px;
-}
diff --git a/public/css/widget.css b/public/css/widget.css
deleted file mode 100644
index 0d758cb6344212cbc4aff2eef62b1b99a42271fa..0000000000000000000000000000000000000000
--- a/public/css/widget.css
+++ /dev/null
@@ -1,3 +0,0 @@
-p {
- white-space: pre-wrap;
-}
\ No newline at end of file
diff --git a/resources/lang/de/503.php b/resources/lang/de/503.php
new file mode 100644
index 0000000000000000000000000000000000000000..ec37a61885755e4023f3477abe3f8c6c415fcf4b
--- /dev/null
+++ b/resources/lang/de/503.php
@@ -0,0 +1,7 @@
+<?php
+
+return [
+ 'title' => 'Service nicht verfügbar',
+
+ 'text' => 'Sind gleich zurück.',
+];
diff --git a/resources/lang/de/datenschutz.php b/resources/lang/de/datenschutz.php
index ce363d6b6564da086b98d896dcd917bcd1e6b029..6d0303a95d3e0e3c912d80f60febcb3326d3c9bc 100644
--- a/resources/lang/de/datenschutz.php
+++ b/resources/lang/de/datenschutz.php
@@ -5,12 +5,7 @@ return [
'general.1' => 'Datenschutz und Privatsphäre gehören für uns zu den wichtigsten Gütern im Internet. Sie sind absolut schützenswert und dürfen keinesfalls kommerziell genutzt werden. Im Folgenden eine kurze Auflistung unserer Vorgehensweise. Eine ausführliche Darstellung mit Hintergrund-Informationen, warum wir die einzige wirklich sichere Suchmaschine betreiben, finden Sie <a href="https://suma-ev.de/presse/Sicher-suchen-UND-finden-mit-MetaGer.html">hier.</a>',
- 'general.3' => 'Nur Software, die frei und quellcode-offen ist, kann von jedem überprüft
-werden. In allen anderen Fällen müssen User GLAUBEN, was Betreiber oder
-"Gütesiegel"-Verkäufer behaupten. MetaGer ist Freie Software unter
-unter GNU-AGPLv3 Lizenz (siehe dazu Nachricht im Heise-Ticker:
-<a href="http://heise.de/-3295586" target="_blank">http://heise.de/-3295586</a>). Der MetaGer-Quellcode steht Ihnen unter folgendem Link zur Verfügung:
-<a href="https://gitlab.metager3.de/open-source/MetaGer" target="_blank">https://gitlab.metager3.de/open-source/MetaGer</a><br />Sie müssen uns nichts glauben: SIE können es selber kontrollieren!',
+ 'general.3' => 'Nur Software, die frei und quellcode-offen ist, kann von jedem überprüft werden. In allen anderen Fällen müssen User GLAUBEN, was Betreiber oder "Gütesiegel"-Verkäufer behaupten. MetaGer ist Freie Software unter unter GNU-AGPLv3 Lizenz (siehe dazu Nachricht im Heise-Ticker: <a href="http://heise.de/-3295586" target="_blank">http://heise.de/-3295586</a>). Der MetaGer-Quellcode steht Ihnen unter folgendem Link zur Verfügung: <a href="https://gitlab.metager3.de/open-source/MetaGer" target="_blank">https://gitlab.metager3.de/open-source/MetaGer</a><br />Sie müssen uns nichts glauben: SIE können es selber kontrollieren!',
'policy.1' => 'Unsere Vorgehensweise/Policy:',
'policy.2' => 'Wir speichern weder Ihre IP-Adresse, noch den
diff --git a/resources/lang/de/impressum.php b/resources/lang/de/impressum.php
index 5186861b7fd94160a85b3285510bf792026af48a..c7f97281564a93a73fd94f99854ff76925c9910e 100644
--- a/resources/lang/de/impressum.php
+++ b/resources/lang/de/impressum.php
@@ -3,8 +3,8 @@
return [
'title' => 'Impressum',
- 'headline.1' => '<a href="http://suma-ev.de/" target="_blank">SUMA-EV - Verein für freien Wissenszugang (e.V.)</a>',
- 'headline.2' => 'in Kooperation mit der <a href="http://www.uni-hannover.de/" target="_blank">Leibniz Universität Hannover</a>',
+ 'headline.1' => '<a href="http://suma-ev.de/" target="_blank">SUMA-EV - Verein für freien Wissenszugang (e.V.)</a>
+in Kooperation mit der <a href="http://www.uni-hannover.de/" target="_blank">Leibniz Universität Hannover</a>',
'info.1' => 'Wikipedia-Eintrag zum <a href="http://de.wikipedia.org/wiki/Suma_e.V." target="_blank">SUMA-EV</a>',
'info.2' => 'SUMA-EV
diff --git a/resources/views/about.blade.php b/resources/views/about.blade.php
index ab2ab73269e52f9f72c5a07af0cd7dccdc3c7e2b..8ed87a83c5b517f1a7bc267f0b87644d5376a747 100644
--- a/resources/views/about.blade.php
+++ b/resources/views/about.blade.php
@@ -5,7 +5,7 @@
@section('content')
<h1>{{ trans('about.head.1') }}</h1>
<h3>{{ trans('about.head.2') }}</h3>
-<ul id="about-list">
+<ul class="dotlist">
<li>{!! trans('about.list.1') !!}</li>
<li>{!! trans('about.list.2') !!}</li>
<li>{!! trans('about.list.3') !!}</li>
diff --git a/resources/views/datenschutz.blade.php b/resources/views/datenschutz.blade.php
index 3fcc269b0a382df8b88b8218250281097622edce..433dc513b63d84c96db4b086defe02eac4bd355a 100644
--- a/resources/views/datenschutz.blade.php
+++ b/resources/views/datenschutz.blade.php
@@ -9,7 +9,7 @@
<p>{!! trans('datenschutz.general.1') !!}</a></p>
<p>{!! trans('datenschutz.general.3') !!}</p>
<h2>{!! trans('datenschutz.policy.1') !!}</h2>
-<ul id="privacyList">
+<ul class="dotlist">
<li>{!! trans('datenschutz.policy.2') !!}</li>
<li>{!! trans('datenschutz.policy.5') !!}</li>
<li>{!! trans('datenschutz.policy.6') !!}</li>
diff --git a/resources/views/errors/503.blade.php b/resources/views/errors/503.blade.php
index 625330e0841981bcd9efcab75abafe3d55d10b3b..ff23ed8829e9744e419f5094a45b6faced44725a 100644
--- a/resources/views/errors/503.blade.php
+++ b/resources/views/errors/503.blade.php
@@ -1,15 +1,11 @@
-<!DOCTYPE html>
-<html>
- <head>
- <title>Be right back.</title>
- <link href="https://fonts.googleapis.com/css?family=Lato:100" rel="stylesheet" type="text/css">
- <link rel="stylesheet" type="text/css" href="/css/503.css" />
- </head>
- <body>
- <div class="container">
- <div class="content">
- <div class="title">Be right back.</div>
- </div>
- </div>
- </body>
-</html>
+@extends('layouts.subPages')
+
+@section('title', 'Fehler 500 - Service nicht verfügbar')
+
+@section('content')
+<h1>{{ trans('503.title') }}</h1>
+<p>{{ trans('503.text') }}</p>
+@if( config('app.debug') )
+<pre>{{ $exception }}</pre>
+@endif
+@endsection
diff --git a/resources/views/hilfe.blade.php b/resources/views/hilfe.blade.php
index e3c4e369d086819dd97b0e7fffae7218a5b1f1e3..90dbb4913f2914075c07488895b87dcb6c018050 100644
--- a/resources/views/hilfe.blade.php
+++ b/resources/views/hilfe.blade.php
@@ -7,7 +7,7 @@
<h1>{!! trans('hilfe.title') !!}</h1>
<h2>{!! trans('hilfe.einstellungen') !!}</h2>
<h3>{!! trans('hilfe.allgemein.title') !!}</h3>
-<ul>
+<ul class="dotlist">
<li>{!! trans('hilfe.allgemein.1') !!}</li>
<li>{!! trans('hilfe.allgemein.2') !!}</li>
<li>{!! trans('hilfe.allgemein.3') !!}</li>
@@ -17,17 +17,17 @@
<h2>{!! trans('hilfe.sucheingabe') !!}</h2>
<h3>{!! trans('hilfe.stopworte.title') !!}</h3>
<p>{!! trans('hilfe.stopworte.1') !!}</p>
-<ul>
+<ul class="dotlist">
<li>{!! trans('hilfe.stopworte.2') !!}</li>
</ul>
<h3>{!! trans('hilfe.mehrwortsuche.title') !!}</h3>
<p>{!! trans('hilfe.mehrwortsuche.1') !!}</p>
-<ul>
+<ul class="dotlist">
<li>{!! trans('hilfe.mehrwortsuche.2') !!}</li>
</ul>
<h3>{!! trans('hilfe.grossklein.title') !!}</h3>
<p>{!! trans('hilfe.grossklein.1') !!}</p>
-<ul>
+<ul class="dotlist">
<li>{!! trans('hilfe.grossklein.2') !!}</li>
</ul>
<h2>{!! trans('hilfe.dienste') !!}</h2>
diff --git a/resources/views/impressum.blade.php b/resources/views/impressum.blade.php
index 41c5c2e8259b9a548b9f250601871ae5336b4f66..b3dbb4ea38d82829cabedba8ac33950919b4d7ca 100644
--- a/resources/views/impressum.blade.php
+++ b/resources/views/impressum.blade.php
@@ -4,8 +4,8 @@
@section('content')
<h1>{!! trans('impressum.title') !!}</h1>
-<h2>{!! trans('impressum.headline.1') !!}</h2>
-<h2>{!! trans('impressum.headline.2') !!}</h2>
+<h2 class="subheading">{!! trans('impressum.headline.1') !!}
+</h2>
<p>{!! trans('impressum.info.1') !!}</p>
<address>{!! trans('impressum.info.2') !!}</address>
<address>{!! trans('impressum.info.3') !!}</address>
diff --git a/resources/views/kontakt/kontakt.blade.php b/resources/views/kontakt/kontakt.blade.php
index dc9dfad1018ab24e9447a15e6c86f139943cf837..522264769ca1df9010725da15b28d974a68ee84f 100644
--- a/resources/views/kontakt/kontakt.blade.php
+++ b/resources/views/kontakt/kontakt.blade.php
@@ -13,11 +13,11 @@
<p class="bold">{!! trans('kontakt.form.4') !!}</p>
<form class="contact" name="contact" method="post" action="{{ LaravelLocalization::getLocalizedURL() }}">
{{ csrf_field() }}
- <div class="form-group">
+ <div class="form-group kontakt-form-group">
<input class="form-control" name="email" placeholder="{!! trans('kontakt.form.5') !!}" type="text"></div>
- <div class="form-group">
+ <div class="form-group kontakt-form-group">
<textarea class="form-control" id="message" name="message" placeholder="{!! trans('kontakt.form.6') !!}"></textarea></div>
- <div class="form-group">
+ <div class="form-group kontakt-form-group">
<p><span class="bold">{!! trans('kontakt.form.7') !!} <a href="http://openpgpjs.org/.">OpenPGP.js</a> {!! trans('kontakt.form.8') !!}</span>
<span>{!! trans('kontakt.form.9') !!}</span></p>
<button title="" data-original-title="" class="btn btn-default" type="submit">{!! trans('kontakt.form.10') !!}</button></div></form>
@@ -89,5 +89,5 @@ geiG3j1J/CaDBZqPBaBflK0UWR5nxCsoOk7i5f3isUeXSVLTnA+K9HkQ6D/Gt5vx
-----END PGP PUBLIC KEY BLOCK-----</textarea>
<h2>{!! trans('kontakt.letter.1') !!}</h2>
<p>{!! trans('kontakt.letter.2') !!}</p>
-<adress>{!! trans('kontakt.letter.3') !!}</adress>
+<address>{!! trans('kontakt.letter.3') !!}</address>
@endsection
diff --git a/resources/views/languages/edit.blade.php b/resources/views/languages/edit.blade.php
index 320ce862fad14e34cd9f6366ee8ec91597fd588b..aa070e0224891adb2016d696e67070d5d15e02ee 100644
--- a/resources/views/languages/edit.blade.php
+++ b/resources/views/languages/edit.blade.php
@@ -30,14 +30,14 @@
@foreach($texts as $name => $langValues)
@if($langValues === "")
<tr>
- <td class="name">{{preg_replace("/(\s*).*#(.*)$/si", "$1$2", $name)}}</td>
+ <td class="name language-name">{{preg_replace("/(\s*).*#(.*)$/si", "$1$2", $name)}}</td>
<td></td>
<td></td>
</tr>
@else
<tr>
- <td class="name">{{preg_replace("/(\s*).*#(.*)$/si", "$1$2", $name)}}</td>
- <td>@if(isset($langValues[$to])) <textarea type="text" rows="1" cols="50" form="submit" name="{{ base64_encode($name) }}" readonly >{{$langValues[$to]}}</textarea> @else <textarea rows="1" cols="50" form="submit" name="{{base64_encode("_new_" . $name)}}" ></textarea> @endif</td>
+ <td class="name language-name">{{preg_replace("/(\s*).*#(.*)$/si", "$1$2", $name)}}</td>
+ <td>@if(isset($langValues[$to])) <textarea class="language-text-area" type="text" rows="1" cols="50" form="submit" name="{{ base64_encode($name) }}" readonly >{{$langValues[$to]}}</textarea> @else <textarea class="language-text-area" rows="1" cols="50" form="submit" name="{{base64_encode("_new_" . $name)}}" ></textarea> @endif</td>
@foreach($langs as $lang => $value)
<td>{!! $langValues[$lang] or "" !!}</td>
@endforeach
diff --git a/resources/views/quicktip.blade.php b/resources/views/quicktip.blade.php
index 7099af58040c57804551a3421a1fa09c83cf6343..892d2bc0afa71be0fd6a6dd9f581d8c7f316fc10 100644
--- a/resources/views/quicktip.blade.php
+++ b/resources/views/quicktip.blade.php
@@ -2,7 +2,7 @@
<head>
<title>{!! trans('quicktip.title') !!}</title>
<link rel="stylesheet" type="text/css" href="/css/bootstrap.css" />
- <link rel="stylesheet" type="text/css" href="/css/quicktips.css" />
+ <link rel="stylesheet" type="text/css" href="/css/style.css" />
</head>
<body>
@if( $spruch !== "" )
diff --git a/resources/views/settings.blade.php b/resources/views/settings.blade.php
index 492de42a3e6ed84b6533cdb67b8881d4733eecde..d4101df50366e6c18ef07c746f7b73b7a813f5c7 100644
--- a/resources/views/settings.blade.php
+++ b/resources/views/settings.blade.php
@@ -8,40 +8,40 @@
<p id="lead">{!! trans('settings.head.2') !!}</p>
<h2>{!! trans('settings.allgemein.1') !!}</h2>
<input type="hidden" name="focus" value="angepasst">
- <div class="checkbox">
+ <div class="checkbox settings-checkbox">
<label><input type="checkbox" name="param_sprueche">{!! trans('settings.allgemein.2') !!}</label>
</div>
- <div class="checkbox">
+ <div class="checkbox settings-checkbox">
<label><input type="checkbox" name="param_tab">{!! trans('settings.allgemein.3') !!}</label>
</div>
<label class="select-label">{!! trans('settings.allgemein.4') !!}</label>
- <select class="form-control" name="param_lang">
+ <select class="form-control settings-form-control" name="param_lang">
<option value="all" @if(App::isLocale('de')) selected @endif >{!! trans('settings.allgemein.5') !!}</option>
<option value="de">{!! trans('settings.allgemein.6') !!}</option>
<option value="en" @if(App::isLocale('en')) selected @endif>{!! trans('settings.allgemein.6_1') !!}</option></select>
<label class="select-label">{!! trans('settings.allgemein.7') !!}</label>
- <select class="form-control" name="param_resultCount">
+ <select class="form-control settings-form-control" name="param_resultCount">
<option value="10">10</option>
<option value="20" selected>20</option>
<option value="50">50</option>
<option value="100">100</option>
<option value="0">{!! trans('settings.allgemein.8') !!}</option></select>
<label class="select-label">{!! trans('settings.zeit.1') !!}:</label>
- <select class="form-control" name="param_time">
+ <select class="form-control settings-form-control" name="param_time">
<option value="1000" selected>{!! trans('settings.zeit.2') !!}</option>
<option value="2000">{!! trans('settings.zeit.3') !!}</option>
<option value="5000">{!! trans('settings.zeit.4') !!}</option>
<option value="10000">{!! trans('settings.zeit.5') !!}</option>
<option value="20000">{!! trans('settings.zeit.6') !!}</option></select>
<label class="select-label">{{ trans('settings.request') }}:</label>
- <select class="form-control" name="request">
+ <select class="form-control settings-form-control" name="request">
<option value="GET" selected>GET</option>
<option value="POST">POST</option>
</select>
<h2>{!! trans('settings.suchmaschinen.1') !!} <small><a class="allUnchecker">{!! trans('settings.suchmaschinen.2') !!}</a></small></h2>
@foreach( $foki as $fokus => $sumas )
<div class="headingGroup {{ $fokus }}">
- <h3>
+ <h3 class="fokus-category">
{{ ucfirst($fokus) }}
<small>
<a class="checker" data-type="{{ $fokus }}">{!! trans('settings.suchmaschinen.3') !!}</a>
@@ -50,20 +50,20 @@
<div class="row">
@foreach( $sumas as $name => $data )
<div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox">
+ <div class="checkbox settings-checkbox">
<label>
<input name="param_{{ $name }}" class="focusCheckbox" type="checkbox" />{{ $data['displayName'] }}
</label>
- <a class="glyphicon glyphicon-link" target="_blank" href="{{ $data['url'] }}"></a>
+ <a class="glyphicon settings-glyphicon glyphicon-link" target="_blank" href="{{ $data['url'] }}"></a>
</div>
</div>
@endforeach
</div>
</div>
@endforeach
- <input id="unten" type="submit" class="btn btn-primary" value="{!! trans('settings.speichern.1') !!}">
- <input type="button" class="btn btn-primary hidden" id="save" data-href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}" value="{!! trans('settings.speichern.2') !!}">
- <input id="plugin" type="submit" class="btn btn-primary" value="{!! trans('settings.speichern.3') !!}">
- <input type="button" class="btn btn-danger hidden" id="reset" value="{!! trans('settings.speichern.4') !!}">
+ <input id="unten" type="submit" class="btn btn-primary settings-btn" value="{!! trans('settings.speichern.1') !!}">
+ <input type="button" class="btn btn-primary settings-btn hidden" id="save" data-href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}" value="{!! trans('settings.speichern.2') !!}">
+ <input id="plugin" type="submit" class="btn btn-primary settings-btn" value="{!! trans('settings.speichern.3') !!}">
+ <input type="button" class="btn btn-danger settings-btn hidden" id="reset" value="{!! trans('settings.speichern.4') !!}">
</form>
@endsection
diff --git a/resources/views/spende/beitritt.blade.php b/resources/views/spende/beitritt.blade.php
index caace22896ac28595e6b3c3a306d6c063f911c00..0cbfa048c282f0cd9bc013243c664815cf44ebf4 100644
--- a/resources/views/spende/beitritt.blade.php
+++ b/resources/views/spende/beitritt.blade.php
@@ -7,35 +7,35 @@
@section('content')
<h1>SUMA-EV Beitrittserklärung</h1>
<form>
- <div class="form-group">
+ <div class="form-group beitritt-form-group">
<label for="name" class="non-bold">Hiermit erkläre ich,</label>
<input type="text" class="form-control" name="name" placeholder="Name, Vorname" required/>
</div>
- <div class="form-group">
+ <div class="form-group beitritt-form-group">
<label for="firma" class="non-bold">für die Firma:</label>
<input type="text" class="form-control" name="firma" placeholder="Diese Zeile nur beim Beitritt von Firmen ausfüllen" />
</div>
- <div class="form-group">
+ <div class="form-group beitritt-form-group">
<label for="funktion" class="non-bold">Funktion:</label>
<input type="text" class="form-control" name="funktion" placeholder="hier ggf. wenn Sie wollen oder beim Firmenbeitritt: Ihren Beruf/Funktion" />
</div>
- <div class="form-group">
+ <div class="form-group beitritt-form-group">
<label for="adresse" class="non-bold">Adresse:</label>
<input type="text" class="form-control" name="adresse" placeholder="Straße Hausnummer, Postleitzahl, Ort" required/>
</div>
- <div class="form-group">
+ <div class="form-group beitritt-form-group">
<label for="email" class="non-bold">E-Mail-Adresse:</label>
<input type="email" class="form-control" name="email" placeholder=""/>
</div>
- <div class="form-group">
+ <div class="form-group beitritt-form-group">
<label for="homepage" class="non-bold">Web-Adresse:</label>
<input type="text" class="form-control" name="homepage" placeholder="http://"/>
</div>
- <div class="form-group">
+ <div class="form-group beitritt-form-group">
<label for="telefon" class="non-bold">Telefon:</label>
<input type="text" class="form-control" name="telefon" placeholder="Festnetz und ggf. Handy"/>
</div>
- <div class="form-group">
+ <div class="form-group beitritt-form-group">
<label class="non-bold" for="betrag">dass ich dem "SUMA-EV - Verein für freien Wissenszugang" beitreten will. Ich habe die Satzung zur Kenntnis genommen und stimme mit den Zielen des Vereins überein. Der Mindestbeitrag für Einzelmitglieder und Privatpersonen beträgt 5,-EUR pro Monat, Schüler und Studenten die Hälfte; für Firmen, Institutionen und Einrichtungen 5,- EUR pro Monat und Mitarbeiter, bei Firmen ab 20 Mitarbeitern pauschal 100,- EUR pro Monat, bei Firmen ab 200 Mitarbeitern pauschal 200,- EUR pro Monat. Als Mitgliedsbeitrag wähle ich: </label>
<div class="row">
<div class="col-xs-2">
@@ -68,47 +68,43 @@
</div>
</div>
</div>
- <div class="form-group">
+ <div class="form-group beitritt-form-group">
<label for="ort">Ort, Datum:</label>
<input type="text" class="form-control" id="ort" placeholder=""/>
</div>
<br />
- <p class="sign">
- ---------------------------------------------------------<br />
- Unterschrift nach Ausdrucken des Formulars
- </p>
+ <p class="sign">---------------------------------------------------------
+Unterschrift nach Ausdrucken des Formulars</p>
<h3>Abbuchungsermächtigung</h3>
<p>Hiermit ermächtige ich den "SUMA-EV - Verein für freien Wissenszugang" den o.g. Mitgliedsbeitrag von meinem Konto abzubuchen. </p>
- <div class="form-group">
+ <div class="form-group beitritt-form-group">
<label for="kontoname" class="non-bold">Name des Kontoinhabers:</label>
<input type="text" class="form-control" name="kontoname" placeholder=""/>
</div>
- <div class="form-group">
+ <div class="form-group beitritt-form-group">
<label for="bankverbindung" class="non-bold">Bankverbindung, Name der Bank:</label>
<input type="text" class="form-control" name="bankverbindung" placeholder=""/>
</div>
- <div class="form-group">
+ <div class="form-group beitritt-form-group">
<label for="iban" class="non-bold">IBAN (oder Konto-Nummer)</label>
<input type="text" class="form-control" name="iban" placeholder=""/>
</div>
- <div class="form-group">
+ <div class="form-group beitritt-form-group">
<label for="bic" class="non-bold">BIC (oder Bankleitzahl)</label>
<input type="text" class="form-control" name="bic" placeholder=""/>
</div>
- <div class="form-group">
+ <div class="form-group beitritt-form-group">
<label for="ort2" class="non-bold">Ort, Datum:</label>
<input type="text" class="form-control" id="ort2" placeholder=""/>
</div>
<br />
- <p class="sign">
- ---------------------------------------------------------<br />
- Unterschrift nach Ausdrucken des Formulars
- </p>
+ <p class="sign">---------------------------------------------------------
+Unterschrift nach Ausdrucken des Formulars</p>
</form>
<hr />
<p>Bitte drucken Sie das Formular nach Ausfüllen aus und unterschreiben an beiden ......... Linien; dann können Sie es</p>
-<ul>
+<ul class="dotlist">
<li>faxen an 0511 34 00 10 23 (und schicken uns eine kurze EMail dazu, dass Sie das Beitrittsformular gefaxt haben, denn Faxgeräte sind manchmal inkompatibel) oder </li>
<li>per Post senden an: SUMA-EV, Röselerstr. 3, 30159 Hannover oder </li>
<li>einscannen und an office@suma-ev.de mailen. </li>
diff --git a/resources/views/spende/spende.blade.php b/resources/views/spende/spende.blade.php
index 9ac708596d3ffafa8ffd9980392dc37cfa030f53..7d99121f38e772cba4b46087496590fc4d4eeb41 100644
--- a/resources/views/spende/spende.blade.php
+++ b/resources/views/spende/spende.blade.php
@@ -6,15 +6,15 @@
@section('content')
<h1>{!! trans('spenden.headline.1') !!}</h1>
-<h2>{!! trans('spenden.headline.2') !!}</h2>
+<h2 class="subheading">{!! trans('spenden.headline.2') !!}</h2>
<div class="col">
<div id="left" class="col-lg-6 col-md-12 col-sm-12 others">
- <h2>{!! trans('spenden.bankinfo.1') !!}</h2>
+ <h3>{!! trans('spenden.bankinfo.1') !!}</h3>
<p>{!! trans('spenden.bankinfo.2') !!}</p>
<p class="text-muted">{!! trans('spenden.bankinfo.3') !!}</p>
<hr>
- <div class="col-lg-6 col-md-12 col-sm-12 others ppbc">
- <h2>{!! trans('spenden.logos.1') !!}</h2>
+ <div class="col-lg-6 col-md-12 col-sm-12 others bitcoins">
+ <h3>{!! trans('spenden.logos.1') !!}</h3>
<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
<input name="cmd" value="_xclick" type="hidden">
<input name="business" value="wsb@suma-ev.de" type="hidden">
@@ -32,38 +32,38 @@
<input src="/img/paypalspenden.gif" name="submit" width="120px" alt="Spenden Sie mit PayPal - schnell, kostenlos und sicher!" type="image">
</form>
</div>
- <div class="col-lg-6 col-md-12 col-sm-12 others ppbc">
- <h2>{!! trans('spenden.logos.2') !!}</h2>
+ <div class="col-lg-6 col-md-12 col-sm-12 others bitcoins">
+ <h3>{!! trans('spenden.logos.2') !!}</h3>
{!! trans('spenden.bitcoins') !!}<br/>
<a href="bitcoin:174SDRNZqM2WNobHhCDqD1VXbnZYFXNf8V">174SDRNZqM2WNobHhCDqD1VXbnZYFXNf8V</a>
</div>
<div class="clearfix"></div>
<hr>
- <h2 id="lastschrift">{!! trans('spenden.lastschrift.1') !!}</h2>
+ <h3 id="lastschrift">{!! trans('spenden.lastschrift.1') !!}</h3>
<p>{!! trans('spenden.lastschrift.2') !!}</p>
<form role="form" method="POST">
{{ csrf_field() }}
- <div class="form-group">
+ <div class="form-group donation-form-group">
<label for="Name">{!! trans('spenden.lastschrift.3') !!}</label>
<input type="text" class="form-control" id="Name" required="" name="Name" placeholder="{!! trans('spenden.lastschrift.3.placeholder') !!}">
</div>
- <div class="form-group">
+ <div class="form-group donation-form-group">
<label for="email">{!! trans('spenden.lastschrift.4') !!}</label>
<input type="email" class="form-control" id="email" name="email" placeholder="Email">
</div>
- <div class="form-group">
+ <div class="form-group donation-form-group">
<label for="tel">{!! trans('spenden.lastschrift.5') !!}</label>
<input type="tel" class="form-control" id="tel" name="Telefon" placeholder="xxxx-xxxxx">
</div>
- <div class="form-group">
+ <div class="form-group donation-form-group">
<label for="iban">{!! trans('spenden.lastschrift.6') !!}</label>
<input type="text" class="form-control" id="iban" required="" name="Kontonummer" placeholder="IBAN">
</div>
- <div class="form-group">
+ <div class="form-group donation-form-group">
<label for="bic">{!! trans('spenden.lastschrift.7') !!}</label>
<input type="text" class="form-control" id="bic" required="" name="Bankleitzahl" placeholder="BIC">
</div>
- <div class="form-group">
+ <div class="form-group donation-form-group">
<label for="msg">{!! trans('spenden.lastschrift.8') !!}</label>
<textarea class="form-control" id="msg" required="" name="Nachricht" placeholder="{!! trans('spenden.lastschrift.8.placeholder') !!}"></textarea>
</div>
@@ -72,7 +72,7 @@
<p>{!! trans('spenden.lastschrift.10') !!}</p>
</div>
<div class="col-lg-6 col-md-12 col-sm-12 others" id="right">
- <h2>{!! trans('spenden.about.1') !!}</h2>
+ <h3>{!! trans('spenden.about.1') !!}</h3>
<p>{!! trans('spenden.about.2') !!}</p>
<p>{!! trans('spenden.about.3') !!}</p>
<p>{!! trans('spenden.about.4') !!}</p>
diff --git a/resources/views/team/team.blade.php b/resources/views/team/team.blade.php
index 085f6c4b604b2dd61f68c48c090ce02ac07331c1..a35809316ff8fc3fdd358c314ab4a8a07e6c7d8c 100644
--- a/resources/views/team/team.blade.php
+++ b/resources/views/team/team.blade.php
@@ -4,7 +4,7 @@
@section('content')
<h1>Team</h1>
- <ul id="teamList">
+ <ul class="dotlist">
<li>
<a href="https://de.wikipedia.org/wiki/Wolfgang_Sander-Beuermann" target="_blank">Sander-Beuermann, Wolfgang</a>, Dr.-Ing. - {!! trans('team.role.1') !!} -
<a href="mailto:wsb@suma-ev.de">wsb@suma-ev.de</a> -
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
deleted file mode 100644
index a1e35389e3ad307a316494f810b421c2b6ee10af..0000000000000000000000000000000000000000
--- a/resources/views/welcome.blade.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
- <title>Laravel</title>
- <link href="https://fonts.googleapis.com/css?family=Lato:100" rel="stylesheet" type="text/css">
- <link rel="stylesheet" type="text/css" href="/css/welcome.css" />
- </head>
- <body>
- <div class="container">
- <div class="content">
- <div class="title">Laravel 5</div>
- </div>
- </div>
- </body>
-</html>