diff --git a/resources/assets/less/metager/result-page.less b/resources/assets/less/metager/result-page.less index 80e8e197712a5b76053596ef3782dbf246f61427..89d0cb767d9d539e42eb955f42c2b223aed03bd5 100644 --- a/resources/assets/less/metager/result-page.less +++ b/resources/assets/less/metager/result-page.less @@ -407,7 +407,7 @@ a { #research-bar-container { margin-left: (@results-margin-left - @padding-small-default); position: fixed; - z-index: 100; + z-index: 5; top: 0; left: 0; background-color: @resultpage-background-color; diff --git a/resources/assets/less/metager/sidebar.less b/resources/assets/less/metager/sidebar.less index d4e6fa9af103527579bd21262e5857381c74ea20..b2c8cd5915c1b9b2a93d93a59dfaca1b7255030a 100644 --- a/resources/assets/less/metager/sidebar.less +++ b/resources/assets/less/metager/sidebar.less @@ -17,40 +17,42 @@ background-color: white; transition: 0.5s; border-left: none; - &>ul { - padding-top: 20px; + .sidebar-logo { + margin-bottom: 20px; + } + .sidebar-list { padding-left: 0; list-style: none; margin-left: -5px; - } - .sidebar-list>li { - width: 100%; - padding: 10px 0px; - &:hover { - background-color: @color-almost-white; - } - &>label, - &>a { - &:focus { - outline: none; - } - &>i.fa { - width: 30px; - text-align: center; - margin-right: 7px; - } - } - &>label { - font-size: 16px; - font-weight: normal; - text-decoration: none; - text-indent: 12px; - color: black; - line-height: 20px; - display: inline-block; + &>li { width: 100%; + padding: 10px 0px; &:hover { - color: red; + background-color: @color-almost-white; + } + &>label, + &>a { + &:focus { + outline: none; + } + &>i.fa { + width: 30px; + text-align: center; + margin-right: 7px; + } + } + &>label { + font-size: 16px; + font-weight: normal; + text-decoration: none; + text-indent: 12px; + color: black; + line-height: 20px; + display: inline-block; + width: 100%; + &:hover { + color: red; + } } } } @@ -162,7 +164,7 @@ input#sidebarToggle:checked { line-height: 23px; border-radius: 5px; color: grey; - background-color: transparent; + background-color: white; &:after { content: "≡"; } @@ -171,17 +173,30 @@ input#sidebarToggle:checked { } } +.sidebar-opener-placeholder { + display: none; + width: 45px; +} + @media (max-width: @screen-xs-max) { .sidebar { - right: -90%; - width: 90%; - overflow: auto; - .sidebar-list { - max-height: 1000px; + .sidebar-logo { + display: none; + } + .sidebar { + right: -90%; + width: 90%; + overflow: auto; + .sidebar-list { + max-height: 1000px; + } + } + ul.metager-dropdown-content { + position: inherit; + width: 100%; } } - ul.metager-dropdown-content { - position: inherit; - width: 100%; + .sidebar-opener-placeholder { + display: initial; } } \ No newline at end of file diff --git a/resources/views/layouts/researchandtabs.blade.php b/resources/views/layouts/researchandtabs.blade.php index 142049b56bcb121f01d62b212c31fd3c625f153e..71d7592b9b54278e283e2ff5f6adc44257f0d9da 100644 --- a/resources/views/layouts/researchandtabs.blade.php +++ b/resources/views/layouts/researchandtabs.blade.php @@ -12,12 +12,11 @@ <div id="header-searchbar"> @include('parts.searchbar', ['class' => 'resultpage-searchbar', 'request' => Request::method()]) </div> - @include('parts.sidebar-opener') + <div class="sidebar-opener-placeholder"></div> </div> </div> <div id="research-bar-placeholder"> </div> - @include('parts.sidebar-opener', ['class' => 'fixed']) <div id="foki"> <div class="scrollbox"> <div class="foki-scrollfade-left"></div> diff --git a/resources/views/layouts/resultPage.blade.php b/resources/views/layouts/resultPage.blade.php index 99bf006997652e64f2165a1b275c80aea00621fc..aa93a89927b56a1498ce37f56c9df52f2a56ffbf 100644 --- a/resources/views/layouts/resultPage.blade.php +++ b/resources/views/layouts/resultPage.blade.php @@ -26,6 +26,7 @@ </div> @endif @include('parts.sidebar', ['id' => 'resultPageSideBar']) + @include('parts.sidebar-opener', ['class' => 'fixed']) @if( !isset($suspendheader) ) @include('modals.create-focus-modal') @include('layouts.researchandtabs') diff --git a/resources/views/parts/sidebar.blade.php b/resources/views/parts/sidebar.blade.php index 623970ca34acd11617abec0749cdf7958042a87f..707010ddce56ee1fd6f4ea91f195cb6b1a7533be 100644 --- a/resources/views/parts/sidebar.blade.php +++ b/resources/views/parts/sidebar.blade.php @@ -1,6 +1,6 @@ <input id="sidebarToggle" class="hidden" type="checkbox"> <div class="sidebar"> - <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"> + <a class="sidebar-logo" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"> <p>MetaGer</p> </a> <ul class="sidebar-list">