diff --git a/src/index.pug b/src/index.pug index eb91c41b58d8a19e47b87147d63783f8a282151f..c778e1552b86f55c246d273aa7a1bebaf523f384 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 60711e8363c5727b32bf2155a917cbe6827f9d34..61dd4abc9103131787c14b84dc2e5889a068e1a6 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 1e848256924a4fb7cc7caa46aeedba794a46bc15..d5c278bb1379aba00de9082f0bbc6654dbbdcdda 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 72fdbba3fa18edfa240bf8d0eadf5ced2f8953a4..bdbee892d49028b1fe28c66b06f1266211500c13 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';