diff --git a/resources/assets/less/metager/cards.less b/resources/assets/less/metager/cards.less
index 59a31c4d5152f490ca9b98f53e8e923a0eb64c86..9fe7fe80688ef2dd178e5b77be71280f3a970684 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 9dc555ed786d7e704aa32319de9aa0fd03e9008b..c2c5efdcc8807af0f4356317c314398fa6bfcd7a 100644
--- a/resources/views/spende/beitritt.blade.php
+++ b/resources/views/spende/beitritt.blade.php
@@ -6,128 +6,130 @@
@section('content')
<link type="text/css" rel="stylesheet" href="{{ elixir('/css/beitritt.css') }}" />
- <h1>{{ trans('beitritt.heading.1') }}</h1>
- <form>
- <div class="col-sm-6">
- <div class="form-group beitritt-form-group">
- <label for="name" class="non-bold">{{ trans('beitritt.beitritt.1') }}</label>
- <input type="text" class="form-control beitritt-input" name="name" placeholder="{{trans('beitritt.placeholder.1')}}" required>
+ <h1 class="page-title">{{ trans('beitritt.heading.1') }}</h1>
+ <div class="card-heavy">
+ <form>
+ <div class="col-sm-6">
+ <div class="form-group beitritt-form-group">
+ <label for="name" class="non-bold">{{ 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">
+ <label for="firma" class="non-bold">{{ trans('beitritt.beitritt.2') }}</label>
+ <input type="text" class="form-control beitritt-input" name="firma" placeholder="{{trans('beitritt.placeholder.2')}}">
+ </div>
</div>
- </div>
- <div class="col-sm-6">
- <div class="form-group beitritt-form-group">
- <label for="firma" class="non-bold">{{ trans('beitritt.beitritt.2') }}</label>
- <input type="text" class="form-control beitritt-input" name="firma" placeholder="{{trans('beitritt.placeholder.2')}}">
+ <div class="col-sm-6">
+ <div class="form-group beitritt-form-group">
+ <label for="funktion" class="non-bold">{{ trans('beitritt.beitritt.3') }}</label>
+ <input type="text" class="form-control beitritt-input" name="funktion" placeholder="{{trans('beitritt.placeholder.3')}}">
+ </div>
</div>
- </div>
- <div class="col-sm-6">
- <div class="form-group beitritt-form-group">
- <label for="funktion" class="non-bold">{{ trans('beitritt.beitritt.3') }}</label>
- <input type="text" class="form-control beitritt-input" name="funktion" placeholder="{{trans('beitritt.placeholder.3')}}">
+ <div class="col-sm-6">
+ <div class="form-group beitritt-form-group">
+ <label for="adresse" class="non-bold">{{ trans('beitritt.beitritt.4') }}</label>
+ <input type="text" class="form-control beitritt-input" name="adresse" placeholder="{{trans('beitritt.placeholder.4')}}" required>
+ </div>
</div>
- </div>
- <div class="col-sm-6">
- <div class="form-group beitritt-form-group">
- <label for="adresse" class="non-bold">{{ trans('beitritt.beitritt.4') }}</label>
- <input type="text" class="form-control beitritt-input" name="adresse" placeholder="{{trans('beitritt.placeholder.4')}}" required>
+ <div class="col-sm-6">
+ <div class="form-group beitritt-form-group">
+ <label for="email" class="non-bold">{{ trans('beitritt.beitritt.5') }}</label>
+ <input type="email" class="form-control beitritt-input" name="email" placeholder="">
+ </div>
</div>
- </div>
- <div class="col-sm-6">
- <div class="form-group beitritt-form-group">
- <label for="email" class="non-bold">{{ trans('beitritt.beitritt.5') }}</label>
- <input type="email" class="form-control beitritt-input" name="email" placeholder="">
+ <div class="col-sm-6">
+ <div class="form-group beitritt-form-group">
+ <label for="homepage" class="non-bold">{{ trans('beitritt.beitritt.6') }}</label>
+ <input type="text" class="form-control beitritt-input" name="homepage" placeholder="http://">
+ </div>
</div>
- </div>
- <div class="col-sm-6">
- <div class="form-group beitritt-form-group">
- <label for="homepage" class="non-bold">{{ trans('beitritt.beitritt.6') }}</label>
- <input type="text" class="form-control beitritt-input" name="homepage" placeholder="http://">
+ <div class="col-sm-6">
+ <div class="form-group beitritt-form-group">
+ <label for="telefon" class="non-bold">{{ trans('beitritt.beitritt.7') }}</label>
+ <input type="text" class="form-control beitritt-input" name="telefon" placeholder="{{trans('beitritt.placeholder.7')}}">
+ </div>
</div>
- </div>
- <div class="col-sm-6">
<div class="form-group beitritt-form-group">
- <label for="telefon" class="non-bold">{{ trans('beitritt.beitritt.7') }}</label>
- <input type="text" class="form-control beitritt-input" name="telefon" placeholder="{{trans('beitritt.placeholder.7')}}">
+ <label class="non-bold" for="betrag">{{ trans('beitritt.beitritt.8') }}</label>
+ <div class="row">
+ <div class="pull-left donation-amount-input">
+ <input type="text" class="form-control" name="betrag" required>
+ </div>
+ <div class="pull-left" style="padding-left: 10px">
+ <p class="help-block"> {{ trans('beitritt.beitritt.9') }}</p>
+ </div>
+ </div>
</div>
- </div>
- <div class="form-group beitritt-form-group">
- <label class="non-bold" for="betrag">{{ trans('beitritt.beitritt.8') }}</label>
+ <label class="non-bold">
+ {{ trans('beitritt.beitritt.10') }}
+ </label>
+ <label class="non-bold">
+ {{ trans('beitritt.beitritt.11') }}
+ </label>
<div class="row">
- <div class="pull-left donation-amount-input">
- <input type="text" class="form-control" name="betrag" required>
+ <div class="pull-left">
+ <div class="radio">
+ <label>
+ <input type="radio" name="veröffentlichung" checked> {{ trans('beitritt.beitritt.12') }}
+ </label>
+ </div>
</div>
<div class="pull-left" style="padding-left: 10px">
- <p class="help-block"> {{ trans('beitritt.beitritt.9') }}</p>
- </div>
- </div>
- </div>
- <label class="non-bold">
- {{ trans('beitritt.beitritt.10') }}
- </label>
- <label class="non-bold">
- {{ trans('beitritt.beitritt.11') }}
- </label>
- <div class="row">
- <div class="pull-left">
- <div class="radio">
- <label>
- <input type="radio" name="veröffentlichung" checked> {{ trans('beitritt.beitritt.12') }}
- </label>
+ <div class="radio">
+ <label>
+ <input type="radio" name="veröffentlichung"> {{ trans('beitritt.beitritt.13') }}
+ </label>
+ </div>
</div>
</div>
- <div class="pull-left" style="padding-left: 10px">
- <div class="radio">
- <label>
- <input type="radio" name="veröffentlichung"> {{ trans('beitritt.beitritt.13') }}
- </label>
- </div>
+ <div class="form-group beitritt-form-group">
+ <label for="ort">{{ trans('beitritt.beitritt.14') }}</label>
+ <input type="text" class="form-control beitritt-input" id="ort" placeholder="">
</div>
- </div>
- <div class="form-group beitritt-form-group">
- <label for="ort">{{ trans('beitritt.beitritt.14') }}</label>
- <input type="text" class="form-control beitritt-input" id="ort" placeholder="">
- </div>
- <br>
- <p class="signature">{{ trans('beitritt.abbuchung.1') }}</p>
- <h3>{{ trans('beitritt.abbuchung.2') }}</h3>
- <p>{{ trans('beitritt.abbuchung.3') }}</p>
- <div class="form-group beitritt-form-group">
- <label for="kontoname" class="non-bold">{{ 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">
- <label for="bankverbindung" class="non-bold">{{ trans('beitritt.abbuchung.5') }}</label>
- <input type="text" class="form-control" name="bankverbindung" placeholder="">
+ <br>
+ <p class="signature">{{ trans('beitritt.abbuchung.1') }}</p>
+ <h3>{{ trans('beitritt.abbuchung.2') }}</h3>
+ <p>{{ trans('beitritt.abbuchung.3') }}</p>
+ <div class="form-group beitritt-form-group">
+ <label for="kontoname" class="non-bold">{{ trans('beitritt.abbuchung.4') }}</label>
+ <input type="text" class="form-control" name="kontoname" placeholder="">
</div>
- <div class="col-sm-5 form-group beitritt-form-group">
- <label for="iban" class="non-bold">{{ trans('beitritt.abbuchung.6') }}</label>
- <input type="text" class="form-control" name="iban" maxlength="22" placeholder="">
+ <div class="row">
+ <div class="col-sm-4 form-group beitritt-form-group">
+ <label for="bankverbindung" class="non-bold">{{ 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">
+ <label for="iban" class="non-bold">{{ 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">
+ <label for="bic" class="non-bold">{{ trans('beitritt.abbuchung.7') }}</label>
+ <input type="text" class="form-control" name="bic" placeholder="">
+ </div>
</div>
- <div class="col-sm-3 form-group beitritt-form-group">
- <label for="bic" class="non-bold">{{ trans('beitritt.abbuchung.7') }}</label>
- <input type="text" class="form-control" name="bic" placeholder="">
+ <br>
+ <div class="form-group beitritt-form-group">
+ <label for="ort2" class="non-bold">{{ trans('beitritt.abbuchung.8') }}</label>
+ <input type="text" class="form-control beitritt-input" id="ort2" placeholder="">
</div>
+ <br>
+ <p class="signature">{{ trans('beitritt.abbuchung.1') }}</p>
+ </form>
+ <hr>
+ <div class="beitritt-formular-info">
+ <p>{{ trans('beitritt.anweisung.1') }}</p>
+ <ul class="dotlist">
+ <li>{{ trans('beitritt.anweisung.2') }}</li>
+ <li>{{ trans('beitritt.anweisung.3') }}</li>
+ <li>{{ trans('beitritt.anweisung.4') }}</li>
+ </ul>
+ <p>{{ trans('beitritt.anweisung.5') }}</p>
+ <p>{{ trans('beitritt.anweisung.6') }}</p>
</div>
- <br>
- <div class="form-group beitritt-form-group">
- <label for="ort2" class="non-bold">{{ trans('beitritt.abbuchung.8') }}</label>
- <input type="text" class="form-control beitritt-input" id="ort2" placeholder="">
- </div>
- <br>
- <p class="signature">{{ trans('beitritt.abbuchung.1') }}</p>
- </form>
- <hr>
- <div class="beitritt-formular-info">
- <p>{{ trans('beitritt.anweisung.1') }}</p>
- <ul class="dotlist">
- <li>{{ trans('beitritt.anweisung.2') }}</li>
- <li>{{ trans('beitritt.anweisung.3') }}</li>
- <li>{{ trans('beitritt.anweisung.4') }}</li>
- </ul>
- <p>{{ trans('beitritt.anweisung.5') }}</p>
- <p>{{ trans('beitritt.anweisung.6') }}</p>
+ <button type="button" class="btn btn-lg btn-primary noprint" onclick="window.print();">{{ trans('beitritt.anweisung.7') }}</button>
</div>
- <button type="button" class="btn btn-lg btn-primary noprint" onclick="window.print();">{{ trans('beitritt.anweisung.7') }}</button>
<!-- <script src="{{ elixir('js/scriptJoinPage.js') }}"></script> -->
@endsection
diff --git a/resources/views/widget/widget.blade.php b/resources/views/widget/widget.blade.php
index 078d1793047936d3caa8e69cbe410f53881d5f7e..64fbb43fa6982753c0a3d0e669ad9fb2425fc1f8 100644
--- a/resources/views/widget/widget.blade.php
+++ b/resources/views/widget/widget.blade.php
@@ -4,7 +4,7 @@
@section('content')
<h1 class="page-title">{{ trans('widget.head') }}</h1>
- <div class="card-heavy">
+ <div class="card-medium">
<p>{{ trans('widget.body.1') }}</p>
<p id="widgetLinks" class="btn-group"><a class="btn btn-default mutelink" href="websearch/">{{ trans('widget.body.2') }}</a><a class="btn btn-default mutelink" href="sitesearch/">{{ trans('widget.body.3') }}</a></p>
<p>{{ trans('widget.body.4') }}</p>
diff --git a/resources/views/zitatsuche.blade.php b/resources/views/zitatsuche.blade.php
index f5f98b15a8276a7b423a2f3fe5f9d19cebdd4036..94c67bcbd8e3621423f82e128e7f8736939e198e 100644
--- a/resources/views/zitatsuche.blade.php
+++ b/resources/views/zitatsuche.blade.php
@@ -3,27 +3,29 @@
@section('title', $title )
@section('content')
- <h1>{{ trans('zitatsuche.head.1') }}</h1>
- <p>{{ trans('zitatsuche.p.1') }}</p>
- <form id="searchForm" class="form-inline" accept-charset="UTF-8">
- <div class="form-group">
- <label class="sr-only" for="q">Suchworte eingeben</label>
- <div class="input-group">
- <input type="text" class="form-control" id="q" name="q" placeholder="Suchworte" value="{{ $q }}">
- <div class="input-group-addon"><button type="submit"><i class="fa fa-search" aria-hidden="true"></i></button></div>
+ <h1 class="page-title">{{ trans('zitatsuche.head.1') }}</h1>
+ <div class="card-light">
+ <p>{{ trans('zitatsuche.p.1') }}</p>
+ <form id="searchForm" class="form-inline" accept-charset="UTF-8">
+ <div class="form-group">
+ <label class="sr-only" for="q">Suchworte eingeben</label>
+ <div class="input-group">
+ <input type="text" class="form-control" id="q" name="q" placeholder="Suchworte" value="{{ $q }}">
+ <div class="input-group-addon"><button type="submit"><i class="fa fa-search" aria-hidden="true"></i></button></div>
+ </div>
</div>
- </div>
- </form>
- @if($q !== "")
- <hr />
- <h3>Ergebnisse für die Suche "{{$q}}":</h3>
- @foreach($results as $author => $quotes)
- <b><a href="{{ action('MetaGerSearch@search', ['eingabe' => $author, 'focus' => 'web', 'encoding' => 'utf8', 'lang' => 'all']) }}" target="_blank">{{$author}}</a>:</b>
- <ul class="list-unstyled">
- @foreach($quotes as $quote)
- <li><quote>"{{ $quote }}"</quote></li>
+ </form>
+ @if($q !== "")
+ <hr />
+ <h3>Ergebnisse für die Suche "{{$q}}":</h3>
+ @foreach($results as $author => $quotes)
+ <b><a href="{{ action('MetaGerSearch@search', ['eingabe' => $author, 'focus' => 'web', 'encoding' => 'utf8', 'lang' => 'all']) }}" target="_blank">{{$author}}</a>:</b>
+ <ul class="list-unstyled">
+ @foreach($quotes as $quote)
+ <li><quote>"{{ $quote }}"</quote></li>
+ @endforeach
+ </ul>
@endforeach
- </ul>
- @endforeach
- @endif
+ @endif
+ </div>
@endsection