diff --git a/app/Http/Controllers/StartpageController.php b/app/Http/Controllers/StartpageController.php index 1aef59d0b2d73c935892120752d711171fc1b4b8..01efe30fcfda9b1bcc86619642e6f0b3d96f6806 100644 --- a/app/Http/Controllers/StartpageController.php +++ b/app/Http/Controllers/StartpageController.php @@ -47,8 +47,8 @@ class StartpageController extends Controller ->with('tab', $request->input('param_tab', 'off')) ->with('focusPages', $focusPages) ->with('browser', $browser) - ->with('navbarFocus', 'suche'); - + ->with('navbarFocus', 'suche') + ->with('css', 'index.css'); } public function loadPage($subpage) diff --git a/public/css/beitritt.css b/public/css/beitritt.css index eeb540395c67b3b243b3320a086748832f52bff6..18db3ed67fee9f2eead752a882f1d7802ed7996c 100644 --- a/public/css/beitritt.css +++ b/public/css/beitritt.css @@ -1,29 +1,47 @@ -.form-group{ - text-align: left; +.form-group { + text-align: left; } -label.non-bold{ - font-weight: normal; - font-size: 16px; +label.non-bold { + font-weight: normal; + font-size: 16px; } -ul{ - list-style-type: initial!important; - text-align: left!important; +ul { + list-style-type: initial!important; + text-align: left!important; } -hr{ - margin: 10px 0!important; +hr { + margin: 10px 0!important; } -@media print -{ - .noprint {display:none!important;} - #spendenaufruf{display:none!important;} - footer{display:none!important;} - .wrapper{padding-top:0!important;} - *{font-size:12px!important;} - input[type=text], input[type=email]{padding:0!important;height:initial!important;border:0;} - h1{margin-top: 0!important; padding-top:0!important;} - .form-group{margin-bottom:10px!important;} -} +@media print { + .noprint { + display: none!important; + } + #spendenaufruf { + display: none!important; + } + footer { + display: none!important; + } + .wrapper { + padding-top: 0!important; + } + * { + font-size: 12px!important; + } + input[type=text], input[type=email] { + padding: 0!important; + height: initial!important; + border: 0; + } + h1 { + margin-top: 0!important; + padding-top: 0!important; + } + .form-group { + margin-bottom: 10px!important; + } +} \ No newline at end of file diff --git a/public/css/donation.css b/public/css/donation.css index 2ffaf92369eb648b3b197759270d8dc7ce1e2c80..8ef5bfc7a0be3924fb11157a47c040115347ec33 100644 --- a/public/css/donation.css +++ b/public/css/donation.css @@ -1,10 +1,3 @@ -* { - -} - -.clearfix { -} - div#right { background-color: #FFDCC1; border-radius: 5px; @@ -30,8 +23,7 @@ button.btn.btn-default { font-size: 12px; } -.others { -} +.others {} div#left { padding-right: 35px; @@ -77,17 +69,14 @@ address { white-space: pre; } -accountdata { +accountdata { white-space: pre; } -donationReceipt { +donationReceipt { white-space: pre; } -right{ - - background-color: #FFDCC1; - -} - +right { + background-color: #FFDCC1; +} \ No newline at end of file diff --git a/public/css/help.css b/public/css/help.css index ad092dfed7560cf2135ce0a368d8155a73f39d9c..30a18ddf590c0112e8b5d234ab18f0e9051aeaee 100644 --- a/public/css/help.css +++ b/public/css/help.css @@ -1,16 +1,22 @@ -* {} +p { + white-space: pre-wrap; +} + +h1 { + margin-bottom: 25px; +} h3 { font-size: 21px; margin-bottom: 5px; } -p { - white-space: pre-wrap; +h1 + h2 { + margin-top: 0; } -h1 { - margin-bottom: 25px; +h2 + h3 { + margin-top: 0; } main { @@ -28,12 +34,4 @@ main ul { .well-sm { margin: 10px 0px; -} - -h1 + h2 { - margin-top: 0; -} - -h2 + h3 { - margin-top: 0; } \ No newline at end of file diff --git a/public/css/impressum.css b/public/css/impressum.css index 5f3a8661b6206e58653cf02205673750d480ab81..7bb3df619e9578dde7918671a95c15fedd3a77ea 100644 --- a/public/css/impressum.css +++ b/public/css/impressum.css @@ -1,28 +1,21 @@ -* { - -} - p { white-space: pre-wrap; + margin: 20px 0; } h1 { margin-bottom: 25px; } -p { - margin: 20px 0; +h2 { + font-size: 20px; + margin-top: 10px; } main { text-align: left; } -h2 { - font-size: 20px; - margin-top: 10px; -} - address { white-space: pre; } \ No newline at end of file diff --git a/public/css/index.css b/public/css/index.css new file mode 100644 index 0000000000000000000000000000000000000000..d0c104b3dbe681af2c61b878b9a0c7b236b319de --- /dev/null +++ b/public/css/index.css @@ -0,0 +1,176 @@ +#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/style.css b/public/css/style.css index 0a7aa04b0aca78801f491b25846bfe15ec556eff..a2b453212f45cd3d71d3982f65bb544a8a9ae13d 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -1,14 +1,16 @@ -*{ - font-family: Liberation Sans, sans-serif; -} - -#plugin-modal ol > li { - margin-bottom: 5px; +* { + font-family: Liberation Sans, sans-serif; } -.content.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); +.mg-panel { + margin: 0 auto; + margin-top: 7%; + 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); } label a { @@ -20,26 +22,10 @@ label a:hover { color: inherit; } -span.glyphicon.glyphicon-remove { - color: #333; -} - li#info { white-space: pre-line; } -div#sponsors a { - font-size: 0.8em; -} - -div#sponsors h2 { - font-size: 1.5em!important; -} - -#anpassen-label a.content { - color: inherit; -} - a.hidden-xs {} .navbar-default { @@ -47,26 +33,6 @@ a.hidden-xs {} border-radius: 0; } -head {} - -section#moreInformation h2 { - color: grey; - font-size: 25px; -} - -section#moreInformation ul { - /* text-align: left; */ - padding: 0; -} - -section#moreInformation a:hover { - text-decoration: underline; -} - -.mutelink { - color: grey; -} - .row { margin-left: 0; margin-right: 0; @@ -74,16 +40,9 @@ section#moreInformation a:hover { section { padding: 10px; - box-shadow: 5px 5px 10px 0px rgba(0,0,0,0.55); */; - /* -webkit-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); -} - -section#moreInformation { - box-shadow: none; - margin-top: 5%; - text-align: center; - -moz-box-shadow: none; + 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); } body > div { @@ -91,90 +50,10 @@ body > div { padding-top: 70px; } -#color-chooser li { - width: 50px; - margin: 0; -} - -ul#color-chooser { - padding: 0; -} - -ul#color-chooser a { - display: block; - width: 50px; - height: 50px; -} - -#color-chooser #blueHard { - background-color: rgb(2,93,140); -} - -#color-chooser #standardHard { - background-color: rgb(255, 128, 0); -} - -#color-chooser #blackHard { - background-color: rgb(50, 50, 50); -} - -#color-chooser #black { - background-color: rgb(238,238,238); -} - -#color-chooser #pinkHard { - background-color: rgb(254, 67, 101); -} - -#color-chooser #pink { - background-color: rgb(255,196,246); -} - -#color-chooser #redHard { - background-color: rgb(255, 0, 0); -} - -#color-chooser #red { - background-color: rgb(255,92,92); -} - -#color-chooser #blue { - background-color: rgb(164,192,230); -} - -a#green { -} - -#color-chooser #greenHard { - background-color: rgb(127, 175, 27); -} - -#color-chooser #green { - background-color: rgb(177,226,163); -} - -#color-chooser #standard { - background-color: rgb(255, 194, 107); -} - -a#standard {} - .input-group-addon { padding: 0; } -div.wrapper button { -} - -#searchForm button { - width: 50px; - line-height: 100%; - height: 28px; - border: 0; - background-color: transparent; - padding: 0; -} - footer ul.list-inline { width: 100%; } @@ -193,7 +72,6 @@ span.glyphicon { } footer { - /* position: fixed; */ margin-top: 8%; bottom: 0; width: 100%; @@ -203,65 +81,27 @@ main ul li { margin: 0 10px; } -section#moreInformation ul li { - color: grey; -} - -main ul li:after { -} - body ul { list-style-type: none; text-align: center; margin-left: 0!important; margin-top: 10px; } -.form-group { - font-family: sans-serif; - font-size: 16px; - color: black; - background-color: transparent; - text-align: center; -} - -section#moreInformation > div { - font-size: 15px; -} - -fieldset input[type=text] { - width:100%; - padding-left: 10px; - padding-right: 10px; - border-width: 1px; - overflow: visible; -} - -fieldset#foki label > span { - margin-right: 5px; -} -fieldset#foki label span { +.form-group { + font-family: sans-serif; + font-size: 16px; + color: black; background-color: transparent; + text-align: center; } -fieldset#foki input { - visibility: hidden; -} - -fieldset#foki input:checked + label { - font-weight: bold; - background-color: #e3e3e3; -} - -fieldset#foki input + label { - border-radius: 4px; - padding: 7px 20px; - font-weight: normal; -} - -fieldset#foki input + label:hover { - cursor: pointer; - background-color: #f6f6f6; +fieldset input[type=text] { + width: 100%; + padding-left: 10px; + padding-right: 10px; + border-width: 1px; + overflow: visible; } main fieldset { @@ -277,30 +117,9 @@ a.content.hidden-xs { color: #333; } -h1#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; -} - header nav a { text-decoration: none; - color: rgb(119,119,119); + color: rgb(119, 119, 119); } a.navbar-brand { @@ -317,7 +136,12 @@ nav h1 { height: 100%; padding-left: 20px; padding-top: 8px; - font-family: sans-serif; font-style: italic; margin: 0; font-weight: bold; line-height: 1; white-space: nowrap; /* padding: 5px 0; */; + font-family: sans-serif; + font-style: italic; + margin: 0; + font-weight: bold; + line-height: 1; + white-space: nowrap; } body { @@ -325,33 +149,9 @@ body { } header { - position: fixed; - background-color: white; - z-index: 500; - width: 100%; - height: 50px; -} - -header ul { - -} - -header ul li{ - -} - -.mg-panel { - - margin: 0 auto; - margin-top:7%; - padding: 10px 20px; - margin-bottom: 0; + position: fixed; 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); -} - - - - - + z-index: 500; + width: 100%; + height: 50px; +} \ No newline at end of file diff --git a/public/css/styleResultPage.css b/public/css/styleResultPage.css index 02b54817af2f25db64af043f6e7a0003259b5f94..26637f7121fdcf42fd784b03c39533c2b02d8a45 100644 --- a/public/css/styleResultPage.css +++ b/public/css/styleResultPage.css @@ -11,13 +11,6 @@ margin-top: 0; } -header * {} - -#foki li { - /* background-color: rgba(255, 255, 255, 0.93); */ - /* border-top-right-radius: 5px; */ -} - .nav-tabs > li.active {} nav-tabs > li.active { @@ -25,9 +18,7 @@ nav-tabs > li.active { } .tab-pane.active { - /* -webkit-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); - /* box-shadow: 5px 5px 10px 0px rgba(0,0,0,0.55); */ padding: 10px 0; padding-top: 0; } @@ -72,7 +63,6 @@ nav-tabs > li.active { #research .visible-xs { display: inline-block!important; } - #research nav ul li + li + li {} } .input-group-addon { @@ -90,7 +80,6 @@ nav .input-group { header nav { height: 100%; - /* margin-left: 15px; */ } header ul { @@ -135,7 +124,6 @@ header ul { font-weight: bold; line-height: 1; white-space: nowrap; - /* padding: 5px 0; */ } #search { @@ -145,8 +133,6 @@ header ul { height: 100%; } -#reSearch {} - #reSearch a { color: black; } @@ -169,7 +155,6 @@ header ul { body { height: 100%; background-image: inherit; - /* background-attachment: fixed; */ background-color: rgba(2, 93, 140, .03); } @@ -197,7 +182,7 @@ a:hover { } -/* Hier der Style für unsere Tabliste */ +/* Hier der Style für unsere Tabliste */ #foki { background-color: white; @@ -217,11 +202,10 @@ a:hover { } -/* Hier der Style für unseren Spruch */ +/* Hier der Style für unseren Spruch */ #spruch { padding: 10px; - /* margin-top: 10px; */ margin-bottom: 0; padding-bottom: 10px; padding-left: 65px; @@ -251,11 +235,10 @@ a:hover { } -/* Hier der Style für die einzelnen Ergebnisboxen */ +/* Hier der Style für die einzelnen Ergebnisboxen */ .result { margin-bottom: 10px; - /* padding:0 50px; */ width: 100% } @@ -402,13 +385,6 @@ a:hover { max-width: 100%; } -.popover-content { - /*padding-left: 0; - padding-right:0;*/ -} - -.options-list > li {} - .options-list > li:hover { background-color: lightgrey; } @@ -443,7 +419,7 @@ a:hover { } -/* Hier der Style für die Bilder */ +/* Hier der Style für die Bilder */ #fit-width .masonry { margin: 0 auto; @@ -460,7 +436,7 @@ a:hover { } -/* Hier der Style für die Werbeboxen */ +/* Hier der Style für die Werbeboxen */ .result.ad {} @@ -473,7 +449,7 @@ a:hover { } -/* Style für den Footer */ +/* Style für den Footer */ footer { text-align: center; @@ -484,14 +460,14 @@ footer a { } -/* Ein resetter für Floats */ +/* Ein resetter für Floats */ .clearfix { clear: both; } -/* Placeholder für ladende Tabs */ +/* Placeholder für ladende Tabs */ .loader { text-align: center; diff --git a/public/css/styleResultPageMobile.css b/public/css/styleResultPageMobile.css index 25fb74401413a794682126d184de25654dc5c454..b6d3181af8aff2798ccc83511c7cb95af54e46a2 100644 --- a/public/css/styleResultPageMobile.css +++ b/public/css/styleResultPageMobile.css @@ -1,7 +1,3 @@ -* { - -} - .content-wrapper { padding-top: 50px; } @@ -40,22 +36,27 @@ header nav { padding: 0 10px; margin-left: 0; } + + /* Research Bar */ -#researchBar{ - width:100%; - margin-left: -50%; - padding-left:0; - padding-right:0; + +#researchBar { + width: 100%; + margin-left: -50%; + padding-left: 0; + padding-right: 0; } + /* Result Boxen */ -.result{ - padding:0; + +.result { + padding: 0; } -.result .link a{ - white-space:nowrap; - overflow:hidden; +.result .link a { + white-space: nowrap; + overflow: hidden; } .result.ad .link > a { @@ -65,16 +66,17 @@ header nav { display: inline-flex; text-overflow: ellipsis; } -.result .hoster{ - white-space:nowrap; + +.result .hoster { + white-space: nowrap; } -.row{ - margin: 10px 0; +.row { + margin: 10px 0; } .row .col-md-8 { - padding: 0 10px; + padding: 0 10px; } .container-fluid { @@ -86,17 +88,18 @@ header nav { padding-bottom: 5px; } -.content-wrapper{ - width: 100%; +.content-wrapper { + width: 100%; } -.result .link-link{ - max-width:90%; +.result .link-link { + max-width: 90%; } .alert ul { - padding-left:0px; + padding-left: 0px; } + .resultContainer { padding: 0!important; } \ No newline at end of file diff --git a/public/css/widget.css b/public/css/widget.css index 45e7719f36fef34eff9b895f292c3e5a509bfb24..0d758cb6344212cbc4aff2eef62b1b99a42271fa 100644 --- a/public/css/widget.css +++ b/public/css/widget.css @@ -1,7 +1,3 @@ -*{ - -} - p { white-space: pre-wrap; } \ No newline at end of file diff --git a/resources/views/spende/beitritt.blade.php b/resources/views/spende/beitritt.blade.php index 8da1a712ec8844dbb4bff91fcaa50df2387c1429..caace22896ac28595e6b3c3a306d6c063f911c00 100644 --- a/resources/views/spende/beitritt.blade.php +++ b/resources/views/spende/beitritt.blade.php @@ -47,10 +47,10 @@ </div> </div> <label class="non-bold"> - Der Beitrag wird jährlich zum 01. August im voraus abgebucht, bzw. ab Eintrittsdatum anteilig für das erste Jahr. + Der Beitrag wird jährlich zum 01. August im voraus abgebucht, bzw. ab Eintrittsdatum anteilig für das erste Jahr. </label> <label class="non-bold"> - Ich stimme der Veröffentlichung meines Namens, meiner Funktion und meiner E-Mail-Adresse im Internet und/oder in Papierform zu (gewünschtes ankreuzen): + Ich stimme der Veröffentlichung meines Namens, meiner Funktion und meiner E-Mail-Adresse im Internet und/oder in Papierform zu (gewünschtes ankreuzen): </label> <div class="row"> <div class="col-xs-2"> @@ -116,4 +116,4 @@ <p>Beim Versenden per Post oder Fax informieren Sie uns bitte kurz per email an office@suma-ev.de</p> <p>Mitgliedsbeiträge an den SUMA-EV sind steuerlich absetzbar, da der Verein vom Finanzamt Hannover Nord als gemeinnützig anerkannt ist. Eine Spendenbescheinigung wird auf Wunsch im Januar oder Februar des Folgejahres zugesandt. </p> <button type="button" class="btn btn-lg btn-primary noprint" onclick="window.print();">Drucken</button> -@endsection \ No newline at end of file +@endsection