From af6f8b57d852c1210c89154d37c12fa8aa6ec788 Mon Sep 17 00:00:00 2001 From: Karl Hasselbring Date: Tue, 27 Feb 2018 08:49:02 +0100 Subject: [PATCH] Die Links auf Seiten die nicht dem Design der Startseite entsprechen sind jetzt markiert. --- config/laravellocalization.php | 2 +- resources/assets/less/metager/general.less | 34 ++++++++++++++++++++-- resources/views/parts/sidebar.blade.php | 16 +++++----- 3 files changed, 40 insertions(+), 12 deletions(-) diff --git a/config/laravellocalization.php b/config/laravellocalization.php index 81b8cc35..243181e9 100644 --- a/config/laravellocalization.php +++ b/config/laravellocalization.php @@ -46,7 +46,7 @@ return [ //'en-AU' => ['name' => 'Australian English', 'script' => 'Latn', 'native' => 'Australian English', 'regional' => 'en_AU'], //'en-GB' => ['name' => 'British English', 'script' => 'Latn', 'native' => 'British English', 'regional' => 'en_GB'], //'en-US' => ['name' => 'U.S. English', 'script' => 'Latn', 'native' => 'U.S. English', 'regional' => 'en_US'], - 'es' => ['name' => 'Spanish', 'script' => 'Latn', 'native' => 'español', 'regional' => 'es_ES'], + 'es' => ['name' => 'Spanish', 'script' => 'Latn', 'native' => 'Español', 'regional' => 'es_ES'], //'eo' => ['name' => 'Esperanto', 'script' => 'Latn', 'native' => 'esperanto', 'regional' => ''], //'eu' => ['name' => 'Basque', 'script' => 'Latn', 'native' => 'euskara', 'regional' => 'eu_ES'], //'ewo' => ['name' => 'Ewondo', 'script' => 'Latn', 'native' => 'ewondo', 'regional' => ''], diff --git a/resources/assets/less/metager/general.less b/resources/assets/less/metager/general.less index 84abb041..bfca73ac 100644 --- a/resources/assets/less/metager/general.less +++ b/resources/assets/less/metager/general.less @@ -175,6 +175,7 @@ summary { display: none!important; } } + .newpage { page-break-after: always; } @@ -250,13 +251,12 @@ button { opacity: 0; transition: opacity 0.5s ease; } - - &.hide-tooltip-on-resultpage:after { /* Auf kleinen Bildschirmen wird der Tooltip nicht angezeigt */ + &.hide-tooltip-on-resultpage:after { + /* Auf kleinen Bildschirmen wird der Tooltip nicht angezeigt */ @media (max-width: 700px) { display: none; } } - &.delayed:after { transition-delay: 0.5s; } @@ -266,4 +266,32 @@ button { &.delayed-strong:after { transition-delay: 1s; } +} + +@metager-url: "metager.de"; + +/* Links */ + +// Intern, aber anderes Design als die Startseite +.inlink { + &:after { + display: inline-block; + font: normal normal normal 14px/1 FontAwesome; + font-size: inherit; + text-rendering: auto; + -webkit-font-smoothing: antialiased; + content: "\f08e"; + } +} + +// Extern +.outlink { + &:after { + display: inline-block; + font: normal normal normal 14px/1 FontAwesome; + font-size: inherit; + text-rendering: auto; + -webkit-font-smoothing: antialiased; + content: "\f08e"; + } } \ No newline at end of file diff --git a/resources/views/parts/sidebar.blade.php b/resources/views/parts/sidebar.blade.php index 7df1a728..7a5265d7 100644 --- a/resources/views/parts/sidebar.blade.php +++ b/resources/views/parts/sidebar.blade.php @@ -27,22 +27,22 @@ {{ trans('staticPages.nav22') }}
  • - {{ trans('staticPages.nav11') }} + {{ trans('staticPages.nav11') }}
  • @lang('staticPages.nav25')
  • - {{ trans('staticPages.nav13') }} + {{ trans('staticPages.nav13') }}
  • - Maps.MetaGer.de + Maps.MetaGer.de
  • - {{ trans('staticPages.nav24') }} + {{ trans('staticPages.nav24') }}
  • - {{ trans('staticPages.nav14') }} + {{ trans('staticPages.nav14') }}
  • @@ -84,11 +84,11 @@ @if(LaravelLocalization::getCurrentLocale() == "de")
  • - MetaGer-Fanshop + MetaGer-Fanshop
  • @endif
  • - {{ trans('staticPages.nav17') }} + {{ trans('staticPages.nav17') }}
  • @@ -101,7 +101,7 @@