Commit f141d4ec authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Merge branch 'MetaGer-Redesign' into 'development'

# Conflicts:
#   resources/assets/less/metager/result-page.less
parents e63a7f42 c0e37f35
...@@ -15,9 +15,10 @@ input[type=text]:focus, textarea:focus, input[type=email]:focus, input[type=tel] ...@@ -15,9 +15,10 @@ input[type=text]:focus, textarea:focus, input[type=email]:focus, input[type=tel]
-webkit-box-shadow: 0px 0px 2px 2px <?=$colorRGBA?>; -webkit-box-shadow: 0px 0px 2px 2px <?=$colorRGBA?>;
-moz-box-shadow: 0px 0px 2px 2px <?=$colorRGBA?>; -moz-box-shadow: 0px 0px 2px 2px <?=$colorRGBA?>;
box-shadow: 0px 0px 2px 2px <?=$colorRGBA?>; box-shadow: 0px 0px 2px 2px <?=$colorRGBA?>;
border-color: <?=$colorRGBA?>; border-color: <?=$colorRGBA?>;
} }
#mglogo > a { #mglogo > a {
background-image: linear-gradient(<?=$color?> 0%, <?=$color?> 250%); background-image: linear-gradient(<?=$color?> 0%, <?=$color?> 250%);
background-color: transparent; background-color: transparent;
...@@ -46,11 +47,6 @@ input[type=text]:focus, textarea:focus, input[type=email]:focus, input[type=tel] ...@@ -46,11 +47,6 @@ input[type=text]:focus, textarea:focus, input[type=email]:focus, input[type=tel]
box-shadow: 1px 1px 5px 1px rgba(0, 0, 0, 0.2); box-shadow: 1px 1px 5px 1px rgba(0, 0, 0, 0.2);
} }
.navbar.navbar-resultpage {
border-bottom: 2px solid <?=$color?>;
box-shadow: none;
}
.lSPrev > i, .lSNext > i { .lSPrev > i, .lSNext > i {
color: <?=$color?>; color: <?=$color?>;
} }
\ No newline at end of file
...@@ -82,6 +82,15 @@ function getDocumentReadyForUse (fokus, custom = false) { ...@@ -82,6 +82,15 @@ function getDocumentReadyForUse (fokus, custom = false) {
productWidget(); productWidget();
$('iframe:not(.resized)').iFrameResize(); $('iframe:not(.resized)').iFrameResize();
$('iframe').addClass('resized'); $('iframe').addClass('resized');
addListeners();
}
function addListeners () {
$('#reset').attr('type', 'button').click(resetSearchbar);
}
function resetSearchbar () {
$('#eingabeTop').val('');
} }
function pluginInfo () { function pluginInfo () {
...@@ -570,7 +579,7 @@ function loadQuicktips (search, locale, sprueche) { ...@@ -570,7 +579,7 @@ function loadQuicktips (search, locale, sprueche) {
} }
const QUICKTIP_SERVER = 'https://quicktips.metager3.de'; const QUICKTIP_SERVER = 'https://quicktips.metager3.de';
//const QUICKTIP_SERVER = 'http://localhost:63825'; // const QUICKTIP_SERVER = 'http://localhost:63825'
/** /**
* Requests quicktips from the quicktip server and passes them to the loadedHandler * Requests quicktips from the quicktip server and passes them to the loadedHandler
...@@ -588,7 +597,6 @@ function getQuicktips (search, locale, blacklist, loadedHandler) { ...@@ -588,7 +597,6 @@ function getQuicktips (search, locale, blacklist, loadedHandler) {
$.get(getString, function (data, status) { $.get(getString, function (data, status) {
if (status === 'success') { if (status === 'success') {
var quicktips = $(data).children('feed').children('entry').map(function () { var quicktips = $(data).children('feed').children('entry').map(function () {
console.log(this);
return quicktip = { return quicktip = {
type: $(this).children('mg\\:type').text(), type: $(this).children('mg\\:type').text(),
title: $(this).children('title').text(), title: $(this).children('title').text(),
...@@ -605,7 +613,6 @@ function getQuicktips (search, locale, blacklist, loadedHandler) { ...@@ -605,7 +613,6 @@ function getQuicktips (search, locale, blacklist, loadedHandler) {
}).toArray() }).toArray()
}; };
}).toArray(); }).toArray();
console.log(quicktips);
loadedHandler(quicktips); loadedHandler(quicktips);
} else { } else {
console.error('Loading quicktips failed with status ' + status); console.error('Loading quicktips failed with status ' + status);
......
...@@ -4,4 +4,5 @@ ...@@ -4,4 +4,5 @@
@import "./quicktips.less"; @import "./quicktips.less";
@import "./start-page.less"; @import "./start-page.less";
@import "./settings.less"; @import "./settings.less";
@import "./variables.less"; @import "./variables.less";
\ No newline at end of file @import "./sidebar.less";
\ No newline at end of file
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
@lsprev-or-lsnext-i-background-color: @result-page-color-black; @lsprev-or-lsnext-i-background-color: @result-page-color-black;
body { body {
background-image: inherit; background-image: inherit;
background-color: @body-background-color; background-color: white;
} }
footer { footer {
...@@ -48,7 +48,6 @@ footer { ...@@ -48,7 +48,6 @@ footer {
#map, #map,
#map div { #map div {
display: flex; display: flex;
margin: 0;
} }
.nav-tabs>li>a { .nav-tabs>li>a {
...@@ -94,6 +93,8 @@ footer { ...@@ -94,6 +93,8 @@ footer {
.navbar-resultpage { .navbar-resultpage {
background-color: @navbar-resultpage-background-color; background-color: @navbar-resultpage-background-color;
position: absolute; position: absolute;
border-bottom: 2px solid #ff8000;
padding-bottom: 10px;
&>ul>li { &>ul>li {
padding-left: 0; padding-left: 0;
padding-right: 0; padding-right: 0;
...@@ -208,10 +209,7 @@ nav .input-group { ...@@ -208,10 +209,7 @@ nav .input-group {
.content-wrapper { .content-wrapper {
padding: 0px; padding: 0px;
padding-top: 52px; padding-top: 52px;
background-color: @content-wrapper-background-color; background-color: white;
-webkit-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
-moz-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
} }
#helpButton { #helpButton {
...@@ -299,16 +297,59 @@ a { ...@@ -299,16 +297,59 @@ a {
border: 1px dotted black; border: 1px dotted black;
} }
#logo-searchbar-container {
display: flex;
}
.mg-logo {
color: #ff8000;
font-family: Liberation Sans, sans-serif;
padding: 5px 30px 0px 0px;
}
#header-searchbar {
flex-grow: 1;
}
.searchbar {
margin-top: 5px;
display: flex;
align-items: center;
border-left: #bbb solid 1px;
.search-input {
order: 2;
border: none;
box-shadow: none !important;
border: white solid 1px;
font-size: 16px;
&:focus {
border: #bbb dotted 1px;
background-color: #eee;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
}
}
.search-reset {
order: 1;
border: none;
background-color: transparent;
color: #444;
}
.search-submit {
order: 3;
color: #bbb;
font-size: 20px;
}
}
.result { .result {
margin-bottom: 10px; margin-top: 20px;
margin-bottom: 40px;
width: 100%; width: 100%;
&>.number {
font-size: 15px;
line-height: 1;
text-align: right;
}
&>.resultInformation { &>.resultInformation {
border-radius: 5px; border-radius: 5px;
padding-left: 0px;
&>.save { &>.save {
position: absolute; position: absolute;
top: 0; top: 0;
...@@ -324,7 +365,7 @@ a { ...@@ -324,7 +365,7 @@ a {
.title { .title {
color: @result-title-color; color: @result-title-color;
text-decoration: none; text-decoration: none;
font-size: 14px; font-size: 18px;
font-weight: bold; font-weight: bold;
margin-bottom: 0; margin-bottom: 0;
white-space: nowrap; white-space: nowrap;
...@@ -334,7 +375,7 @@ a { ...@@ -334,7 +375,7 @@ a {
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.link { .link {
font-size: 13px; font-size: 16px;
margin: 0; margin: 0;
line-height: 1.5; line-height: 1.5;
&>div { &>div {
...@@ -365,7 +406,7 @@ a { ...@@ -365,7 +406,7 @@ a {
.description { .description {
margin-bottom: 3px; margin-bottom: 3px;
color: @result-description-color; color: @result-description-color;
font-size: 14px; font-size: 16px;
line-height: 1.3; line-height: 1.3;
clear: both; clear: both;
.date { .date {
...@@ -377,7 +418,7 @@ a { ...@@ -377,7 +418,7 @@ a {
} }
img { img {
margin: 5px; margin: 5px;
margin-left: 0; margin-left: 0px;
margin-right: 15px; margin-right: 15px;
height: auto; height: auto;
width: auto; width: auto;
...@@ -386,11 +427,19 @@ a { ...@@ -386,11 +427,19 @@ a {
border: solid 1px @result-description-img-border-color; border: solid 1px @result-description-img-border-color;
} }
} }
&.ad .description { &.ad {
max-width: 115ch; .ad-label {
overflow: hidden; border: green solid 1px;
text-overflow: ellipsis; padding: 1px;
white-space: nowrap; color: green;
border-radius: 4px;
}
.description {
max-width: 115ch;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
} }
.hoster { .hoster {
font-size: 13px; font-size: 13px;
...@@ -479,15 +528,6 @@ a { ...@@ -479,15 +528,6 @@ a {
} }
} }
#quicktips iframe {
width: 100%;
height: 800px;
background-color: transparent;
border: 0px none transparent;
padding: 0px;
overflow: hidden;
}
.js-only { .js-only {
display: none; display: none;
} }
...@@ -618,10 +658,11 @@ a { ...@@ -618,10 +658,11 @@ a {
} }
} }
@media(max-width: @screen-xs-max) { .resultContainer {
.resultContainer { margin: 0px;
padding-left: 0; padding: 0px;
padding-right: 0; @media(max-width: @screen-xs-max) {
padding-right: 0px;
} }
} }
...@@ -669,7 +710,7 @@ a { ...@@ -669,7 +710,7 @@ a {
} }
.quicktip-summary { .quicktip-summary {
h1 { h1 {
font-size: 16px; font-size: 18px;
font-weight: bold; font-weight: bold;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
...@@ -679,22 +720,25 @@ a { ...@@ -679,22 +720,25 @@ a {
font-size: 20px; font-size: 20px;
} }
} }
p {
font-size: 16px;
}
} }
.quicktip-detail { .quicktip-detail {
border-top: 1px solid #ddd; border-top: 1px solid #ddd;
border-bottom: 1px solid #ddd; border-bottom: 1px solid #ddd;
h2 { h2 {
margin: 10px 0px; margin: 10px 0px;
font-size: 14px; font-size: 17px;
font-weight: bold; font-weight: bold;
} }
p { p {
display: none; display: none;
font-size: 12px; font-size: 15px;
} }
} }
.gefVon { .gefVon {
font-size: 14px; font-size: 15px;
} }
&[type=spruch] { &[type=spruch] {
border-left: 3px solid #070; border-left: 3px solid #070;
......
.sideBar {
position: fixed;
display: block;
right: -140px;
top: 0;
width: 200px;
height: 100%;
background-color: #FFF;
overflow: hidden;
overflow-y: auto;
transition: 0.3s;
z-index: 999;
border-left: 1px solid LightGray;
&>label {
position: fixed;
font-size: 36px;
top: 0px;
right: 20px;
&:after {
content: "≡";
}
}
&>ul {
padding-top: 20%;
padding-left: 0%;
}
& a {
font-size: 12px;
line-height: 20px;
text-decoration: none;
text-indent: 12px;
width: 160px;
&:visited {
color: blue;
}
}
}
.sideBar *:not(label) {
display: none;
}
input#nav0:checked~.sideBar {
right: 0px;
& * {
display: inline-block;
}
}
input#nav0:checked~.sideBar label:after {
content: "×";
}
\ No newline at end of file
...@@ -89,7 +89,6 @@ nav { ...@@ -89,7 +89,6 @@ nav {
ul.metager-dropdown-menu { ul.metager-dropdown-menu {
list-style-type: none; list-style-type: none;
padding-left: 0; padding-left: 0;
position: absolute;
top: 100%; top: 100%;
left: auto; left: auto;
z-index: 1000; z-index: 1000;
...@@ -163,7 +162,7 @@ ul.metager-dropdown-menu { ...@@ -163,7 +162,7 @@ ul.metager-dropdown-menu {
} }
} }
.metager-dropdown:hover { #metager-static-nav-list > li:hover {
background-color: @metager-navbar-toggle-hover-background-color; background-color: @metager-navbar-toggle-hover-background-color;
&>.metager-dropdown-menu { &>.metager-dropdown-menu {
animation-name: dropdown-animation; animation-name: dropdown-animation;
...@@ -193,6 +192,10 @@ ul.metager-dropdown-menu { ...@@ -193,6 +192,10 @@ ul.metager-dropdown-menu {
background-color: @toggle-nav-hide-or-metager-navbar-toggle-background-color; background-color: @toggle-nav-hide-or-metager-navbar-toggle-background-color;
} }
#metager-static-nav-list>li {
padding-top: 10%;
}
@media (max-width: 979px) { @media (max-width: 979px) {
#metager-static-nav-list { #metager-static-nav-list {
width: 100%; width: 100%;
...@@ -203,6 +206,7 @@ ul.metager-dropdown-menu { ...@@ -203,6 +206,7 @@ ul.metager-dropdown-menu {
max-height: 1000px; max-height: 1000px;
} }
#metager-static-nav-list>li { #metager-static-nav-list>li {
padding-top: 5px;
display: initial; display: initial;
} }
ul.metager-dropdown-menu { ul.metager-dropdown-menu {
...@@ -219,11 +223,6 @@ ul.metager-dropdown-menu { ...@@ -219,11 +223,6 @@ ul.metager-dropdown-menu {
} }
} }
@media (min-width: 980px) {
.metager-navbar-toggle {
display: none;
}
}
#color-chooser { #color-chooser {
padding: 0; padding: 0;
......
...@@ -46,4 +46,14 @@ ...@@ -46,4 +46,14 @@
@base-aufruf-winter-border-color: #953535; @base-aufruf-winter-border-color: #953535;
@base-aufruf-winter-btn-color: white; @base-aufruf-winter-btn-color: white;
@base-aufruf-winter-btn-hover-background-color: #bd0d0d; @base-aufruf-winter-btn-hover-background-color: #bd0d0d;
@base-new-feature-badge-background-color: #f80; @base-new-feature-badge-background-color: #f80;
\ No newline at end of file // Bootstrap Ersatz
/*
@screen-sm-min: 768px;
@screen-md-min: 992px;
@screen-lg-min: 1200px;
@screen-xs-max: (@screen-sm-min - 1);
@screen-sm-max: (@screen-md-min - 1);
@screen-md-max: (@screen-lg-min - 1);
@grid-gutter-width: 30px;
*/
\ No newline at end of file
<?php <?php
return [ return [
'werbung' => 'Werbung',
'von' => 'Werbung von', 'von' => 'Werbung von',
]; ];
...@@ -4,4 +4,5 @@ return [ ...@@ -4,4 +4,5 @@ return [
'opensearch' => 'MetaGer: Sicher suchen & finden, Privatsphäre schützen', 'opensearch' => 'MetaGer: Sicher suchen & finden, Privatsphäre schützen',
'startseite' => 'MetaGer-Startseite', 'startseite' => 'MetaGer-Startseite',
'impressum' => 'Impressum', 'impressum' => 'Impressum',
'search-placeholder' => 'Suchbegriff(e) eingeben',
]; ];
<?php <?php
return [ return [
'von' => 'Advertisement by',
]; ];
<?php <?php
return [ return [
"von" => "Reclamo de:"
]; ];
\ No newline at end of file
@extends('layouts.indexPage')
@section('title', $title )
@section('content')
<div class="modal fade" id="plugin-modal" tab-index="-1" role="dialog">
<div class="modal-dialog ">
<div class="content modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
<h4>
@if ($browser === 'Firefox' || $browser === 'Mozilla')
{{ trans('index.plugin.head.1') }}
@elseif ($browser === 'Chrome')
{{ trans('index.plugin.head.2') }}
@elseif ($browser === 'Opera')
{{ trans('index.plugin.head.3') }}
@elseif ($browser === 'IE')
{{ trans('index.plugin.head.4') }}
@elseif ($browser === 'Edge')
{{ trans('index.plugin.head.5') }}
@elseif ($browser === 'Safari')
{{ trans('index.plugin.head.6') }}
@elseif ($browser === 'Vivaldi')
{{ trans('index.plugin.head.6') }}
@else
$(".seperator").addClass("hidden");
@endif
</h4>
<p class="text-muted">{{ trans('index.plugin.head.info') }}</p>
</div>
<div class="modal-body">
@if ($browser === 'Firefox' || $browser === 'Mozilla')
<ol>
<li>{{ trans('index.plugin.firefox.1') }}<img src="/img/Firefox.png" width="100%" /></li>
<li>{{ trans('index.plugin.firefox.2') }}<img src="/img/Firefox_Standard.png" width="100%" /></li>
</ol>