From dde55fe4e78c039baf7c1cedc0a236c46ece51a5 Mon Sep 17 00:00:00 2001
From: Karl Hasselbring <karl@suma-ev.de>
Date: Thu, 4 Oct 2018 12:15:28 +0200
Subject: [PATCH] =?UTF-8?q?Die=20Sidebar=20sieht=20jetzt=20auch=20auf=20de?=
=?UTF-8?q?r=20Ergebnisseite=20passend=20aus.=20Die=20Sidebar=20sieht=20je?=
=?UTF-8?q?tzt=20auch=20auf=20Mobilger=C3=A4ten=20passend=20aus?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../assets/less/metager/result-page.less | 2 +-
resources/assets/less/metager/sidebar.less | 91 +++++++++++--------
.../views/layouts/researchandtabs.blade.php | 3 +-
resources/views/layouts/resultPage.blade.php | 1 +
resources/views/parts/sidebar.blade.php | 2 +-
5 files changed, 57 insertions(+), 42 deletions(-)
diff --git a/resources/assets/less/metager/result-page.less b/resources/assets/less/metager/result-page.less
index 80e8e1977..89d0cb767 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 d4e6fa9af..b2c8cd591 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 142049b56..71d7592b9 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 99bf00699..aa93a8992 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 623970ca3..707010ddc 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">
--
GitLab