erik/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-08-20 21:08:15 -07:00
Code Issues Projects Releases Wiki Activity

Fix styling issues with notification settings and mobile borders (#31346)

Browse source
This commit is contained in:
Michael Stanclift 2024-08-08 12:31:06 -05:00 committed by GitHub
parent 079d681ac6
commit 664bef3573
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 16 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/javascript/styles/mastodon-light/diff.scss
View file

@ -214,12 +214,6 @@ html {
border-top-color: lighten($ui-base-color, 8%); border-top-color: lighten($ui-base-color, 8%);
} }
.column-header__collapsible-inner {
background: darken($ui-base-color, 4%);
border: 1px solid var(--background-border-color);
border-bottom: 0;
}
.column-settings__hashtags .column-select__option { .column-settings__hashtags .column-select__option {
color: $white; color: $white;
} }

2
app/javascript/styles/mastodon-light/variables.scss
View file

@ -21,7 +21,7 @@ $valid-value-color: $success-green !default;
$ui-base-color: $classic-secondary-color !default; $ui-base-color: $classic-secondary-color !default;
$ui-base-lighter-color: #b0c0cf; $ui-base-lighter-color: #b0c0cf;
$ui-primary-color: #9bcbed; $ui-primary-color: $classic-primary-color !default;
$ui-secondary-color: $classic-base-color !default; $ui-secondary-color: $classic-base-color !default;
$ui-highlight-color: $classic-highlight-color !default; $ui-highlight-color: $classic-highlight-color !default;

15
app/javascript/styles/mastodon/components.scss
View file

@ -2779,6 +2779,11 @@ $ui-header-logo-wordmark-width: 99px;
&.privacy-policy { &.privacy-policy {
border-top: 1px solid var(--background-border-color); border-top: 1px solid var(--background-border-color);
border-radius: 4px; border-radius: 4px;
@media screen and (max-width: $no-gap-breakpoint) {
border-top: 0;
border-bottom: 0;
}
} }
} }
} }
@ -4472,6 +4477,11 @@ a.status-card {
.column-header__collapsible-inner { .column-header__collapsible-inner {
border: 1px solid var(--background-border-color); border: 1px solid var(--background-border-color);
border-top: 0; border-top: 0;
@media screen and (max-width: $no-gap-breakpoint) {
border-left: 0;
border-right: 0;
}
} }
.column-header__setting-btn { .column-header__setting-btn {
@ -7657,6 +7667,11 @@ noscript {
width: 100%; width: 100%;
} }
} }
@media screen and (max-width: $no-gap-breakpoint) {
border-left: 0;
border-right: 0;
}
} }
.drawer__backdrop { .drawer__backdrop {

5
app/javascript/styles/mastodon/emoji_picker.scss
View file

@ -83,11 +83,6 @@
max-height: 35vh; max-height: 35vh;
padding: 0 6px 6px; padding: 0 6px 6px;
will-change: transform; will-change: transform;
&::-webkit-scrollbar-track:hover,
&::-webkit-scrollbar-track:active {
background-color: rgba($base-overlay-background, 0.3);
}
} }
.emoji-mart-search { .emoji-mart-search {

37
app/javascript/styles/mastodon/reset.scss
View file

@ -56,40 +56,3 @@ table {
html { html {
scrollbar-color: lighten($ui-base-color, 4%) rgba($base-overlay-background, 0.1); scrollbar-color: lighten($ui-base-color, 4%) rgba($base-overlay-background, 0.1);
} }
::-webkit-scrollbar {
width: 12px;
height: 12px;
}
::-webkit-scrollbar-thumb {
background: lighten($ui-base-color, 4%);
border: 0px none $base-border-color;
border-radius: 50px;
}
::-webkit-scrollbar-thumb:hover {
background: lighten($ui-base-color, 6%);
}
::-webkit-scrollbar-thumb:active {
background: lighten($ui-base-color, 4%);
}
::-webkit-scrollbar-track {
border: 0px none $base-border-color;
border-radius: 0;
background: rgba($base-overlay-background, 0.1);
}
::-webkit-scrollbar-track:hover {
background: $ui-base-color;
}
::-webkit-scrollbar-track:active {
background: $ui-base-color;
}
::-webkit-scrollbar-corner {
background: transparent;
}