From 61956370018868917e04160d1422f1acff41bd83 Mon Sep 17 00:00:00 2001 From: Dominik Pschenitschni Date: Mon, 18 Oct 2021 14:19:36 +0200 Subject: [PATCH] feat: move scrollbar styles and add variables locally --- src/styles/components/_index.scss | 2 -- src/styles/components/base/_index.scss | 1 - src/styles/theme/_index.scss | 2 ++ src/styles/{components/base => theme}/scrollbars.scss | 5 +++++ src/styles/variables/variables.scss | 5 ----- 5 files changed, 7 insertions(+), 8 deletions(-) delete mode 100644 src/styles/components/base/_index.scss rename src/styles/{components/base => theme}/scrollbars.scss (78%) diff --git a/src/styles/components/_index.scss b/src/styles/components/_index.scss index b8aa1e71..333266d0 100644 --- a/src/styles/components/_index.scss +++ b/src/styles/components/_index.scss @@ -1,5 +1,3 @@ -@import "base"; - @import "attachments"; @import "gantt"; @import "tooltip"; diff --git a/src/styles/components/base/_index.scss b/src/styles/components/base/_index.scss deleted file mode 100644 index 30e2cbf1..00000000 --- a/src/styles/components/base/_index.scss +++ /dev/null @@ -1 +0,0 @@ -@import 'scrollbars'; diff --git a/src/styles/theme/_index.scss b/src/styles/theme/_index.scss index 9f8d234e..8f4f5b3d 100644 --- a/src/styles/theme/_index.scss +++ b/src/styles/theme/_index.scss @@ -1,3 +1,5 @@ +@import "scrollbars"; + @import "theme"; @import "content"; diff --git a/src/styles/components/base/scrollbars.scss b/src/styles/theme/scrollbars.scss similarity index 78% rename from src/styles/components/base/scrollbars.scss rename to src/styles/theme/scrollbars.scss index 92a856e3..29d24106 100644 --- a/src/styles/components/base/scrollbars.scss +++ b/src/styles/theme/scrollbars.scss @@ -1,3 +1,8 @@ +$scrollbar-height: 8px; +$scrollbar-track-color: $grey-200; +$scrollbar-thumb-color: $grey-300; +$scrollbar-hover-color: $grey-500; + // Chrome ::-webkit-scrollbar { width: $scrollbar-height; diff --git a/src/styles/variables/variables.scss b/src/styles/variables/variables.scss index 678a2fa6..abe0ef0a 100644 --- a/src/styles/variables/variables.scss +++ b/src/styles/variables/variables.scss @@ -29,11 +29,6 @@ $vikunja-nav-logo-full-width: 164px; $transition-duration: 150ms; $transition: $transition-duration ease; -$scrollbar-height: 8px; -$scrollbar-track-color: $grey-200; -$scrollbar-thumb-color: $grey-300; -$scrollbar-hover-color: $grey-500; - $button-height: 34px; $switch-view-height: 2.69rem;