Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(css): make scrollbar visible again #47617

Merged
merged 5 commits into from
Sep 2, 2024
Merged

fix(css): make scrollbar visible again #47617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
afc4940
fix(css): make scrollbar visible again
Ornanovitch Aug 29, 2024
d1f82e7
fix(css): re-use old --color-scrollbar variable
Ornanovitch Aug 31, 2024
df7db81
fix(css): cleanup old scrolling css
Ornanovitch Aug 31, 2024
b711da7
fix(css): refine css cleanup
Ornanovitch Aug 31, 2024
15e449a
chore(css): build css
Ornanovitch Sep 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/theming/css/default.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
--color-text-light: var(--color-main-text);
/** @deprecated use `--color-text-maxcontrast` instead */
--color-text-lighter: var(--color-text-maxcontrast);
--color-scrollbar: rgba(34,34,34, .15);
Ornanovitch marked this conversation as resolved.
Show resolved Hide resolved
--color-scrollbar: var(--color-border-maxcontrast) transparent;
--color-error: #DB0606;
--color-error-rgb: 219,6,6;
--color-error-hover: #df2525;
Expand Down
2 changes: 1 addition & 1 deletion apps/theming/lib/Themes/DarkHighContrastTheme.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public function getCSSVariables(): array {
'--color-info-hover' => $this->util->lighten($colorInfo, 10),
'--color-info-text' => $this->util->lighten($colorInfo, 20),

'--color-scrollbar' => $this->util->lighten($colorMainBackground, 35),
Ornanovitch marked this conversation as resolved.
Show resolved Hide resolved
'--color-scrollbar' => 'auto',

// used for the icon loading animation
'--color-loading-light' => '#000000',
Expand Down
2 changes: 0 additions & 2 deletions apps/theming/lib/Themes/DarkTheme.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,6 @@ public function getCSSVariables(): array {
'--color-main-background-rgb' => $colorMainBackgroundRGB,
'--color-main-background-blur' => 'rgba(var(--color-main-background-rgb), .85)',

'--color-scrollbar' => $this->util->lighten($colorMainBackground, 15),

'--color-background-hover' => $this->util->lighten($colorMainBackground, 4),
'--color-background-dark' => $this->util->lighten($colorMainBackground, 7),
'--color-background-darker' => $this->util->lighten($colorMainBackground, 14),
Expand Down
2 changes: 1 addition & 1 deletion apps/theming/lib/Themes/DefaultTheme.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ public function getCSSVariables(): array {
'--color-text-light' => 'var(--color-main-text)', // deprecated
'--color-text-lighter' => 'var(--color-text-maxcontrast)', // deprecated

'--color-scrollbar' => 'rgba(' . $colorMainTextRgb . ', .15)',
'--color-scrollbar' => 'var(--color-border-maxcontrast) transparent',

// error/warning/success/info feedback colours
'--color-error' => $colorError,
Expand Down
2 changes: 1 addition & 1 deletion apps/theming/lib/Themes/HighContrastTheme.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public function getCSSVariables(): array {

'--color-favorite' => '#936B06',

'--color-scrollbar' => $this->util->darken($colorMainBackground, 25),
'--color-scrollbar' => 'auto',

// used for the icon loading animation
'--color-loading-light' => '#dddddd',
Expand Down
2 changes: 1 addition & 1 deletion core/css/server.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/css/server.css.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/css/styles.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/css/styles.css.map
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions core/css/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pr
font-family: inherit;
vertical-align: baseline;
cursor: default;
susnux marked this conversation as resolved.
Show resolved Hide resolved
scrollbar-color: var(--color-border-dark) transparent;
scrollbar-width: thin;
scrollbar-color: var(--color-scrollbar);
}

.js-focus-visible :focus:not(.focus-visible) {
Expand Down Expand Up @@ -248,13 +247,13 @@ body {
position: absolute;
inset-inline-end: 1em;
top: .8em;
/* Cannot use inline-start and :dir to support Samsung Internet */
/* Cannot use inline-start and :dir to support Samsung Internet */
float: right;
}

body[dir='rtl'] #show,
body[dir='rtl'] #dbpassword {
/* Cannot use inline-start and :dir to support Samsung Internet */
/* Cannot use inline-start and :dir to support Samsung Internet */
float: left;
}

Expand Down
Loading