From be6fcfb526e7a83f0fa8e63dd7f0f74cd513696a Mon Sep 17 00:00:00 2001 From: Jimmy Cai Date: Thu, 3 Sep 2020 23:37:48 +0200 Subject: [PATCH] feat(sidebar): prevent sidebar from moving on page scroll --- assets/scss/partials/sidebar.scss | 5 +++-- assets/scss/style.scss | 21 ++++++++------------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/assets/scss/partials/sidebar.scss b/assets/scss/partials/sidebar.scss index 8732a52..6fabb3f 100644 --- a/assets/scss/partials/sidebar.scss +++ b/assets/scss/partials/sidebar.scss @@ -19,14 +19,15 @@ } &.sticky { - top: 30px; + top: 0; } @media (min-width: $on-phone + 1) { width: 25%; margin-right: 1%; + padding-top: 50px; } - + @media (min-width: $on-desktop) { width: 20%; } diff --git a/assets/scss/style.scss b/assets/scss/style.scss index fcbf9a1..d6b3800 100644 --- a/assets/scss/style.scss +++ b/assets/scss/style.scss @@ -47,9 +47,14 @@ a { } } -#content { - @media (min-width: $on-phone) { - padding-top: 30px; +main.main { + min-width: 0; + padding: 0 15px; + max-width: 100%; + flex-grow: 1; + + @media (min-width: $on-phone + 1) { + padding-top: 15px; } @media (min-width: $on-tablet) { @@ -57,16 +62,6 @@ a { } } -main.main { - min-width: 0; - padding: 0 15px; - max-width: 100%; - @media (min-width: $on-phone + 1) { - padding: 0 15px; - } - flex-grow: 1; -} - .main-grid { @media (max-width: $on-phone) { flex-direction: column;