From 36cee2c1f78912e8f2a3d75c1fa4355130d2c91d Mon Sep 17 00:00:00 2001 From: Stamm Date: Thu, 12 Mar 2020 13:03:56 +0100 Subject: [PATCH] Making scroll theme agnostic --- package.json | 2 +- src/_maketheme.scss | 1 - src/base.scss | 17 ++++++++++------- src/base/_scroll.scss | 19 +++++++++++++++++++ src/theme/_scroll.scss | 20 -------------------- 5 files changed, 30 insertions(+), 29 deletions(-) create mode 100644 src/base/_scroll.scss delete mode 100644 src/theme/_scroll.scss diff --git a/package.json b/package.json index 0db37a5..8278f9b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@hibas123/theme", - "version": "1.2.16", + "version": "1.2.17", "description": "", "main": " ", "files": [ diff --git a/src/_maketheme.scss b/src/_maketheme.scss index 9cfde22..533e6a0 100644 --- a/src/_maketheme.scss +++ b/src/_maketheme.scss @@ -48,4 +48,3 @@ $on-button: #000000 !default; @import "./theme/_header.scss"; @import "./theme/_card.scss"; @import "./theme/_table.scss"; -@import "./theme/_scroll.scss"; diff --git a/src/base.scss b/src/base.scss index 899b46b..c013eb4 100644 --- a/src/base.scss +++ b/src/base.scss @@ -1,27 +1,29 @@ /* latin */ @font-face { - font-family: 'Roboto'; + font-family: "Roboto"; font-style: normal; font-weight: 400; font-display: swap; - src: local('Roboto'), local('Roboto-Regular'), url(../Roboto-Regular.woff2) format('woff2'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; + src: local("Roboto"), local("Roboto-Regular"), + url(../Roboto-Regular.woff2) format("woff2"); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, + U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, + U+2215, U+FEFF, U+FFFD; } :root { - --primary: #1E88E5; + --primary: #1e88e5; // 1e88e5 or 196eb9 => Needs further investigations --on-primary: white; --secondary: #d8701b; --on-secondary: black; --error: rgb(255, 0, 0); --on-error: white; - + --primary-transparent: #196eb917; --success: #28a745; --on-success: white; - } $primary: var(--primary) !default; @@ -44,4 +46,5 @@ $on-success: var(--on-success) !default; @import "./base/_header.scss"; @import "./base/_card.scss"; @import "./base/_grid.scss"; -@import "./base/table.scss"; \ No newline at end of file +@import "./base/_table.scss"; +@import "./base/_scroll"; diff --git a/src/base/_scroll.scss b/src/base/_scroll.scss new file mode 100644 index 0000000..1489a1f --- /dev/null +++ b/src/base/_scroll.scss @@ -0,0 +1,19 @@ +::-webkit-scrollbar { + margin-left: 4px; +} + +::-webkit-scrollbar-track { + background: rgba(127, 127, 127, 0.1); +} + +::-webkit-scrollbar-thumb { + background: rgba(127, 127, 127, 0.2); +} + +::-webkit-scrollbar-thumb:hover { + background: rgba(127, 127, 127, 0.25); +} + +::-webkit-scrollbar-thumb:active { + background: rgba(127, 127, 127, 0.3); +} diff --git a/src/theme/_scroll.scss b/src/theme/_scroll.scss deleted file mode 100644 index be0759a..0000000 --- a/src/theme/_scroll.scss +++ /dev/null @@ -1,20 +0,0 @@ -::-webkit-scrollbar { - margin-left: 4px; -} - -::-webkit-scrollbar-track { - background: red; - background: darken-brighten-color($background, 5%); -} - -::-webkit-scrollbar-thumb { - background: darken-brighten-color($background, 20%); -} - -::-webkit-scrollbar-thumb:hover { - background: darken-brighten-color($background, 25%); -} - -::-webkit-scrollbar-thumb:active { - background: darken-brighten-color($background, 30%); -}