From 2f3bdaa2e517bc5d15de059f8e2d64cb2bf9e876 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Fri, 5 Jun 2020 11:25:57 +0200 Subject: [PATCH] update: sidebar - access when in admin on mobile --- src/index.pug | 2 +- src/styles/base/main.scss | 29 ++++++++++------------ src/styles/base/new.scss | 0 src/styles/components/sidebar.scss | 16 ++++++++---- src/styles/index.scss | 2 +- src/views/admin/page-admin-circles.pug | 3 ++- src/views/admin/page-admin-projects.pug | 3 ++- src/views/admin/page-admin-users.pug | 3 ++- src/views/circle/page-circle-profile.pug | 2 +- src/views/project/page-project-profile.pug | 4 +-- 10 files changed, 35 insertions(+), 29 deletions(-) delete mode 100644 src/styles/base/new.scss diff --git a/src/index.pug b/src/index.pug index 80f8b66..97837af 100644 --- a/src/index.pug +++ b/src/index.pug @@ -23,7 +23,7 @@ html(lang="en") nav#main__menu.left-menu.jsLeftMenu include menu-left.pug - main.box.content.notLoggedIn + main#viewport.content.notLoggedIn if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards) #dashboard(hidden).no-sidebar.with-padding diff --git a/src/styles/base/main.scss b/src/styles/base/main.scss index 4d56b7f..880b272 100644 --- a/src/styles/base/main.scss +++ b/src/styles/base/main.scss @@ -262,10 +262,6 @@ h5 { border-bottom: 1px solid var(--color-content-header); padding: 3rem; - @include breakpoint(sm) { - background: var(--color-grey-10); - } - sib-display { @include breakpoint(sm) { float: left; @@ -273,20 +269,18 @@ h5 { } .mobile-sidebar-button { - @include breakpoint(sm) { - float: right; - color: var(--color-secondary); - font-size: 1.8rem; - font-weight: bold!important; + float: right; + color: var(--color-secondary); + font-size: 1.8rem; + font-weight: bold!important; - &::before { - font-size: 2.2rem; - font-weight: normal; - margin-right: 1.2rem; - } + &::before { + font-size: 2.2rem; + font-weight: normal; + margin-right: 1.2rem; } - @include breakpoint($min: 1025px, $max: 0) { + @include breakpoint(lg) { display: none; } } @@ -383,7 +377,10 @@ h5 { .space-between { justify-content: space-between; - padding-bottom: 1.4rem; + + &.with-padding { + padding-bottom: 1.4rem; + } } .section { diff --git a/src/styles/base/new.scss b/src/styles/base/new.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/styles/components/sidebar.scss b/src/styles/components/sidebar.scss index ef70cd7..72c0c33 100644 --- a/src/styles/components/sidebar.scss +++ b/src/styles/components/sidebar.scss @@ -18,7 +18,8 @@ /*-webkit-backface-visibility: hidden;*/ &.sidebar-is-closed { - @include breakpoint(769px, 0) { + + @include breakpoint(lg) { margin-left: -15.5rem; transform: translate(15.5rem); } @@ -141,9 +142,10 @@ } &.jsRightMenu { + display: none; - @include breakpoint(sm) { - display: none; + @include breakpoint(lg) { + display: block; } } @@ -157,7 +159,7 @@ &.jsRightMenu[open] { - @include breakpoint(sm) { + @include breakpoint(md) { display: block; background: var(--color-right-menu-background); bottom: 0; @@ -165,9 +167,13 @@ min-width: 60%; position: fixed; right: 0; - top: 83px; + top: 50px; z-index: 1; } + + @include breakpoint(lg) { + top: 83px; + } } } } diff --git a/src/styles/index.scss b/src/styles/index.scss index 17c8993..59094ef 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -9,7 +9,7 @@ @import 'components/icons/index'; @import 'base/main'; -div#viewport { +#viewport { display: flex; flex: 1; /*height: auto; diff --git a/src/views/admin/page-admin-circles.pug b/src/views/admin/page-admin-circles.pug index 4b1dcda..186abc8 100644 --- a/src/views/admin/page-admin-circles.pug +++ b/src/views/admin/page-admin-circles.pug @@ -4,8 +4,9 @@ sib-route(name='admin-circle-create') sib-route(name='circle-left') - div.content-box__header + div.content-box__header.flex.space-between h1.without-margin Administration + button.mobile-sidebar-button.jsMobileSidebarOpenButton.icon-arrow-left-circle MENU include ../circle/page-circle-left.pug diff --git a/src/views/admin/page-admin-projects.pug b/src/views/admin/page-admin-projects.pug index f29b971..27ced85 100644 --- a/src/views/admin/page-admin-projects.pug +++ b/src/views/admin/page-admin-projects.pug @@ -4,8 +4,9 @@ sib-route(name='admin-project-create') sib-route(name='project-left') - div.content-box__header + div.content-box__header.flex.space-between h1.without-margin Administration + button.mobile-sidebar-button.jsMobileSidebarOpenButton.icon-arrow-left-circle MENU #project-left(hidden) include ../project/page-project-left.pug diff --git a/src/views/admin/page-admin-users.pug b/src/views/admin/page-admin-users.pug index 42c8bd9..d318372 100644 --- a/src/views/admin/page-admin-users.pug +++ b/src/views/admin/page-admin-users.pug @@ -4,8 +4,9 @@ sib-route(name='admin-users-create') sib-route(name='admin-users-edit') - div.content-box__header + div.content-box__header.flex.space-between h1.without-margin Administration + button.mobile-sidebar-button.jsMobileSidebarOpenButton.icon-arrow-left-circle MENU sib-widget(name='hubl-sib-action-custom') template diff --git a/src/views/circle/page-circle-profile.pug b/src/views/circle/page-circle-profile.pug index cb742af..3efd574 100644 --- a/src/views/circle/page-circle-profile.pug +++ b/src/views/circle/page-circle-profile.pug @@ -6,7 +6,7 @@ sib-router(default-route='circle-profile', hidden) include ../../templates/hubl-circle-team.pug .content-box__info - .flex.space-between + .flex.space-between.with-padding sib-display( bind-resources fields='creationDateSet(title, creationDate)' diff --git a/src/views/project/page-project-profile.pug b/src/views/project/page-project-profile.pug index edc558c..3f5c74a 100644 --- a/src/views/project/page-project-profile.pug +++ b/src/views/project/page-project-profile.pug @@ -9,7 +9,7 @@ sib-router(default-route='project-profile', hidden) .content-box__info.flex - .flex.space-between + .flex.space-between.with-padding sib-display( bind-resources fields='creationDateSet(title, creationDate)' @@ -24,7 +24,7 @@ sib-router(default-route='project-profile', hidden) sib-link(class='button text-bold text-uppercase reversed button-primary bordered with-icon icon-pencil' next='project-edit' bind-resources) Modifier et ajouter un membre - .flex.space-between + .flex.space-between.with-padding sib-display( bind-resources fields='label-captain, captain'