From b2143cd5b45162530e29a8bacb48acaed05bad4c Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Wed, 4 Dec 2024 11:20:16 -0600 Subject: [PATCH] Reset --- bskyweb/templates/base.html | 7 +------ src/view/shell/desktop/LeftNav.tsx | 4 ---- src/view/shell/desktop/RightNav.tsx | 4 ---- web/index.html | 22 +--------------------- 4 files changed, 2 insertions(+), 35 deletions(-) diff --git a/bskyweb/templates/base.html b/bskyweb/templates/base.html index 62d44bc9c4..8edcaa3cc2 100644 --- a/bskyweb/templates/base.html +++ b/bskyweb/templates/base.html @@ -38,14 +38,8 @@ font-style: italic; font-display: swap; } - :root { - --scrollbar-offset: 0px; - --scrollbar-offset-negative: 0px; - } html { background-color: white; - scrollbar-gutter: stable; - overflow-y: scroll; } @media (prefers-color-scheme: dark) { html { @@ -84,6 +78,7 @@ /* We need this style to prevent web dropdowns from shifting the display when opening */ body { width: 100%; + overflow-y: scroll; } diff --git a/src/view/shell/desktop/LeftNav.tsx b/src/view/shell/desktop/LeftNav.tsx index 40cb724564..773275d4c7 100644 --- a/src/view/shell/desktop/LeftNav.tsx +++ b/src/view/shell/desktop/LeftNav.tsx @@ -490,10 +490,6 @@ const styles = StyleSheet.create({ { translateX: '-100%', }, - { - // @ts-ignore web only -esb - translateX: 'var(--scrollbar-offset-negative, 0px)', - }, ], width: 240, // @ts-ignore web only diff --git a/src/view/shell/desktop/RightNav.tsx b/src/view/shell/desktop/RightNav.tsx index eb2101f001..65d0ed6b46 100644 --- a/src/view/shell/desktop/RightNav.tsx +++ b/src/view/shell/desktop/RightNav.tsx @@ -127,10 +127,6 @@ const styles = StyleSheet.create({ { translateX: 300, }, - { - // @ts-ignore web only -esb - translateX: 'var(--scrollbar-offset, 0px)', - }, ], maxHeight: '100%', overflowY: 'auto', diff --git a/web/index.html b/web/index.html index 20aab1dd75..b5c373636b 100644 --- a/web/index.html +++ b/web/index.html @@ -43,14 +43,8 @@ font-style: italic; font-display: swap; } - :root { - --scrollbar-offset: 0px; - --scrollbar-offset-negative: 0px; - } html { background-color: white; - scrollbar-gutter: stable; - overflow-y: scroll; } @media (prefers-color-scheme: dark) { html { @@ -89,23 +83,9 @@ /* We need this style to prevent web dropdowns from shifting the display when opening */ body { width: 100%; + overflow-y: scroll; } - -