From c4509e7ff64ec9aceae4c756843336a192b0b5a8 Mon Sep 17 00:00:00 2001
From: gcarron <gcarron@grandlyon.com>
Date: Thu, 15 Sep 2022 16:31:42 +0200
Subject: [PATCH 1/2] fix annuaire display for big screen
---
src/app/annuaire/filter-modal/filter-modal.component.scss | 8 ++++----
src/app/annuaire/result-list/result-list.component.scss | 2 +-
src/app/annuaire/search-bar/search-bar.component.scss | 3 ++-
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/app/annuaire/filter-modal/filter-modal.component.scss b/src/app/annuaire/filter-modal/filter-modal.component.scss
index 2f81cc712..09fe3b814 100644
--- a/src/app/annuaire/filter-modal/filter-modal.component.scss
+++ b/src/app/annuaire/filter-modal/filter-modal.component.scss
@@ -7,16 +7,16 @@
@import '../../../assets/scss/z-index';
.modalemployers {
- left: 212px;
+ left: 450px;
@media #{$large-desktop} {
- left: 273px;
+ left: 620px;
}
}
.modaljobs {
- left: 331px;
+ left: 600px;
@media #{$large-desktop} {
- left: 417px;
+ left: 735px;
}
}
diff --git a/src/app/annuaire/result-list/result-list.component.scss b/src/app/annuaire/result-list/result-list.component.scss
index 7d50a6959..ffa95bc69 100644
--- a/src/app/annuaire/result-list/result-list.component.scss
+++ b/src/app/annuaire/result-list/result-list.component.scss
@@ -34,7 +34,7 @@
}
&.notEmpty {
//make sure it fits the correct height no matter the content lengtj and screen height
- max-height: calc(100vh - $footer-height - $header-height - $header-height - 2rem);
+ max-height: calc(100vh - $footer-height - $header-height - $header-height - 5rem);
@media #{$large-phone} {
height: 100%;
}
diff --git a/src/app/annuaire/search-bar/search-bar.component.scss b/src/app/annuaire/search-bar/search-bar.component.scss
index 2560af6a8..14766beb5 100644
--- a/src/app/annuaire/search-bar/search-bar.component.scss
+++ b/src/app/annuaire/search-bar/search-bar.component.scss
@@ -188,7 +188,8 @@ a {
}
}
.filterTags {
- margin: 0.5rem 0 0 0;
+ max-width: 980px;
+ margin: 0.5rem auto 0 auto;
.title {
margin-top: 5px;
color: $grey-3;
--
GitLab
From e0ad47b26e27991181a64e27a5d76f7fb4034d4b Mon Sep 17 00:00:00 2001
From: gcarron <gcarron@grandlyon.com>
Date: Thu, 15 Sep 2022 18:07:59 +0200
Subject: [PATCH 2/2] fix search bar left
---
src/app/annuaire/filter-modal/filter-modal.component.scss | 8 ++++----
src/app/annuaire/search-bar/search-bar.component.scss | 6 ++----
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/app/annuaire/filter-modal/filter-modal.component.scss b/src/app/annuaire/filter-modal/filter-modal.component.scss
index 09fe3b814..2f81cc712 100644
--- a/src/app/annuaire/filter-modal/filter-modal.component.scss
+++ b/src/app/annuaire/filter-modal/filter-modal.component.scss
@@ -7,16 +7,16 @@
@import '../../../assets/scss/z-index';
.modalemployers {
- left: 450px;
+ left: 212px;
@media #{$large-desktop} {
- left: 620px;
+ left: 273px;
}
}
.modaljobs {
- left: 600px;
+ left: 331px;
@media #{$large-desktop} {
- left: 735px;
+ left: 417px;
}
}
diff --git a/src/app/annuaire/search-bar/search-bar.component.scss b/src/app/annuaire/search-bar/search-bar.component.scss
index 14766beb5..470df4363 100644
--- a/src/app/annuaire/search-bar/search-bar.component.scss
+++ b/src/app/annuaire/search-bar/search-bar.component.scss
@@ -17,8 +17,7 @@
.content {
display: flex;
align-items: center;
- max-width: 980px;
- margin: 0 auto 0.5rem auto;
+ margin-bottom: 0.5rem;
input {
@include lato-regular-13;
@include input-search;
@@ -188,8 +187,7 @@ a {
}
}
.filterTags {
- max-width: 980px;
- margin: 0.5rem auto 0 auto;
+ margin-top: 0.5rem;
.title {
margin-top: 5px;
color: $grey-3;
--
GitLab