From c423fbb10964835e3f5f5882a6a1ef6aec2b9a94 Mon Sep 17 00:00:00 2001
From: Karl Hasselbring <Karl Hasselbring>
Date: Tue, 6 Mar 2018 11:28:53 +0100
Subject: [PATCH] Fehler an Unterseiten behoben
---
resources/assets/less/metager/beitritt.less | 9 ++++++++-
resources/assets/less/metager/general.less | 2 +-
resources/views/hilfe.blade.php | 10 +++++-----
resources/views/parts/fake-result.blade.php | 8 ++++----
resources/views/spende/beitritt.blade.php | 2 +-
5 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/resources/assets/less/metager/beitritt.less b/resources/assets/less/metager/beitritt.less
index a61868848..02892cdbf 100644
--- a/resources/assets/less/metager/beitritt.less
+++ b/resources/assets/less/metager/beitritt.less
@@ -22,7 +22,14 @@
width: 50%;
margin-top: 50px;
}
- @media print {
+}
+
+@media print {
+ .card-heavy {
+ border: none !important;
+ box-shadow: none !important;
+ }
+ #donation-form {
* {
font-size: 14px !important;
}
diff --git a/resources/assets/less/metager/general.less b/resources/assets/less/metager/general.less
index 1dbd38ddb..271941d11 100644
--- a/resources/assets/less/metager/general.less
+++ b/resources/assets/less/metager/general.less
@@ -205,7 +205,7 @@ summary {
text-align: center;
pointer-events: none;
opacity: 0;
- transition: opacity 0.5s ease;
+ transition: opacity 0.3s ease;
}
&.hide-tooltip-on-resultpage:after {
/* Auf kleinen Bildschirmen wird der Tooltip nicht angezeigt */
diff --git a/resources/views/hilfe.blade.php b/resources/views/hilfe.blade.php
index 86b79b02b..39338d8b1 100644
--- a/resources/views/hilfe.blade.php
+++ b/resources/views/hilfe.blade.php
@@ -13,9 +13,9 @@
<div class="panel-body">
<ul class="dotlist">
<li>{!! trans('hilfe.allgemein.1') !!}
- <a id="settings-btn" class="mutelink btn btn-default" href="#">
+ <button id="settings-btn" class="btn btn-default">
<i class="fa fa-sliders" aria-hidden="true"></i>
- </a>
+ </button>
</li>
{{-- <li>{!! trans('hilfe.allgemein.2') !!}</li> --}}
<li>{!! trans('hilfe.allgemein.3') !!}</li>
@@ -29,7 +29,7 @@
<div class="panel-body">
<p>{!! trans('hilfe.suchfokus.1') !!}</p>
<p>{!! trans('hilfe.suchfokus.2') !!}
- <button id="addFocusBtn" class="btn btn-default" data-original-title="" title="">
+ <button id="addFocusBtn" class="btn btn-default">
<i class="fa fa-plus" aria-hidden="true"></i>
</button>
</p>
@@ -102,7 +102,7 @@
@include('parts/fake-result')
<script type="text/javascript">
function setDummySearch(value) {
- document.getElementById("dummy_search").innerHTML = value
+ document.getElementById("dummy-search").innerHTML = value
}
</script>
<div>
@@ -116,7 +116,7 @@
<p>{!! trans('hilfe.domains.showcase.menu.6') !!}</p>
</div>
<div>
- <div class="well well-sm"><i>meine suche</i> <span id="dummy_search"></span></div>
+ <div class="well well-sm"><i>meine suche</i> <i id="dummy-search"></span></i>
</div>
</div>
</div>
diff --git a/resources/views/parts/fake-result.blade.php b/resources/views/parts/fake-result.blade.php
index 2cbec8980..952b300d6 100644
--- a/resources/views/parts/fake-result.blade.php
+++ b/resources/views/parts/fake-result.blade.php
@@ -38,22 +38,22 @@
<div class="options">
<ul class="option-list list-unstyled small">
<li class="">
- <a class="saver" href="javascript:setDummySearch('wikipedia site:de.wikipedia.org wurde zum weiteren Filtern gespeichert')" data-tooltip="{{ trans('fake-result.options.save') }}">
+ <a class="saver" href="javascript:setDummySearch('wurde zum weiteren Filtern gespeichert')" data-tooltip="{{ trans('fake-result.options.save') }}">
<i class="fa fa-floppy-o"></i> Ergebnis in Tab speichern.
</a>
</li>
<li>
- <a href="javascript:setDummySearch('wikipedia site:de.wikipedia.org')" data-tooltip="{{ trans('fake-result.options.domain') }}">
+ <a href="javascript:setDummySearch('site:de.wikipedia.org')" data-tooltip="{{ trans('fake-result.options.domain') }}">
Auf dieser Domain neu suchen
</a>
</li>
<li>
- <a href="javascript:setDummySearch('wikipedia -site:de.wikipedia.org')" data-tooltip="{{ trans('fake-result.options.subdomain') }}">
+ <a href="javascript:setDummySearch('-site:de.wikipedia.org')" data-tooltip="{{ trans('fake-result.options.subdomain') }}">
de.wikipedia.org ausblenden
</a>
</li>
<li>
- <a href="javascript:setDummySearch('wikipedia -site:*.wikipedia.org')" data-tooltip="{{ trans('fake-result.options.blacklist') }}">
+ <a href="javascript:setDummySearch('-site:*.wikipedia.org')" data-tooltip="{{ trans('fake-result.options.blacklist') }}">
*.wikipedia.org ausblenden
</a>
</li>
diff --git a/resources/views/spende/beitritt.blade.php b/resources/views/spende/beitritt.blade.php
index da885085e..8fb2a7876 100644
--- a/resources/views/spende/beitritt.blade.php
+++ b/resources/views/spende/beitritt.blade.php
@@ -101,6 +101,6 @@
<p>{{ trans('beitritt.anweisung.6') }}</p>
</div>
</div>
- <button type="button" class="btn btn-lg btn-primary noprint" onclick="window.print();">{{ trans('beitritt.anweisung.7') }}</button>
+ <button type="button" class="noprint js-only btn btn-lg btn-primary" onclick="window.print();">{{ trans('beitritt.anweisung.7') }}</button>
<!-- <script src="{{ elixir('js/scriptJoinPage.js') }}"></script> -->
@endsection
--
GitLab