...
 
Commits (6)
......@@ -11,6 +11,7 @@ langfiles.zip
# The Files created by Webpack in the build process
/public/**/*.css
!/public/fonts/arimo/stylesheet.css
!/public/fonts/liberationsans/stylesheet.css
/public/**/*.js
/public/mix-manifest.json
......
......@@ -1307,14 +1307,13 @@ class MetaGer
public function generateSearchLink($fokus, $results = true)
{
$except = ['page', 'next'];
$except = ['page', 'next', 'out'];
# Remove every Filter
foreach ($this->sumaFile->filter->{"parameter-filter"} as $filterName => $filter) {
$except[] = $filter->{"get-parameter"};
}
$requestData = $this->request->except($except);
$requestData['focus'] = $fokus;
$requestData['out'] = "";
$link = action('MetaGerSearch@search', $requestData);
return $link;
......
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
@font-face {
font-family: 'Liberation Sans';
src: url('hinted-LiberationSans.eot');
src: local('Liberation Sans'), local('LiberationSans'),
url('hinted-LiberationSans.eot?#iefix') format('embedded-opentype'),
url('hinted-LiberationSans.woff2') format('woff2'),
url('hinted-LiberationSans.woff') format('woff'),
url('hinted-LiberationSans.ttf') format('truetype'),
url('hinted-LiberationSans.svg#LiberationSans') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Liberation Sans';
src: url('hinted-LiberationSans-Italic.eot');
src: local('Liberation Sans Italic'), local('LiberationSans-Italic'),
url('hinted-LiberationSans-Italic.eot?#iefix') format('embedded-opentype'),
url('hinted-LiberationSans-Italic.woff2') format('woff2'),
url('hinted-LiberationSans-Italic.woff') format('woff'),
url('hinted-LiberationSans-Italic.ttf') format('truetype'),
url('hinted-LiberationSans-Italic.svg#LiberationSans-Italic') format('svg');
font-weight: normal;
font-style: italic;
}
@font-face {
font-family: 'Liberation Sans';
src: url('hinted-LiberationSans-Bold.eot');
src: local('Liberation Sans Bold'), local('LiberationSans-Bold'),
url('hinted-LiberationSans-Bold.eot?#iefix') format('embedded-opentype'),
url('hinted-LiberationSans-Bold.woff2') format('woff2'),
url('hinted-LiberationSans-Bold.woff') format('woff'),
url('hinted-LiberationSans-Bold.ttf') format('truetype'),
url('hinted-LiberationSans-Bold.svg#LiberationSans-Bold') format('svg');
font-weight: bold;
font-style: normal;
}
@font-face {
font-family: 'Liberation Sans';
src: url('hinted-LiberationSans-BoldItalic.eot');
src: local('Liberation Sans Bold Italic'), local('LiberationSans-BoldItalic'),
url('hinted-LiberationSans-BoldItalic.eot?#iefix') format('embedded-opentype'),
url('hinted-LiberationSans-BoldItalic.woff2') format('woff2'),
url('hinted-LiberationSans-BoldItalic.woff') format('woff'),
url('hinted-LiberationSans-BoldItalic.ttf') format('truetype'),
url('hinted-LiberationSans-BoldItalic.svg#LiberationSans-BoldItalic') format('svg');
font-weight: bold;
font-style: italic;
}
......@@ -65,26 +65,10 @@ body {
position: relative;
width: 100%;
max-width: @results-width-max;
.scrollfade- {
&left,
&right {
position: absolute;
width: 20px;
height: 95%;
top: 1px;
pointer-events: none;
}
&left {
background: -webkit-gradient(linear, left top, right top, from(@scrollfade-color), color-stop(fade(@scrollfade-color, 80%)), to(fade(@scrollfade-color, 0%)));
background: linear-gradient(to right, @scrollfade-color, fade(@scrollfade-color, 80%), fade(@scrollfade-color, 0%));
left: 1px;
margin-left: -20px;
}
&right {
background: -webkit-gradient(linear, right top, left top, from(@scrollfade-color), color-stop(fade(@scrollfade-color, 80%)), to(fade(@scrollfade-color, 0%)));
background: linear-gradient(to left, @scrollfade-color, fade(@scrollfade-color, 80%), fade(@scrollfade-color, 0%));
right: 1px;
}
.scrollfade-right {
background: -webkit-gradient(linear, right top, left top, from(@scrollfade-color), color-stop(fade(@scrollfade-color, 80%)), to(fade(@scrollfade-color, 0%)));
background: linear-gradient(to left, @scrollfade-color, fade(@scrollfade-color, 80%), fade(@scrollfade-color, 0%));
right: 1px;
}
.search-option-frame {
position: relative;
......
......@@ -332,6 +332,7 @@ a {
#resultpage-container {
margin: @padding-small-default;
margin-top: 0;
display: grid;
grid-template-columns: minmax(0px, 150px) @results-width-max @additions-width-max;
grid-template-areas: "whitespace searchbar ." "whitespace foki ." "whitespace options ." "whitespace results additions" "whitespace footer .";
......@@ -346,6 +347,9 @@ a {
}
#research-bar-container {
grid-area: searchbar;
padding-top: @padding-small-default;
background-color: white;
box-shadow: 0px 1px 3px 2px white, 1px 0px 1px 2px white;
position: sticky;
}
#foki {
......
......@@ -171,7 +171,7 @@
/* Sidebar opener */
// Top right starting position of the sidebar icon
@sidebar-opener-position-top: 23px;
@sidebar-opener-position-top: 22px;
@sidebar-opener-position-right: 25px;
.sidebar-opener {
position: fixed;
......
......@@ -14,7 +14,7 @@
// Default Font
@metager-font:
'Font Awesome 5 Free',
"Arimo",
"Liberation Sans",
"Helvetica Neue",
Helvetica,
Arial,
......
......@@ -18,7 +18,6 @@
</div>
<div id="foki">
<div class="scrollbox">
<div class="scrollfade-left"></div>
<div id="foki-box">
@include('parts.foki')
</div>
......@@ -48,7 +47,6 @@
</div>
<input type="checkbox" id="options-toggle" @if(sizeof($metager->getParameterFilter()) > 0)checked @endif />
<div class="scrollbox">
<div class="scrollfade-left"></div>
<div id="options-box">
<div id="options-items">
@foreach($metager->getAvailableParameterFilter() as $filterName => $filter)
......
......@@ -13,7 +13,7 @@
<meta name="mn" content="{{ $metager->getVerificationCount() }}" />
<meta name="searchkey" content="{{ $metager->getSearchUid() }}" />
<link rel="search" type="application/opensearchdescription+xml" title="{!! trans('resultPage.opensearch') !!}" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), action('StartpageController@loadPlugin', ['params' => base64_encode(serialize(Request::all()))])) }}">
<link href="/fonts/arimo/stylesheet.css" rel="stylesheet">
<link href="/fonts/liberationsans/stylesheet.css" rel="stylesheet">
<link type="text/css" rel="stylesheet" href="{{ mix('css/fontawesome.css') }}" />
<link type="text/css" rel="stylesheet" href="{{ mix('css/fontawesome-solid.css') }}" />
<link type="text/css" rel="stylesheet" href="{{ mix('css/bootstrap.css') }}" />
......
......@@ -13,7 +13,7 @@
<link href="/favicon.ico" rel="icon" type="image/x-icon" />
<link href="/favicon.ico" rel="shortcut icon" type="image/x-icon" />
<link rel="search" type="application/opensearchdescription+xml" title="{{ trans('staticPages.opensearch') }}" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), action('StartpageController@loadPlugin', ['params' => base64_encode(serialize(Request::all()))])) }}">
<link href="/fonts/arimo/stylesheet.css" rel="stylesheet">
<link href="/fonts/liberationsans/stylesheet.css" rel="stylesheet">
<link type="text/css" rel="stylesheet" href="{{ mix('css/fontawesome.css') }}" />
<link type="text/css" rel="stylesheet" href="{{ mix('css/fontawesome-solid.css') }}" />
<link type="text/css" rel="stylesheet" href="{{ mix('css/bootstrap.css') }}" />
......
......@@ -21,26 +21,14 @@
</div>
</div>
<div class="search-hidden">
<input type="hidden" name="encoding" value="utf8">
@if (isset($option_values))
@foreach($option_values as $option => $value)
<input type="hidden" name={{ $option }} value={{ $value }}>
@endforeach
@endif
@if (isset($option_values))
<input type="hidden" name="time" value={{ $time }}>
@endif
@if (isset($focusPages) && !empty($focusPages))
@foreach ($focusPages as $fp)
<input type="hidden" name={{ $fp }} value="on">
@endforeach
@endif
@if (isset($focus) && !empty($focus))
<input type="hidden" name="focus" value={{ $focus }}>
@endif
@if (isset($theme))
<input type="hidden" name="theme" value={{ $theme }}>
@endif
</div>
<div class="search-custom-hidden"></div>
</div>
......