Skip to content
GitLab
Commit a8b5fd07 authored by Phil Höfer's avatar Phil Höfer
Browse files

Merge branch '226-css-dateien-uberarbeiten' into 'development' 

Die CSS-Dateien sind jetzt fast komplett zu einer Datei zusammengefasst.

Im nächsten Schritt muss noch versucht werden allgemeinere Regeln zu finden.
Die Funktionalität sollte nicht beeinträchtigt worden sein.

See merge request !432
parents 51e1011b e405c2e8
Hide whitespace changes
Inline Side-by-side
app/Http/Controllers/StartpageController.php
View file @ a8b5fd07
......@@ -154,7 +154,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));
......
app/Http/routes.php
View file @ a8b5fd07
......@@ -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');
});
......
public/css/503.css deleted 100644 → 0
View file @ 51e1011b
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;
}
public/css/about.css deleted 100644 → 0
View file @ 51e1011b
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
public/css/beitritt.css
View file @ a8b5fd07
.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;
}
......
public/css/danke.css deleted 100644 → 0
View file @ 51e1011b
@media print {
.noprint {
display: none!important;
}
}
\ No newline at end of file
public/css/donation.css deleted 100644 → 0
View file @ 51e1011b
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
public/css/editLanguage.css deleted 100644 → 0
View file @ 51e1011b
td.name {
white-space: pre;
}
textarea {
resize: none;
overflow: hidden;
}
\ No newline at end of file
public/css/help.css deleted 100644 → 0
View file @ 51e1011b
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
public/css/impressum.css deleted 100644 → 0
View file @ 51e1011b
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
public/css/index.css deleted 100644 → 0
View file @ 51e1011b
#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
public/css/kontakt.css deleted 100644 → 0
View file @ 51e1011b
*{
}
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
public/css/privacy.css deleted 100644 → 0
View file @ 51e1011b
*{
}
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
public/css/quicktips.css deleted 100644 → 0
View file @ 51e1011b
.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;
}
public/css/settings.css deleted 100644 → 0
View file @ 51e1011b
*{
}
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