diff --git a/resources/assets/sass/_mediaqueries.scss b/resources/assets/sass/_mediaqueries.scss index 3268207..74cf2a5 100644 --- a/resources/assets/sass/_mediaqueries.scss +++ b/resources/assets/sass/_mediaqueries.scss @@ -3,12 +3,20 @@ have the same breakpoints as Twitter Bootstrap does, considering we use Twitter Bootstrap. */ +img { + display: block; + max-width: 100%; + height: auto; +} -@media (min-width : 1200px) { +@media (min-width : 1200px){ #donation__start-form{ + .about:nth-of-type(1) { + padding-top: 0; + } + .about{ - padding-top:0; padding-bottom:0; } } @@ -22,6 +30,7 @@ } .about { padding-top: 40px; + padding-bottom:0; } //Donation Start Page - Form - col-md-10 @@ -39,6 +48,7 @@ } .about { padding-top: 40px; + padding-bottom:0; } //Donation Start Page - Form - col-md-10 @@ -50,6 +60,7 @@ @media (min-width : 480px) and (max-width: 767px) { + //Homepage .goals .numbers-container { height:500px !important; } @@ -61,6 +72,7 @@ } .about{ padding-top: 40px; + padding-bottom:0; } //Donation Start Page - Form - col-md-10 @@ -70,10 +82,12 @@ } } -@media (min-width : 320px) and (max-width: 479px) { - - .goals .numbers-container { - height:500px !important; +@media (min-width : 320px) and (max-width: 479px) { + // height for container goals must be given so that it overwrites the standard height + .goals { + .numbers-container { + height: 500px !important; + } } @@ -83,6 +97,7 @@ } .about{ padding-top: 40px; + padding-bottom:0; } //Donation Start Page - Form - col-md-10 diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss index 92851ec..cdac5ac 100644 --- a/resources/assets/sass/app.scss +++ b/resources/assets/sass/app.scss @@ -3,7 +3,6 @@ @import "config"; @import "colors"; @import "setup"; -@import "mediaqueries"; // Libraries @import "bootstrap"; @@ -32,4 +31,7 @@ @import "components/lib/jquery.datetimepicker"; // Sticky footer -@import "stickyfooter"; \ No newline at end of file +@import "stickyfooter"; + +//media queries +@import "mediaqueries"; \ No newline at end of file diff --git a/resources/assets/sass/pages/_donation.scss b/resources/assets/sass/pages/_donation.scss index 099e09f..b0675de 100644 --- a/resources/assets/sass/pages/_donation.scss +++ b/resources/assets/sass/pages/_donation.scss @@ -1,11 +1,11 @@ -#donation__start{ +#donation__start, #donation__details{ margin-bottom: 0; - #donation__start-title { + #donation__start-title, #donation__details-title{ padding:50px 7% 50px 7%; } - #donation__start-options { + #donation__start-options, #donation__details-options{ padding:7%; background-color: $color-gray; } diff --git a/resources/views/front/donation/user.blade.php b/resources/views/front/donation/user.blade.php index a74c93d..2a1f93d 100644 --- a/resources/views/front/donation/user.blade.php +++ b/resources/views/front/donation/user.blade.php @@ -3,38 +3,36 @@ @section('title', trans('generic.donation_detail')) @section('content') -
+
-
+

{{ trans('donation.confirm.title') }}

-

{{ trans('donation.confirm.description') }}

+

{{ trans('donation.you_pledged') }}

+ @foreach ($types as $type) + @if (is_array($type)) + {{ trans('backoffice.' . $type['kind']) }}
+ {{ $type['amount'] }}x {{ $type['name'] }}
+ @endif + @endforeach + @if (isset($types['currency'])) +

{{ trans('donation.money_pledge') }} €{{ $types['currency'] }}

+ @endif
-
-
-
-
-

{{ trans('donation.you_pledged') }}

- @foreach ($types as $type) - @if (is_array($type)) - {{ trans('backoffice.' . $type['kind']) }}
- {{ $type['amount'] }}x {{ $type['name'] }}
- @endif - @endforeach - @if (isset($types['currency'])) -

{{ trans('donation.money_pledge') }} €{{ $types['currency'] }}

- @endif +

{{ trans('donation.confirm.description') }}


+
+
-
+
@if($errors->any()) @endif - +
{{ csrf_field() }} +
+
+
+ + " + maxlength="255"> + + {{ trans('donation.user.first_name.info') }} + +
+
-
- - " - maxlength="255"> - - {{ trans('donation.user.first_name.info') }} - -
-
- - " - maxlength="255"> - - {{ trans('donation.user.last_name.info') }} - +
+
+ + " + maxlength="255"> + + {{ trans('donation.user.last_name.info') }} + +
+
diff --git a/resources/views/partials/footer.blade.php b/resources/views/partials/footer.blade.php index e9fdccd..4a10685 100644 --- a/resources/views/partials/footer.blade.php +++ b/resources/views/partials/footer.blade.php @@ -2,10 +2,6 @@
-
nieuwsbrief
- - - @if (property_exists($settings, 'legal'))