From e1aa88c6a09a4410fe792c30e0454116335fba68 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Wed, 1 Apr 2020 16:12:40 +0200 Subject: [PATCH 1/2] Improve scrollbar display in rustdoc --- src/librustdoc/html/static/rustdoc.css | 12 ++++++++++++ src/librustdoc/html/static/themes/dark.css | 12 ++++++++++++ src/librustdoc/html/static/themes/light.css | 12 ++++++++++++ 3 files changed, 36 insertions(+) diff --git a/src/librustdoc/html/static/rustdoc.css b/src/librustdoc/html/static/rustdoc.css index d091cc0c0965b..0ab130009ca0d 100644 --- a/src/librustdoc/html/static/rustdoc.css +++ b/src/librustdoc/html/static/rustdoc.css @@ -182,6 +182,18 @@ nav.sub { top: 0; bottom: 0; overflow: auto; + /* Improve the sidebar display on firefox */ + scrollbar-width: thin; +} + +/* Improve the sidebar display on webkit-based browsers */ +.sidebar::-webkit-scrollbar { + width: 8px; +} + +/* Improve the sidebar display on webkit-based browsers */ +.sidebar::-webkit-scrollbar-track { + -webkit-box-shadow: inset 0; } .sidebar .block > ul > li { diff --git a/src/librustdoc/html/static/themes/dark.css b/src/librustdoc/html/static/themes/dark.css index ff32a0fa09e4d..155492e8a6a7c 100644 --- a/src/librustdoc/html/static/themes/dark.css +++ b/src/librustdoc/html/static/themes/dark.css @@ -30,6 +30,18 @@ pre { .sidebar { background-color: #505050; + /* Improve the sidebar display on firefox */ + scrollbar-color: rgba(32,34,37,.6) transparent; +} + +/* Improve the sidebar display on webkit-based browsers */ +.sidebar::-webkit-scrollbar-track { + background-color: #717171; +} + +/* Improve the sidebar display on webkit-based browsers */ +.sidebar::-webkit-scrollbar-thumb { + background-color: rgba(32, 34, 37, .6); } .sidebar .current { diff --git a/src/librustdoc/html/static/themes/light.css b/src/librustdoc/html/static/themes/light.css index 2b2819f7126b4..488c34a61fb9f 100644 --- a/src/librustdoc/html/static/themes/light.css +++ b/src/librustdoc/html/static/themes/light.css @@ -32,6 +32,18 @@ pre { .sidebar { background-color: #F1F1F1; + /* Improve the sidebar display on firefox */ + scrollbar-color: rgba(36, 37, 39, 0.6) #d9d9d9; +} + +/* Improve the sidebar display on webkit-based browsers */ +.sidebar::-webkit-scrollbar-track { + background-color: #dcdcdc; +} + +/* Improve the sidebar display on webkit-based browsers */ +.sidebar::-webkit-scrollbar-thumb { + background-color: rgba(36, 37, 39, 0.6); } .sidebar .current { From cbee6c5f0ca6dd1a1c5f073bd9e0e317f83bf2c5 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Tue, 7 Apr 2020 22:10:17 +0200 Subject: [PATCH 2/2] Extend sidebar scrollbar changes to all scrollbars --- src/librustdoc/html/static/rustdoc.css | 17 ++++++++++++----- src/librustdoc/html/static/themes/dark.css | 18 ++++++++++++++---- src/librustdoc/html/static/themes/light.css | 19 +++++++++++++++---- 3 files changed, 41 insertions(+), 13 deletions(-) diff --git a/src/librustdoc/html/static/rustdoc.css b/src/librustdoc/html/static/rustdoc.css index 0ab130009ca0d..ab52475172333 100644 --- a/src/librustdoc/html/static/rustdoc.css +++ b/src/librustdoc/html/static/rustdoc.css @@ -182,17 +182,24 @@ nav.sub { top: 0; bottom: 0; overflow: auto; - /* Improve the sidebar display on firefox */ +} + +/* Improve the scrollbar display on firefox */ +* { + scrollbar-width: initial; +} +.sidebar { scrollbar-width: thin; } -/* Improve the sidebar display on webkit-based browsers */ +/* Improve the scrollbar display on webkit-based browsers */ +::-webkit-scrollbar { + width: 12px; +} .sidebar::-webkit-scrollbar { width: 8px; } - -/* Improve the sidebar display on webkit-based browsers */ -.sidebar::-webkit-scrollbar-track { +::-webkit-scrollbar-track { -webkit-box-shadow: inset 0; } diff --git a/src/librustdoc/html/static/themes/dark.css b/src/librustdoc/html/static/themes/dark.css index 155492e8a6a7c..a2986c7b927e2 100644 --- a/src/librustdoc/html/static/themes/dark.css +++ b/src/librustdoc/html/static/themes/dark.css @@ -30,16 +30,26 @@ pre { .sidebar { background-color: #505050; - /* Improve the sidebar display on firefox */ +} + +/* Improve the scrollbar display on firefox */ +* { + scrollbar-color: rgb(64, 65, 67) #717171; +} +.sidebar { scrollbar-color: rgba(32,34,37,.6) transparent; } -/* Improve the sidebar display on webkit-based browsers */ +/* Improve the scrollbar display on webkit-based browsers */ +::-webkit-scrollbar-track { + background-color: #717171; +} +::-webkit-scrollbar-thumb { + background-color: rgba(32, 34, 37, .6); +} .sidebar::-webkit-scrollbar-track { background-color: #717171; } - -/* Improve the sidebar display on webkit-based browsers */ .sidebar::-webkit-scrollbar-thumb { background-color: rgba(32, 34, 37, .6); } diff --git a/src/librustdoc/html/static/themes/light.css b/src/librustdoc/html/static/themes/light.css index 488c34a61fb9f..be173d8eb46d3 100644 --- a/src/librustdoc/html/static/themes/light.css +++ b/src/librustdoc/html/static/themes/light.css @@ -32,16 +32,27 @@ pre { .sidebar { background-color: #F1F1F1; - /* Improve the sidebar display on firefox */ +} + +/* Improve the scrollbar display on firefox */ +* { + scrollbar-color: rgba(36, 37, 39, 0.6) #e6e6e6; +} + +.sidebar { scrollbar-color: rgba(36, 37, 39, 0.6) #d9d9d9; } -/* Improve the sidebar display on webkit-based browsers */ +/* Improve the scrollbar display on webkit-based browsers */ +::-webkit-scrollbar-track { + background-color: #ecebeb; +} +::-webkit-scrollbar-thumb { + background-color: rgba(36, 37, 39, 0.6); +} .sidebar::-webkit-scrollbar-track { background-color: #dcdcdc; } - -/* Improve the sidebar display on webkit-based browsers */ .sidebar::-webkit-scrollbar-thumb { background-color: rgba(36, 37, 39, 0.6); }