From 5190444ea75a52c14c14f69a618e233bbae7a438 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Fri, 25 Mar 2022 20:27:51 +0530 Subject: [PATCH] Add scroll bar as a feature loadble Usage => .Site.Params.features.disableScrollStyle: true --- assets/css/common/post-single.css | 26 -------------- assets/css/core/reset.css | 19 ----------- assets/css/core/zmedia.css | 8 ----- assets/css/includes/scroll-bar.css | 55 ++++++++++++++++++++++++++++++ layouts/partials/head_styles.html | 5 +++ 5 files changed, 60 insertions(+), 53 deletions(-) create mode 100644 assets/css/includes/scroll-bar.css diff --git a/assets/css/common/post-single.css b/assets/css/common/post-single.css index b0f924d..ce6fac2 100644 --- a/assets/css/common/post-single.css +++ b/assets/css/common/post-single.css @@ -188,10 +188,6 @@ margin-bottom: 0; } -.post-content .highlighttable td .highlight pre code::-webkit-scrollbar { - display: none; -} - .post-content code { margin: auto 4px; padding: 4px 6px; @@ -327,25 +323,3 @@ .paginav a:hover { background: var(--border); } - -.post-content :not(table) ::-webkit-scrollbar-thumb { - border: 2px solid var(--hljs-bg); - background: rgb(113, 113, 117); -} - -.post-content :not(table) ::-webkit-scrollbar-thumb:hover { - background: rgb(163, 163, 165); -} - -.gist table::-webkit-scrollbar-thumb { - border: 2px solid rgb(255, 255, 255); - background: rgb(173, 173, 173); -} - -.gist table::-webkit-scrollbar-thumb:hover { - background: rgb(112, 112, 112); -} - -.post-content table::-webkit-scrollbar-thumb { - border-width: 2px; -} diff --git a/assets/css/core/reset.css b/assets/css/core/reset.css index dfb1caa..615a3b2 100644 --- a/assets/css/core/reset.css +++ b/assets/css/core/reset.css @@ -115,24 +115,5 @@ img { max-width: 100%; } -::-webkit-scrollbar-track { - background: 0 0; -} -.list:not(.dark)::-webkit-scrollbar-track { - background: var(--code-bg); -} -::-webkit-scrollbar-thumb { - background: var(--tertiary); - border: 5px solid var(--theme); - border-radius: var(--radius); -} - -.list:not(.dark)::-webkit-scrollbar-thumb { - border: 5px solid var(--code-bg); -} - -::-webkit-scrollbar-thumb:hover { - background: var(--secondary); -} diff --git a/assets/css/core/zmedia.css b/assets/css/core/zmedia.css index 1cc6c6e..2888472 100644 --- a/assets/css/core/zmedia.css +++ b/assets/css/core/zmedia.css @@ -29,14 +29,6 @@ } } -@media screen and (min-width: 768px) { - /* reset */ - ::-webkit-scrollbar { - width: 19px; - height: 11px; - } -} - /* footer */ @media screen and (max-width: 900px) { .list .top-link { diff --git a/assets/css/includes/scroll-bar.css b/assets/css/includes/scroll-bar.css new file mode 100644 index 0000000..7620803 --- /dev/null +++ b/assets/css/includes/scroll-bar.css @@ -0,0 +1,55 @@ +::-webkit-scrollbar-track { + background: 0 0; +} + +.list:not(.dark)::-webkit-scrollbar-track { + background: var(--code-bg); +} + +::-webkit-scrollbar-thumb { + background: var(--tertiary); + border: 5px solid var(--theme); + border-radius: var(--radius); +} + +.list:not(.dark)::-webkit-scrollbar-thumb { + border: 5px solid var(--code-bg); +} + +::-webkit-scrollbar-thumb:hover { + background: var(--secondary); +} + +.post-content .highlighttable td .highlight pre code::-webkit-scrollbar { + display: none; +} + +.post-content :not(table) ::-webkit-scrollbar-thumb { + border: 2px solid var(--hljs-bg); + background: rgb(113, 113, 117); +} + +.post-content :not(table) ::-webkit-scrollbar-thumb:hover { + background: rgb(163, 163, 165); +} + +.gist table::-webkit-scrollbar-thumb { + border: 2px solid rgb(255, 255, 255); + background: rgb(173, 173, 173); +} + +.gist table::-webkit-scrollbar-thumb:hover { + background: rgb(112, 112, 112); +} + +.post-content table::-webkit-scrollbar-thumb { + border-width: 2px; +} + +@media screen and (min-width: 768px) { + /* reset */ + ::-webkit-scrollbar { + width: 19px; + height: 11px; + } +} \ No newline at end of file diff --git a/layouts/partials/head_styles.html b/layouts/partials/head_styles.html index 2387e51..ccd7058 100644 --- a/layouts/partials/head_styles.html +++ b/layouts/partials/head_styles.html @@ -43,6 +43,11 @@ {{- $includes = (append $AnchoredHeadings $includes) }} {{- end }} +{{- if not (eq .Site.Params.features.disableScrollStyle true) }} + {{- $ScrollStyle := (resources.Get "css/includes/scroll-bar.css") }} + {{- $includes = (append $ScrollStyle $includes) }} +{{- end }} + {{- $includes_all := $includes | resources.Concat "assets/css/includes.css" }} {{- /* order is important */}}