From 24469fad49a367de13eabedb5666cfb4f7d81a19 Mon Sep 17 00:00:00 2001 From: Karl Hasselbring Date: Tue, 20 Feb 2018 10:37:06 +0100 Subject: [PATCH 1/4] =?UTF-8?q?Die=20Unterseiten=20haben=20ein=20einheitli?= =?UTF-8?q?ches=20Kartendesign=20und=20auf=20dem=20Weg=20noch=20ein=20paar?= =?UTF-8?q?=20kleinere=20=C3=84nderungen=20und=20Vereinheitlichungen=20bek?= =?UTF-8?q?ommen.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/assets/less/metager/cards.less | 11 ++ resources/assets/less/metager/general.less | 42 ++++++ resources/assets/less/metager/metager.less | 3 +- resources/assets/less/metager/result.less | 4 +- resources/assets/less/metager/specific.less | 1 - resources/views/about.blade.php | 60 ++++---- resources/views/app.blade.php | 56 +++---- resources/views/datenschutz.blade.php | 40 ----- .../views/datenschutz/datenschutz.blade.php | 32 ++++ .../datenschutz/twitter-comments.blade.php | 15 ++ resources/views/faq.blade.php | 2 +- resources/views/hilfe.blade.php | 2 +- resources/views/impressum.blade.php | 31 ++-- resources/views/kontakt/kontakt.blade.php | 138 +++++------------- resources/views/kontakt/pgp.blade.php | 63 ++++++++ resources/views/team/team.blade.php | 82 ++++++----- resources/views/widget.blade.php | 10 -- resources/views/widget/widget.blade.php | 10 +- routes/web.php | 2 +- 19 files changed, 340 insertions(+), 264 deletions(-) create mode 100644 resources/assets/less/metager/cards.less delete mode 100644 resources/views/datenschutz.blade.php create mode 100644 resources/views/datenschutz/datenschutz.blade.php create mode 100644 resources/views/datenschutz/twitter-comments.blade.php create mode 100644 resources/views/kontakt/pgp.blade.php delete mode 100644 resources/views/widget.blade.php diff --git a/resources/assets/less/metager/cards.less b/resources/assets/less/metager/cards.less new file mode 100644 index 00000000..59a31c4d --- /dev/null +++ b/resources/assets/less/metager/cards.less @@ -0,0 +1,11 @@ +.card { + border: 1px solid #ccc; + background-color: white; + box-shadow: 0px 1px 1.5px 0px rgba(0, 0, 0, 0.12), 1px 0px 1px 0px rgba(0, 0, 0, 0.24); + margin: 8px; + padding: 15px; +} +.card-heavy { + .card; + box-shadow: 0px 4px 5px 0px rgba(0, 0, 0, 0.12), 4px 0px 5px 0px rgba(0, 0, 0, 0.24); +} \ No newline at end of file diff --git a/resources/assets/less/metager/general.less b/resources/assets/less/metager/general.less index e4ee5efe..ca5c862c 100644 --- a/resources/assets/less/metager/general.less +++ b/resources/assets/less/metager/general.less @@ -40,6 +40,48 @@ body { margin-top: 50px; } +.first-last-child-margin-fix() { + &:first-child { + margin-top: 0px; + } + &:last-child { + margin-bottom: 0px; + } +} + +/* General font sizing */ +@default-font-size: 15px; +h1 { + font-size: @default-font-size * 1.6; + .first-last-child-margin-fix; +} +h2 { + font-size: @default-font-size * 1.4; + .first-last-child-margin-fix; +} +h3 { + font-size: @default-font-size * 1.2; + .first-last-child-margin-fix; +} +p { + font-size: @default-font-size; + .first-last-child-margin-fix; +} +* { + font-size: @default-font-size; + .first-last-child-margin-fix; +} + + +.page-title { + font-size: @default-font-size * 3; + text-align: center; +} + +.page-subtitle { + font-size: @default-font-size; + text-align: center; +} /* Logo */ diff --git a/resources/assets/less/metager/metager.less b/resources/assets/less/metager/metager.less index a2d2732d..dd9c84da 100644 --- a/resources/assets/less/metager/metager.less +++ b/resources/assets/less/metager/metager.less @@ -8,4 +8,5 @@ @import "./foki.less"; @import "./footer.less"; @import "./searchbar.less"; -@import "./aufruf-winter.less"; \ No newline at end of file +@import "./aufruf-winter.less"; +@import "./cards.less"; \ No newline at end of file diff --git a/resources/assets/less/metager/result.less b/resources/assets/less/metager/result.less index 3792c5f1..e44b6187 100644 --- a/resources/assets/less/metager/result.less +++ b/resources/assets/less/metager/result.less @@ -4,12 +4,10 @@ @result-font-medium: 16px; @result-font-small: 14px; .result { + .card; margin: @resultpage-leftbox-min-dist-top-bottom 0px @resultpage-leftbox-min-dist-top-bottom 0px; padding: 15px; width: 100%; - border: 1px solid #ccc; - background-color: white; - box-shadow: 0px 1px 1.5px 0px rgba(0, 0, 0, 0.12), 1px 0px 1px 0px rgba(0, 0, 0, 0.24); .result-header { .result-title { margin: 0px; diff --git a/resources/assets/less/metager/specific.less b/resources/assets/less/metager/specific.less index 64532573..b14bda25 100644 --- a/resources/assets/less/metager/specific.less +++ b/resources/assets/less/metager/specific.less @@ -134,7 +134,6 @@ a.navbar-brand { .dotlist li { margin-bottom: 5px !important; - font-size: 16px; } .emphasize { diff --git a/resources/views/about.blade.php b/resources/views/about.blade.php index fbfdc78d..afea4e71 100644 --- a/resources/views/about.blade.php +++ b/resources/views/about.blade.php @@ -3,32 +3,38 @@ @section('title', $title ) @section('content') -

{{ trans('about.head.1') }}

-

{{ trans('about.head.3') }}

-

{!! trans('about.3.0') !!}

- -

{{ trans('about.head.2') }}

- +

{{ trans('about.head.1') }}

+
+

{{ trans('about.head.3') }}

+

{!! trans('about.3.0') !!}

+ +
+
+

{{ trans('about.head.2') }}

+ +
+

{{ trans('about.head.4') }}

- + +
@endsection diff --git a/resources/views/app.blade.php b/resources/views/app.blade.php index d809c4f5..6d570a02 100644 --- a/resources/views/app.blade.php +++ b/resources/views/app.blade.php @@ -3,29 +3,35 @@ @section('title', $title ) @section('content') -

{{ trans('app.head.1') }}

-

{{ trans('app.disclaimer.1')}}

-

{{ trans('app.head.2') }}

-

{{ trans('app.metager.1') }}

-

{{ trans('app.metager.2') }}

-

{{ trans('app.metager.playstore') }}

-

{{ trans('app.metager.manuell') }}

-

{{ trans('app.head.3') }}

-

{!! trans('app.maps.1') !!}

-

{{ trans('app.maps.2') }}

-

{{ trans('app.maps.playstore') }}

-

{{ trans('app.metager.manuell') }}

-

{{ trans('app.maps.3') }}

- -

{{ trans('app.head.4') }}

-

{{ trans('app.installation.1') }}

-

{{ trans('app.installation.2') }}

-
    -
  1. {!! trans('app.list.1') !!}
    2. -
  2. {!! trans('app.list.2') !!}
    3. -
  3. {!! trans('app.list.3') !!}
    4. -
+

{{ trans('app.head.1') }}

+

{{ trans('app.disclaimer.1')}}

+
+

{{ trans('app.head.2') }}

+

{{ trans('app.metager.1') }}

+

{{ trans('app.metager.2') }}

+

{{ trans('app.metager.playstore') }}

+

{{ trans('app.metager.manuell') }}

+
+
+

{{ trans('app.head.3') }}

+

{!! trans('app.maps.1') !!}

+

{{ trans('app.maps.2') }}

+

{{ trans('app.maps.playstore') }}

+

{{ trans('app.metager.manuell') }}

+

{{ trans('app.maps.3') }}

+ +
+
+

{{ trans('app.head.4') }}

+

{{ trans('app.installation.1') }}

+

{{ trans('app.installation.2') }}

+
    +
  1. {!! trans('app.list.1') !!}
    2. +
  2. {!! trans('app.list.2') !!}
    3. +
  3. {!! trans('app.list.3') !!}
    4. +
+
@endsection diff --git a/resources/views/datenschutz.blade.php b/resources/views/datenschutz.blade.php deleted file mode 100644 index 81ccf2ec..00000000 --- a/resources/views/datenschutz.blade.php +++ /dev/null @@ -1,40 +0,0 @@ -@extends('layouts.subPages') - -@section('title', $title ) - -@section('navbarFocus.datenschutz', 'class="active"') - -@section('content') -

{!! trans('datenschutz.head') !!}

-

{!! trans('datenschutz.general.1') !!}

-

{!! trans('datenschutz.general.3') !!}

-

{!! trans('datenschutz.policy.1') !!}

- -

{!! trans('datenschutz.twitter') !!}

- 
> 7.4.2014 C. Schulzki-Haddouti @kooptech
-	> MetaGer dürfte im Moment die sicherste Suchmaschine weltweit sein

-	
> 8.4.2014 Stiftung Datenschutz @DS_Stiftung
-	> Wenn das Suchergebnis anonym bleiben soll: @MetaGer, die gemeinnützige
-	> Suchmaschine aus #Hannover

-	
> 8.4.2014 Markus Käkenmeister @markus2009
-	> Suchmaschine ohne Tracking

-	
> 8.4.2014 Marko [~sHaKaL~] @mobilef0rensics 
-	> Nice; anonymous Search and find with MetaGer

-	
> 7.4.2014 Anfahrer @anfahrer
-	> Websuche mit #Datenschutz dank #MetaGer : Anonyme Suche und
-	> Ergebnisse via Proxy

-	
> 8.4.2014 stupidité pue @dummheitstinkt
-	> wow, is this the MetaGer I used in the end 90s in internet cafes???
-	> "Anonymes Suchen und Finden mit MetaGer | heise"
-@endsection \ No newline at end of file diff --git a/resources/views/datenschutz/datenschutz.blade.php b/resources/views/datenschutz/datenschutz.blade.php new file mode 100644 index 00000000..de2e069f --- /dev/null +++ b/resources/views/datenschutz/datenschutz.blade.php @@ -0,0 +1,32 @@ +@extends('layouts.subPages') + +@section('title', $title ) + +@section('navbarFocus.datenschutz', 'class="active"') + +@section('content') +
+

{!! trans('datenschutz.head') !!}

+

{!! trans('datenschutz.general.1') !!}

+

{!! trans('datenschutz.general.3') !!}

+
+
+

{!! trans('datenschutz.policy.1') !!}

+ +
+
+

{!! trans('datenschutz.twitter') !!}

+ 
@include('datenschutz/twitter-comments')
+
+@endsection \ No newline at end of file diff --git a/resources/views/datenschutz/twitter-comments.blade.php b/resources/views/datenschutz/twitter-comments.blade.php new file mode 100644 index 00000000..591e0cfb --- /dev/null +++ b/resources/views/datenschutz/twitter-comments.blade.php @@ -0,0 +1,15 @@ +

> 7.4.2014 C. Schulzki-Haddouti @kooptech +> MetaGer dürfte im Moment die sicherste Suchmaschine weltweit sein

+

> 8.4.2014 Stiftung Datenschutz @DS_Stiftung +> Wenn das Suchergebnis anonym bleiben soll: @MetaGer, die gemeinnützige +> Suchmaschine aus #Hannover

+

> 8.4.2014 Markus Käkenmeister @markus2009 +> Suchmaschine ohne Tracking

+

> 8.4.2014 Marko [~sHaKaL~] @mobilef0rensics +> Nice; anonymous Search and find with MetaGer

+

> 7.4.2014 Anfahrer @anfahrer +> Websuche mit #Datenschutz dank #MetaGer : Anonyme Suche und +> Ergebnisse via Proxy

+

> 8.4.2014 stupidité pue @dummheitstinkt +> wow, is this the MetaGer I used in the end 90s in internet cafes??? +> "Anonymes Suchen und Finden mit MetaGer | heise"

\ No newline at end of file diff --git a/resources/views/faq.blade.php b/resources/views/faq.blade.php index 02fb5266..3261a89b 100644 --- a/resources/views/faq.blade.php +++ b/resources/views/faq.blade.php @@ -4,7 +4,7 @@ @section('content') -

{!! trans('faq.title') !!}

+

{!! trans('faq.title') !!}

{!! trans('faq.faq.1.h') !!}

diff --git a/resources/views/hilfe.blade.php b/resources/views/hilfe.blade.php index 459dce87..86b79b02 100644 --- a/resources/views/hilfe.blade.php +++ b/resources/views/hilfe.blade.php @@ -4,7 +4,7 @@ @section('content') -

{!! trans('hilfe.title') !!}

+

{!! trans('hilfe.title') !!}

{!! trans('hilfe.einstellungen') !!}

diff --git a/resources/views/impressum.blade.php b/resources/views/impressum.blade.php index 7096e589..87d874c8 100644 --- a/resources/views/impressum.blade.php +++ b/resources/views/impressum.blade.php @@ -3,17 +3,22 @@ @section('title', $title ) @section('content') -

{!! trans('impressum.title') !!}

-

{!! trans('impressum.headline.1') !!} -

-

{!! trans('impressum.info.1') !!}

-
{!! trans('impressum.info.2') !!}
-
{!! trans('impressum.info.3') !!}
-

{!! trans('impressum.info.4') !!}

-

{!! trans('impressum.info.5') !!}

-

{!! trans('impressum.info.6') !!}

-

{!! trans('impressum.info.7') !!}

-

{!! trans('impressum.info.8') !!}

-

{!! trans('impressum.info.9') !!}

-

{!! trans('impressum.info.10') !!}

+

{!! trans('impressum.title') !!}

+
+

{!! trans('impressum.headline.1') !!}

+

{!! trans('impressum.info.1') !!}

+
{!! trans('impressum.info.2') !!}
+
{!! trans('impressum.info.3') !!}
+
+
+

{!! trans('impressum.info.4') !!}

+

{!! trans('impressum.info.5') !!}

+

{!! trans('impressum.info.6') !!}

+

{!! trans('impressum.info.7') !!}

+

{!! trans('impressum.info.8') !!}

+
+
+

{!! trans('impressum.info.9') !!}

+

{!! trans('impressum.info.10') !!}

+
@endsection diff --git a/resources/views/kontakt/kontakt.blade.php b/resources/views/kontakt/kontakt.blade.php index 5117658c..59c96e3b 100644 --- a/resources/views/kontakt/kontakt.blade.php +++ b/resources/views/kontakt/kontakt.blade.php @@ -3,105 +3,47 @@ @section('title', $title ) @section('content') -

{!! trans('kontakt.headline.1') !!}

-

{!! trans('kontakt.form.1') !!}

-

{!! trans('kontakt.form.2') !!}

- @if(isset($formerrors)) - @foreach($formerrors->errors()->all() as $errormessage) - - @endforeach - @endif - - -
- {{ csrf_field() }} -
- -
-
- -
-
- -
+
+

{!! trans('kontakt.headline.1') !!}

+

{!! trans('kontakt.form.1') !!}

+

{!! trans('kontakt.form.2') !!}

+ @if(isset($formerrors)) + @foreach($formerrors->errors()->all() as $errormessage) + + @endforeach + @endif + + {{ csrf_field() }}
- @if(isset($url) && $url !== "") - - @endif - +
- -
- -

{!! trans('kontakt.mail.1') !!}

-

{!! trans('kontakt.mail.2') !!}

-

{!! trans('kontakt.mail.3') !!}

- -

{!! trans('kontakt.letter.1') !!}

-

{!! trans('kontakt.letter.2') !!}

-
{!! trans('kontakt.letter.3') !!}
- + +
+
+ +
+
+ @if(isset($url) && $url !== "") + + @endif + +
+
+ +
+ +
+
+

{!! trans('kontakt.mail.1') !!}

+

{!! trans('kontakt.mail.2') !!}

+

{!! trans('kontakt.mail.3') !!}

+ +
+
+

{!! trans('kontakt.letter.1') !!}

+

{!! trans('kontakt.letter.2') !!}

+
{!! trans('kontakt.letter.3') !!}
+
+ @endsection diff --git a/resources/views/kontakt/pgp.blade.php b/resources/views/kontakt/pgp.blade.php new file mode 100644 index 00000000..51c0ff67 --- /dev/null +++ b/resources/views/kontakt/pgp.blade.php @@ -0,0 +1,63 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 + +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 +=LZAA +-----END PGP PUBLIC KEY BLOCK----- \ No newline at end of file diff --git a/resources/views/team/team.blade.php b/resources/views/team/team.blade.php index a8df7090..0c8894c2 100644 --- a/resources/views/team/team.blade.php +++ b/resources/views/team/team.blade.php @@ -3,43 +3,47 @@ @section('title', $title ) @section('content') -

Team

- -

{!! trans('team.contact.1') !!}

-

{!! trans('team.contact.2') !!}

-

{!! trans('team.contact.3') !!}

+
+

Team

+ +
+
+

{!! trans('team.contact.1') !!}

+

{!! trans('team.contact.2') !!}

+

{!! trans('team.contact.3') !!}

+
@endsection diff --git a/resources/views/widget.blade.php b/resources/views/widget.blade.php deleted file mode 100644 index fa8cdcb2..00000000 --- a/resources/views/widget.blade.php +++ /dev/null @@ -1,10 +0,0 @@ -@extends('layouts.subPages') - -@section('title', $title ) - -@section('content') -

{{ trans('widget.head') }}

-

{{ trans('widget.body.1') }}

- -

{{ trans('widget.body.4') }}

-@endsection \ No newline at end of file diff --git a/resources/views/widget/widget.blade.php b/resources/views/widget/widget.blade.php index e9ff4509..078d1793 100644 --- a/resources/views/widget/widget.blade.php +++ b/resources/views/widget/widget.blade.php @@ -3,8 +3,10 @@ @section('title', $title ) @section('content') -

{{ trans('widget.head') }}

-

{{ trans('widget.body.1') }}

- -

{{ trans('widget.body.4') }}

+

{{ trans('widget.head') }}

+
+

{{ trans('widget.body.1') }}

+ +

{{ trans('widget.body.4') }}

+
@endsection diff --git a/routes/web.php b/routes/web.php index 545466a9..3386c2fb 100644 --- a/routes/web.php +++ b/routes/web.php @@ -97,7 +97,7 @@ Route::group( Route::post('spende', 'MailController@donation'); Route::get('datenschutz', function () { - return view('datenschutz') + return view('datenschutz/datenschutz') ->with('title', trans('titles.datenschutz')) ->with('navbarFocus', 'datenschutz'); }); -- GitLab From 057734ea109f103e14a2a9fc37f0f34bf766102a Mon Sep 17 00:00:00 2001 From: Karl Hasselbring Date: Tue, 27 Feb 2018 09:08:20 +0100 Subject: [PATCH 2/4] =?UTF-8?q?Zus=C3=A4tzliche=20Kartendesigns=20eingef?= =?UTF-8?q?=C3=BCgt/verwendet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/assets/less/metager/cards.less | 6 +- resources/views/spende/beitritt.blade.php | 210 +++++++++++----------- resources/views/widget/widget.blade.php | 2 +- resources/views/zitatsuche.blade.php | 44 ++--- 4 files changed, 135 insertions(+), 127 deletions(-) diff --git a/resources/assets/less/metager/cards.less b/resources/assets/less/metager/cards.less index 59a31c4d..9fe7fe80 100644 --- a/resources/assets/less/metager/cards.less +++ b/resources/assets/less/metager/cards.less @@ -1,4 +1,4 @@ -.card { +.card, .card-medium { border: 1px solid #ccc; background-color: white; box-shadow: 0px 1px 1.5px 0px rgba(0, 0, 0, 0.12), 1px 0px 1px 0px rgba(0, 0, 0, 0.24); @@ -8,4 +8,8 @@ .card-heavy { .card; box-shadow: 0px 4px 5px 0px rgba(0, 0, 0, 0.12), 4px 0px 5px 0px rgba(0, 0, 0, 0.24); +} +.card-light { + .card; + box-shadow: 0px 0px 1px 0px rgba(0, 0, 0, 0.12), 0px 0px 1px 0px rgba(0, 0, 0, 0.24); } \ No newline at end of file diff --git a/resources/views/spende/beitritt.blade.php b/resources/views/spende/beitritt.blade.php index 9dc555ed..c2c5efdc 100644 --- a/resources/views/spende/beitritt.blade.php +++ b/resources/views/spende/beitritt.blade.php @@ -6,128 +6,130 @@ @section('content') -

{{ trans('beitritt.heading.1') }}

-
-
-
- - +

{{ trans('beitritt.heading.1') }}

+
+ +
+
+ + +
+
+
+
+ + +
-
-
-
- - +
+
+ + +
-
-
-
- - +
+
+ + +
-
-
-
- - +
+
+ + +
-
-
-
- - +
+
+ + +
-
-
-
- - +
+
+ + +
-
-
- - + +
+
+ +
+
+

{{ trans('beitritt.beitritt.9') }}

+
+
-
-
- + +
-
- +
+
+ +
-

{{ trans('beitritt.beitritt.9') }}

-
-
-
- - -
-
-
- +
+ +
-
-
- -
+
+ +
-
-
- - -
-
-

{{ trans('beitritt.abbuchung.1') }}

-

{{ trans('beitritt.abbuchung.2') }}

-

{{ trans('beitritt.abbuchung.3') }}

-
- - -
-
-
- - +
+

{{ trans('beitritt.abbuchung.1') }}

+

{{ trans('beitritt.abbuchung.2') }}

+

{{ trans('beitritt.abbuchung.3') }}

+
+ +
-
- - +
+
+ + +
+
+ + +
+
+ + +
-
- - +
+
+ +
+
+

{{ trans('beitritt.abbuchung.1') }}

+ +
+
+

{{ trans('beitritt.anweisung.1') }}

+
    +
  • {{ trans('beitritt.anweisung.2') }}
    • +
  • {{ trans('beitritt.anweisung.3') }}
    • +
  • {{ trans('beitritt.anweisung.4') }}
    • +
+

{{ trans('beitritt.anweisung.5') }}

+

{{ trans('beitritt.anweisung.6') }}

-
-
- - -
-
-

{{ trans('beitritt.abbuchung.1') }}

- -
-
-

{{ trans('beitritt.anweisung.1') }}

-
    -
  • {{ trans('beitritt.anweisung.2') }}
    • -
  • {{ trans('beitritt.anweisung.3') }}
    • -
  • {{ trans('beitritt.anweisung.4') }}
    • -
-

{{ trans('beitritt.anweisung.5') }}

-

{{ trans('beitritt.anweisung.6') }}

+
- @endsection diff --git a/resources/views/widget/widget.blade.php b/resources/views/widget/widget.blade.php index 078d1793..64fbb43f 100644 --- a/resources/views/widget/widget.blade.php +++ b/resources/views/widget/widget.blade.php @@ -4,7 +4,7 @@ @section('content')

{{ trans('widget.head') }}

-
+

{{ trans('widget.body.1') }}

{{ trans('widget.body.4') }}

diff --git a/resources/views/zitatsuche.blade.php b/resources/views/zitatsuche.blade.php index f5f98b15..94c67bcb 100644 --- a/resources/views/zitatsuche.blade.php +++ b/resources/views/zitatsuche.blade.php @@ -3,27 +3,29 @@ @section('title', $title ) @section('content') -

{{ trans('zitatsuche.head.1') }}

-

{{ trans('zitatsuche.p.1') }}

-
-
- -
- -
+

{{ trans('zitatsuche.head.1') }}

+
+

{{ trans('zitatsuche.p.1') }}

+ +
+ +
+ +
+
-
- - @if($q !== "") -
-

Ergebnisse für die Suche "{{$q}}":

- @foreach($results as $author => $quotes) - {{$author}}: -
    - @foreach($quotes as $quote) -
  • "{{ $quote }}"
    • + + @if($q !== "") +
    +

    Ergebnisse für die Suche "{{$q}}":

    + @foreach($results as $author => $quotes) + {{$author}}: +
      + @foreach($quotes as $quote) +
    • "{{ $quote }}"
      • + @endforeach +
    @endforeach -
- @endforeach - @endif + @endif +
@endsection -- GitLab From 50d645a9bd44ea260e0c4b6644b01bf5d9bcc02b Mon Sep 17 00:00:00 2001 From: Karl Hasselbring Date: Tue, 27 Feb 2018 09:47:35 +0100 Subject: [PATCH 3/4] Das Kartendesign ist jetzt auf allen Unterseiten --- resources/assets/less/metager/general.less | 10 ++ resources/assets/less/metager/specific.less | 9 -- resources/views/spende/beitritt.blade.php | 6 +- resources/views/spende/spende.blade.php | 138 +++++++++++--------- resources/views/widget/sitesearch.blade.php | 26 ++-- resources/views/widget/websearch.blade.php | 22 ++-- 6 files changed, 115 insertions(+), 96 deletions(-) diff --git a/resources/assets/less/metager/general.less b/resources/assets/less/metager/general.less index 7109f1b0..30c89e43 100644 --- a/resources/assets/less/metager/general.less +++ b/resources/assets/less/metager/general.less @@ -308,4 +308,14 @@ button { &.delayed-strong:after { transition-delay: 1s; } +} + +.two-col { + /*display: flex; + flex-wrap: wrap;*/ + >* { + width: 50%; + margin: 0; + float: left; + } } \ No newline at end of file diff --git a/resources/assets/less/metager/specific.less b/resources/assets/less/metager/specific.less index 4a460e07..03951fb1 100644 --- a/resources/assets/less/metager/specific.less +++ b/resources/assets/less/metager/specific.less @@ -8,10 +8,6 @@ li#info { white-space: pre-line; } -div#top { - padding-right: 35px; -} - div#expand { max-height: 0px; overflow: hidden; @@ -93,11 +89,6 @@ textarea#message { font-size: 20px; } -.donation-others { - text-align: center; - padding: 30px; -} - .checkbox { margin-top: 5px; margin-bottom: 5px; diff --git a/resources/views/spende/beitritt.blade.php b/resources/views/spende/beitritt.blade.php index a9636c83..da885085 100644 --- a/resources/views/spende/beitritt.blade.php +++ b/resources/views/spende/beitritt.blade.php @@ -6,8 +6,8 @@ @section('content') -

{{ trans('beitritt.heading.1') }}

+

{{ trans('beitritt.heading.1') }}

@@ -59,6 +59,8 @@

{{ trans('beitritt.unterschrift') }}

+
+

{{ trans('beitritt.abbuchung.2') }}

{{ trans('beitritt.abbuchung.3') }}

@@ -98,7 +100,7 @@

{{ trans('beitritt.anweisung.5') }}

{{ trans('beitritt.anweisung.6') }}

-
+ @endsection diff --git a/resources/views/spende/spende.blade.php b/resources/views/spende/spende.blade.php index f8764288..3c139f10 100644 --- a/resources/views/spende/spende.blade.php +++ b/resources/views/spende/spende.blade.php @@ -5,74 +5,84 @@ @section('navbarFocus.donate', 'class="dropdown active"') @section('content') -

{!! trans('spende.headline.1') !!}

-

{!! trans('spende.headline.2') !!}

-

{!! trans('spende.about.2') !!}

-

{!! trans('spende.bankinfo.3') !!}

-
-
-

{!! trans('spende.lastschrift.1') !!}

-

{!! trans('spende.lastschrift.2') !!}

- - -
- - -
-
- - -
-
- - +
+

{!! trans('spende.headline.1') !!}

+

{!! trans('spende.headline.2') !!}

+

{!! trans('spende.about.2') !!}

+

{!! trans('spende.bankinfo.3') !!}

+
+
+
+
+

{!! trans('spende.lastschrift.1') !!}

+

{!! trans('spende.lastschrift.2') !!}

+ + +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + + +
+ +
-
- - +
+
+
+

{!! trans('spende.bankinfo.1') !!}

+

{!! trans('spende.bankinfo.2') !!}

-
- - +
+
+
+

{!! trans('spende.paypal.1') !!}

+
+ + + + + + + + + + + + + + +
-
- - - +
+
+
+

{!! trans('spende.bitcoins.1') !!}

+ {!! trans('spende.bitcoins.2') !!}
+ 174SDRNZqM2WNobHhCDqD1VXbnZYFXNf8V
- - -
-
-

{!! trans('spende.bankinfo.1') !!}

-

{!! trans('spende.bankinfo.2') !!}

-
-
-

{!! trans('spende.paypal.1') !!}

-
- - - - - - - - - - - - - - -
+
-
-

{!! trans('spende.bitcoins.1') !!}

- {!! trans('spende.bitcoins.2') !!}
- 174SDRNZqM2WNobHhCDqD1VXbnZYFXNf8V +
+

{!! trans('spende.lastschrift.10') !!}

-
-
-

{!! trans('spende.lastschrift.10') !!}

-
@endsection diff --git a/resources/views/widget/sitesearch.blade.php b/resources/views/widget/sitesearch.blade.php index 835081eb..4dee33b7 100644 --- a/resources/views/widget/sitesearch.blade.php +++ b/resources/views/widget/sitesearch.blade.php @@ -3,17 +3,18 @@ @section('title', $title ) @section('content') -

{{ trans('sitesearch.head.1') }}

-

{{ trans('sitesearch.head.2') }}

-

{{ trans('sitesearch.head.3') }}

-
-
- - - - -
-
+
+

{{ trans('sitesearch.head.1') }}

+

{{ trans('sitesearch.head.2') }}

+

{{ trans('sitesearch.head.3') }}

+
+
+ + + + +
+
@if ($site !== '')

{{ trans('sitesearch.generated.1') }}

@@ -24,6 +25,7 @@
+

{{ trans('sitesearch.generated.5') }}

+ @else +
@endif @endsection diff --git a/resources/views/widget/websearch.blade.php b/resources/views/widget/websearch.blade.php index 7ab50d89..0f93898e 100644 --- a/resources/views/widget/websearch.blade.php +++ b/resources/views/widget/websearch.blade.php @@ -3,16 +3,18 @@ @section('title', $title ) @section('content') -

{{ trans('websearch.head.1') }}

-

{{ trans('websearch.head.2') }}

-

{{ trans('websearch.head.3') }}

-
- - - - - -
+
+

{{ trans('websearch.head.1') }}

+

{{ trans('websearch.head.2') }}

+

{{ trans('websearch.head.3') }}

+
+ + + + + +
+

{{ trans('websearch.head.7') }}