From cd063ceca6f991e7f25cdf4d2d6d286a2e3c7362 Mon Sep 17 00:00:00 2001 From: Karl Hasselbring Date: Tue, 27 Feb 2018 09:47:35 +0100 Subject: [PATCH] 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') }}