Skip to content
Snippets Groups Projects
Commit 0f2b8daf authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Merge branch '734-links-rand-auf-ergebnisseite' into 'development'

Resolve "Links Rand auf Ergebnisseite"

Closes #734

See merge request !1223
parents 462be1a1 46f5ce09
No related branches found
No related tags found
1 merge request!1365Resolve "Filter Options for MetaGer"
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
// //
@resultpage-background-color: #FAFAFA; @resultpage-background-color: #FAFAFA;
// //
@results-margin-left: @resultpage-leftbox-big-screen-margin-left; @results-margin-left: 16px;
// //
@result-page-body-background-color: @background-color; @result-page-body-background-color: @background-color;
@result-page-a-hover-color: red; @result-page-a-hover-color: red;
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
@resultpage-leftbox-max-width: @results-width-max; @resultpage-leftbox-max-width: @results-width-max;
@resultpage-leftbox-min-dist-left-right: @padding-small-default; @resultpage-leftbox-min-dist-left-right: @padding-small-default;
@resultpage-leftbox-min-dist-top-bottom: @padding-small-default; @resultpage-leftbox-min-dist-top-bottom: @padding-small-default;
@resultpage-leftbox-big-screen-margin-left: 50px;
// //
@logo-size-breakpoint: (@results-width-min + @padding-small-default * 2); @logo-size-breakpoint: (@results-width-min + @padding-small-default * 2);
// //
...@@ -355,6 +354,7 @@ a { ...@@ -355,6 +354,7 @@ a {
#resultpage-container { #resultpage-container {
margin: @padding-small-default; margin: @padding-small-default;
margin-left: @results-margin-left;
display: grid; display: grid;
grid-template-columns: @results-width-max @additions-width-max; grid-template-columns: @results-width-max @additions-width-max;
grid-template-areas: "searchbar ." "foki ." "results additions"; grid-template-areas: "searchbar ." "foki ." "results additions";
...@@ -366,9 +366,6 @@ a { ...@@ -366,9 +366,6 @@ a {
background-color: @resultpage-background-color; background-color: @resultpage-background-color;
#research-bar-container { #research-bar-container {
grid-area: searchbar; grid-area: searchbar;
/**/
width: (@results-width-max + @padding-small-default * 2);
max-width: (@results-width-max + @padding-small-default * 2);
} }
#research-bar-placeholder { #research-bar-placeholder {
grid-area: searchbar; grid-area: searchbar;
...@@ -399,17 +396,12 @@ a { ...@@ -399,17 +396,12 @@ a {
} }
@media (max-width: @resultpage-breakpoint-large) { @media (max-width: @resultpage-breakpoint-large) {
@supports (display: grid) { @supports (display: grid) {
#research-bar-container {
width: ~"calc(60% - 1px)";
}
grid-template-columns:~"calc(60% - 8px)"~"calc(40% - 8px)"; grid-template-columns:~"calc(60% - 8px)"~"calc(40% - 8px)";
grid-template-areas: "searchbar ." "foki ." "results additions"; grid-template-areas: "searchbar ." "foki ." "results additions";
} }
} }
@media (max-width: @resultpage-breakpoint-small) { @media (max-width: @resultpage-breakpoint-small) {
#research-bar-container { margin-left: @padding-small-default;
width: 100%;
}
grid-template-columns: 100%; grid-template-columns: 100%;
grid-template-areas: "searchbar" "foki" "results"; grid-template-areas: "searchbar" "foki" "results";
#additions-container { #additions-container {
...@@ -419,12 +411,24 @@ a { ...@@ -419,12 +411,24 @@ a {
} }
#research-bar-container { #research-bar-container {
margin-left: (@results-margin-left - @padding-small-default);
position: fixed; position: fixed;
z-index: 100; z-index: 100;
top: 0; top: 0;
left: 0; left: 0;
background-color: @resultpage-background-color; background-color: @resultpage-background-color;
padding: 8px 8px 0px 8px; padding: @padding-small-default @padding-small-default 0px @padding-small-default;
width: (@results-width-max + 2 * @padding-small-default);
max-width: (@results-width-max + 2 * @padding-small-default);
@media (max-width: @resultpage-breakpoint-large) {
@supports (display: grid) {
width: ~"calc(60% - 6px)";
}
}
@media (max-width: @resultpage-breakpoint-small) {
width: 100%;
margin-left: 0px;
}
#research-bar { #research-bar {
background-color: white; background-color: white;
border: 1px solid #ccc; border: 1px solid #ccc;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment