diff --git a/frontend/assets/scss/abstract/placeholders/_placeholders.scss b/frontend/assets/scss/abstract/placeholders/_placeholders.scss index ca347a9fbc..04338a05ce 100644 --- a/frontend/assets/scss/abstract/placeholders/_placeholders.scss +++ b/frontend/assets/scss/abstract/placeholders/_placeholders.scss @@ -81,6 +81,16 @@ margin: 0 auto; padding: 4em; } +%collapsable-if-metrics { + padding-right: calc($sidebarMenuWidth + 15px); + transition: padding 0.25s linear 0.2s; + .--metrics & { + @include media(">desktop") { + padding-right: calc($sidebarWidth + 25px); + transition: padding 0.25s linear; + } + } +} // buttons %button { @@ -202,12 +212,12 @@ width: auto; height: auto; opacity: 1; - transition: opacity 0.2s ease; + transition: opacity 0.1s ease 0.2s; z-index: 2; } &:before { opacity: 1; - transition: opacity 0.2s ease; + transition: opacity 0.1s ease 0.2s; } } } \ No newline at end of file diff --git a/frontend/components/commons/header/filters/FiltersArea.vue b/frontend/components/commons/header/filters/FiltersArea.vue index 4ad9f9007c..e75a926a0a 100644 --- a/frontend/components/commons/header/filters/FiltersArea.vue +++ b/frontend/components/commons/header/filters/FiltersArea.vue @@ -121,13 +121,7 @@ export default { padding-top: 0; padding-bottom: 0; margin-left: 0; - padding-right: calc($sidebarMenuWidth + 15px); - .--metrics & { - @include media(">desktop") { - padding-right: calc($sidebarWidth + 25px); - transition: padding 0.1s ease-in-out; - } - } + @extend %collapsable-if-metrics !optional; } .filters { diff --git a/frontend/components/commons/header/global-actions/GlobalActions.vue b/frontend/components/commons/header/global-actions/GlobalActions.vue index 1b34e29ac4..b64347b9ad 100644 --- a/frontend/components/commons/header/global-actions/GlobalActions.vue +++ b/frontend/components/commons/header/global-actions/GlobalActions.vue @@ -45,17 +45,7 @@ export default { padding-top: 0; padding-bottom: 0; padding-left: 4em; - padding-right: calc($sidebarMenuWidth + 15px); - .--metrics & { - @include media(">desktop") { - padding-right: calc($sidebarWidth + 25px); - transition: padding 0.1s ease-in-out; - } - } - @include media(">desktop") { - transition: padding 0.1s ease-in-out; - width: 100%; - } + @extend %collapsable-if-metrics !optional; } .global-actions { display: flex; diff --git a/frontend/components/commons/results/ResultsList.vue b/frontend/components/commons/results/ResultsList.vue index d33b7dd179..d19b32586d 100644 --- a/frontend/components/commons/results/ResultsList.vue +++ b/frontend/components/commons/results/ResultsList.vue @@ -167,24 +167,12 @@ export default { diff --git a/frontend/components/commons/sidebar/SidebarMenu.vue b/frontend/components/commons/sidebar/SidebarMenu.vue index 82e56d28f8..84aef34e5b 100644 --- a/frontend/components/commons/sidebar/SidebarMenu.vue +++ b/frontend/components/commons/sidebar/SidebarMenu.vue @@ -93,17 +93,19 @@ export default { $sidebar-button-size: 45px; $color: #333346; .sidebar { - position: fixed; - top: 56px; - right: 0; + top: 0; width: $sidebar-button-size; min-width: $sidebar-button-size; min-height: 100vh; min-width: $sidebarMenuWidth; - border-left: 1px solid palette(grey, smooth); + background: $bg; + box-shadow: none; + pointer-events: all; z-index: 1; + transition: box-shadow 0.2s ease-in-out 0.4s; .--metrics & { - border-color: transparent; + box-shadow: inset 1px 1px 5px -2px #c7c7c7; + transition: box-shadow 0.2s ease-in-out; } p { text-align: center; diff --git a/frontend/components/commons/sidebar/SidebarPanel.vue b/frontend/components/commons/sidebar/SidebarPanel.vue index 5a8fabdc10..aa97f4c057 100644 --- a/frontend/components/commons/sidebar/SidebarPanel.vue +++ b/frontend/components/commons/sidebar/SidebarPanel.vue @@ -19,11 +19,14 @@