Commit 895fef72 authored by Dominik Hebeler's avatar Dominik Hebeler

added more space to the left of the results

parent 14604ae5
...@@ -6,7 +6,7 @@ use App; ...@@ -6,7 +6,7 @@ use App;
use App\MetaGer; use App\MetaGer;
use Illuminate\Http\Request; use Illuminate\Http\Request;
const TIP_SERVER = 'http://localhost:63825/tips.xml'; const TIP_SERVER = 'http://metager3.de:63825/tips.xml';
class MetaGerSearch extends Controller class MetaGerSearch extends Controller
{ {
...@@ -76,7 +76,7 @@ class MetaGerSearch extends Controller ...@@ -76,7 +76,7 @@ class MetaGerSearch extends Controller
public function tips(Request $request) public function tips(Request $request)
{ {
$tips_text = file_get_contents(TIP_SERVER); $tips_text = file_get_contents(TIP_SERVER);
$tips = []; $tips = [];
try { try {
$tips_xml = simplexml_load_string($tips_text); $tips_xml = simplexml_load_string($tips_text);
......
...@@ -334,21 +334,20 @@ a { ...@@ -334,21 +334,20 @@ a {
margin: @padding-small-default; margin: @padding-small-default;
margin-left: @results-margin-left; margin-left: @results-margin-left;
display: grid; display: grid;
grid-template-columns: @results-width-max @additions-width-max; grid-template-columns: minmax(0px, 150px) @results-width-max @additions-width-max;
grid-template-areas: "searchbar ." "foki ." "options ." "results additions"; grid-template-areas: "whitespace searchbar ." "whitespace foki ." "whitespace options ." "whitespace results additions" "whitespace footer .";
grid-column-gap: (@padding-small-default * 2); grid-column-gap: (@padding-small-default * 2);
grid-row-gap: @padding-small-default; grid-row-gap: @padding-small-default;
justify-items: stretch; justify-items: stretch;
align-items: stretch; align-items: stretch;
/**/ /**/
background-color: @resultpage-background-color; background-color: @resultpage-background-color;
#research-bar-container { #whitespace {
grid-area: searchbar; grid-area: whitespace;
} }
#research-bar-placeholder { #research-bar-container {
grid-area: searchbar; grid-area: searchbar;
/**/ position: sticky;
max-width: @results-width-max;
} }
#foki { #foki {
grid-area: foki; grid-area: foki;
...@@ -372,16 +371,19 @@ a { ...@@ -372,16 +371,19 @@ a {
display: none; display: none;
} }
} }
footer {
grid-area: footer;
}
@media (max-width: @resultpage-breakpoint-max) { @media (max-width: @resultpage-breakpoint-max) {
@supports (display: grid) { @supports (display: grid) {
grid-template-columns:~"calc(60% - 8px)"~"calc(40% - 8px)"; grid-template-columns:~"calc(60% - 8px)"~"calc(40% - 8px)";
grid-template-areas: "searchbar ." "foki ." "options ." "results additions"; grid-template-areas: "searchbar ." "foki ." "options ." "results additions" "footer .";
} }
} }
@media (max-width: @resultpage-breakpoint-min) { @media (max-width: @resultpage-breakpoint-min) {
margin-left: @padding-small-default; margin-left: @padding-small-default;
grid-template-columns: 100%; grid-template-columns: 100%;
grid-template-areas: "searchbar" "foki" "options" "results"; grid-template-areas: "searchbar" "foki" "options" "results" "footer";
#additions-container { #additions-container {
display: none; display: none;
} }
...@@ -389,24 +391,12 @@ a { ...@@ -389,24 +391,12 @@ a {
} }
#research-bar-container { #research-bar-container {
margin-left: (@results-margin-left - @padding-small-default); position: sticky;
position: fixed;
z-index: 5; z-index: 5;
top: 0; top: 0;
left: 0; left: 0;
background-color: @resultpage-background-color; background-color: @resultpage-background-color;
padding: @padding-small-default @padding-small-default 0px @padding-small-default; max-width: @results-width-max;
width: (@results-width-max + 2 * @padding-small-default);
max-width: (@results-width-max + 2 * @padding-small-default);
@media (max-width: @resultpage-breakpoint-max) {
@supports (display: grid) {
width: ~"calc(60% - 6px)";
}
}
@media (max-width: @resultpage-breakpoint-min) {
width: 100%;
margin-left: 0px;
}
#research-bar { #research-bar {
background-color: white; background-color: white;
border: 1px solid #ccc; border: 1px solid #ccc;
...@@ -568,6 +558,7 @@ a { ...@@ -568,6 +558,7 @@ a {
} }
footer.resultPageFooter { footer.resultPageFooter {
max-width: @results-width-max; max-width: @results-width-max;
margin-top: 20px; margin-top: 20px;
@media (max-width: (2 * @results-margin-left + @results-width-max - 1px)) { @media (max-width: (2 * @results-margin-left + @results-width-max - 1px)) {
......
<div id="resultpage-container"> <div id="resultpage-container">
<div id="whitespace"></div>
<div id="research-bar-container"> <div id="research-bar-container">
<div id="research-bar"> <div id="research-bar">
<div id="header-logo"> <div id="header-logo">
...@@ -15,8 +16,6 @@ ...@@ -15,8 +16,6 @@
<div class="sidebar-opener-placeholder"></div> <div class="sidebar-opener-placeholder"></div>
</div> </div>
</div> </div>
<div id="research-bar-placeholder">
</div>
<div id="foki"> <div id="foki">
<div class="scrollbox"> <div class="scrollbox">
<div class="scrollfade-left"></div> <div class="scrollfade-left"></div>
...@@ -81,4 +80,5 @@ ...@@ -81,4 +80,5 @@
</div> </div>
@endif @endif
</div> </div>
@include('parts.footer', ['type' => 'resultpage', 'id' => 'resultPageFooter'])
</div> </div>
...@@ -40,8 +40,8 @@ ...@@ -40,8 +40,8 @@
@yield('results') @yield('results')
</div> </div>
</div> </div>
@include('parts.footer', ['type' => 'resultpage', 'id' => 'resultPageFooter'])
@endif @endif
@include('parts.footer', ['type' => 'resultpage', 'id' => 'resultPageFooter'])
<script src="{{ mix('js/lib.js') }}"></script> <script src="{{ mix('js/lib.js') }}"></script>
<script src="{{ mix('js/scriptResultPage.js') }}" defer></script> <script src="{{ mix('js/scriptResultPage.js') }}" defer></script>
<script src="{{ mix('js/focus-creator.js') }}" defer></script> <script src="{{ mix('js/focus-creator.js') }}" defer></script>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment