From 11fca7f444e177f88331f4656b942d8307b1137a Mon Sep 17 00:00:00 2001
From: Karl Hasselbring <Karl Hasselbring>
Date: Tue, 20 Feb 2018 09:29:27 +0100
Subject: [PATCH] Das Beitrittsformulatr sieht jetzt in Chrome und Firefox
wieder relativ normal aus
---
resources/assets/less/metager/beitritt.less | 18 +++++-
resources/assets/less/metager/general.less | 4 +-
resources/views/spende/beitritt.blade.php | 68 +++++++++------------
3 files changed, 47 insertions(+), 43 deletions(-)
diff --git a/resources/assets/less/metager/beitritt.less b/resources/assets/less/metager/beitritt.less
index 24c14a290..1b9f4d503 100644
--- a/resources/assets/less/metager/beitritt.less
+++ b/resources/assets/less/metager/beitritt.less
@@ -1,6 +1,19 @@
/* Style für die Druckversion des Beitrittsformulars */
#donation-form {
+ .beitritt-inputs {
+ display: flex;
+ flex-wrap: wrap;
+ >div {
+ width: 50%;
+ padding: 10px;
+ }
+ @media print {
+ padding: 0px;
+ flex-direction: column;
+ flex-wrap: nowrap;
+ }
+ }
label {
font-weight: normal;
}
@@ -40,7 +53,9 @@
height: initial !important;
border: 0;
}
- /* Skalierung für Firefox, absolut für die anderen Browser */
+ /* Passt die Größe der Radio-Buttons an
+ * Skalierung für Firefox, absolut für die anderen Browser
+ */
input[type=radio] {
transform: scale(0.5);
width: 20px !important;
@@ -48,6 +63,7 @@
margin-top: 0px !important;
padding-top: 0px !important;
}
+ /* Blendet die Placeholder aus */
input::-webkit-input-placeholder {
/* WebKit browsers */
color: transparent !important;
diff --git a/resources/assets/less/metager/general.less b/resources/assets/less/metager/general.less
index 832ebd60b..4fcd80df4 100644
--- a/resources/assets/less/metager/general.less
+++ b/resources/assets/less/metager/general.less
@@ -176,9 +176,7 @@ summary {
}
}
.newpage {
- @media print {
- page-break-before: always;
- }
+ page-break-after: always;
}
nav {
diff --git a/resources/views/spende/beitritt.blade.php b/resources/views/spende/beitritt.blade.php
index 56761bccd..74705ff43 100644
--- a/resources/views/spende/beitritt.blade.php
+++ b/resources/views/spende/beitritt.blade.php
@@ -6,96 +6,86 @@
@section('content')
<link type="text/css" rel="stylesheet" href="{{ elixir('/css/beitritt.css') }}" />
- <h1>{{ trans('beitritt.heading.1') }}</h1>
<form id="donation-form">
- <div class="col-sm-6">
- <div class="form-group beitritt-form-group">
+ <h1>{{ trans('beitritt.heading.1') }}</h1>
+ <div class="beitritt-inputs">
+ <div>
<label for="name">{{ trans('beitritt.beitritt.1') }}</label>
<input type="text" class="form-control beitritt-input" name="name" placeholder="{{trans('beitritt.placeholder.1')}}" required>
</div>
- </div>
- <div class="col-sm-6">
- <div class="form-group beitritt-form-group">
+ <div>
<label for="firma">{{ trans('beitritt.beitritt.2') }}</label>
<input type="text" class="form-control beitritt-input" name="firma" placeholder="{{trans('beitritt.placeholder.2')}}">
</div>
- </div>
- <div class="col-sm-6">
- <div class="form-group beitritt-form-group">
+ <div>
<label for="funktion">{{ trans('beitritt.beitritt.3') }}</label>
<input type="text" class="form-control beitritt-input" name="funktion" placeholder="{{trans('beitritt.placeholder.3')}}">
</div>
- </div>
- <div class="col-sm-6">
- <div class="form-group beitritt-form-group">
+ <div>
<label for="adresse">{{ trans('beitritt.beitritt.4') }}</label>
<input type="text" class="form-control beitritt-input" name="adresse" placeholder="{{trans('beitritt.placeholder.4')}}" required>
</div>
- </div>
- <div class="col-sm-6">
- <div class="form-group beitritt-form-group">
+ <div>
<label for="email">{{ trans('beitritt.beitritt.5') }}</label>
<input type="email" class="form-control beitritt-input" name="email" placeholder="">
</div>
- </div>
- <div class="col-sm-6">
- <div class="form-group beitritt-form-group">
+ <div>
<label for="homepage">{{ trans('beitritt.beitritt.6') }}</label>
<input type="text" class="form-control beitritt-input" name="homepage" placeholder="http://">
</div>
- </div>
- <div class="col-sm-6">
- <div class="form-group beitritt-form-group">
+ <div>
<label for="telefon">{{ trans('beitritt.beitritt.7') }}</label>
<input type="text" class="form-control beitritt-input" name="telefon" placeholder="{{trans('beitritt.placeholder.7')}}">
</div>
</div>
- <div class="col-sm-12">
+ <div>
<p>{{ trans('beitritt.beitritt.8') }}</p>
<input type="text" class="form-control" name="betrag" required>
<p> {{ trans('beitritt.beitritt.9') }}</p>
</div>
- <div class="col-sm-12">
+ <div>
<p>{{ trans('beitritt.beitritt.10') }}</p>
<p>{{ trans('beitritt.beitritt.11') }}</p>
</div>
- <div class="col-sm-12">
+ <div>
<input type="radio" name="veröffentlichung" checked> {{ trans('beitritt.beitritt.12') }}
<input type="radio" name="veröffentlichung"> {{ trans('beitritt.beitritt.13') }}
</div>
- <div class="col-sm-12">
- <div class="form-group beitritt-form-group">
+ <div>
+ <div>
<label for="ort">{{ trans('beitritt.beitritt.14') }}</label>
<input type="text" class="form-control beitritt-input" id="ort" placeholder="">
</div>
<p class="signature">{{ trans('beitritt.unterschrift') }}</p>
</div>
- <div class="newpage row"></div>
+ <div class="newpage"></div>
<h1>{{ trans('beitritt.abbuchung.2') }}</h1>
<p>{{ trans('beitritt.abbuchung.3') }}</p>
- <div class="form-group beitritt-form-group">
- <label for="kontoname">{{ trans('beitritt.abbuchung.4') }}</label>
- <input type="text" class="form-control" name="kontoname" placeholder="">
- </div>
- <div class="row">
- <div class="col-sm-4 form-group beitritt-form-group">
+ <div class="beitritt-inputs">
+ <div>
+ <label for="kontoname">{{ trans('beitritt.abbuchung.4') }}</label>
+ <input type="text" class="form-control" name="kontoname" placeholder="">
+ </div>
+ <div>
<label for="bankverbindung">{{ trans('beitritt.abbuchung.5') }}</label>
<input type="text" class="form-control" name="bankverbindung" placeholder="">
</div>
- <div class="col-sm-5 form-group beitritt-form-group">
+ <div>
<label for="iban">{{ trans('beitritt.abbuchung.6') }}</label>
<input type="text" class="form-control" name="iban" maxlength="22" placeholder="">
</div>
- <div class="col-sm-3 form-group beitritt-form-group">
+ <div>
<label for="bic">{{ trans('beitritt.abbuchung.7') }}</label>
<input type="text" class="form-control" name="bic" placeholder="">
</div>
</div>
- <div class="form-group beitritt-form-group">
- <label for="ort2">{{ trans('beitritt.abbuchung.8') }}</label>
- <input type="text" class="form-control beitritt-input" id="ort2" placeholder="">
+ <div>
+ <div>
+ <label for="ort2">{{ trans('beitritt.abbuchung.8') }}</label>
+ <input type="text" class="form-control beitritt-input" id="ort2" placeholder="">
+ </div>
+ <p class="signature">{{ trans('beitritt.unterschrift') }}</p>
</div>
- <p class="signature">{{ trans('beitritt.unterschrift') }}</p>
</form>
<div class="beitritt-formular-info">
<p>{{ trans('beitritt.anweisung.1') }}</p>
--
GitLab