From 700692b1ab5a4e635e48941e79ec85e624956db6 Mon Sep 17 00:00:00 2001
From: gaelle morin <gmorin.dev@gmail.com>
Date: Tue, 24 Nov 2020 00:24:51 +0100
Subject: [PATCH] feature: general layou : clean
---
src/index.pug | 4 ++--
src/styles/base/header.scss | 1 -
src/styles/base/main.scss | 20 ++++++++++----------
src/styles/index.scss | 5 -----
4 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/src/index.pug b/src/index.pug
index eb91c41b..c778e155 100644
--- a/src/index.pug
+++ b/src/index.pug
@@ -22,10 +22,10 @@ html(lang="en")
header#header.segment.bg-color-white.shadow
include header.pug
- nav#main__menu.segment.bg-color-heading.text-small.text-color-white.left-menu.jsLeftMenu
+ nav#main__menu.segment.float-left.bg-color-heading.text-small.text-color-white.left-menu.jsLeftMenu
include menu-left.pug
- main#viewport.content.notLoggedIn
+ main#viewport.segment.float-left.content.notLoggedIn
if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards)
#dashboard(hidden, data-view="dashboard").no-sidebar.with-padding
diff --git a/src/styles/base/header.scss b/src/styles/base/header.scss
index 60711e83..61dd4abc 100644
--- a/src/styles/base/header.scss
+++ b/src/styles/base/header.scss
@@ -466,4 +466,3 @@ solid-notifications {
display: none;
}
}
-
diff --git a/src/styles/base/main.scss b/src/styles/base/main.scss
index 1e848256..d5c278bb 100644
--- a/src/styles/base/main.scss
+++ b/src/styles/base/main.scss
@@ -347,12 +347,12 @@ solid-dashboard section {
}*/
.left-menu {
- grid-area: leftmenu;
+ /*grid-area: leftmenu;*/
@include breakpoint(lg) {
- height: calc(100vh - 83px); /* 83px = nav height */
- position: sticky;
- top: 0;
+ height: calc(100vh - 72px); /* 72px = nav height */
+ /*position: sticky;
+ top: 0;*/
overflow-x: hidden;
overflow-y: scroll;
}
@@ -382,14 +382,14 @@ solid-dashboard section {
}
.content {
- grid-area: content;
+ /*grid-area: content;*/
@include breakpoint(lg) {
- position: sticky;
- top: 0;
- overflow-y: auto;
- height: calc(100vh - 83px);
- overflow-x: hidden;
+ /*position: sticky;
+ top: 0;*/
+ /*overflow-y: auto;*/
+ height: calc(100vh - 72px);
+ /*overflow-x: hidden;*/
}
}
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 72fdbba3..bdbee892 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -12,11 +12,6 @@
@import 'base/about';
#viewport {
- display: flex;
- flex: 1;
- /*height: auto;
- min-height: 100vh;*/
- overflow-y: auto;
@import 'components/index';
@import 'layout/members/index';
@import 'layout/job-offers/index';
--
GitLab