Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-28 13:47:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'b42661ba95b7872ba278fca9b0fee8faffd89e52' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added `<s>` to the list of allowed tags, the conflict is because
  we have a different list of allowed tags.
  Added `<s>` like upstream did.
This commit is contained in:
Claire
2024-08-12 17:46:24 +02:00
parent 9edf98c02a b42661ba95
commit 83480df820
20 changed files with 159 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/styles/mastodon-light/diff.scss
View File

@@ -52,10 +52,6 @@ html {
color: darken($action-button-color, 25%);
}
.account__header__bar .avatar .account__avatar {
border-color: $white;
}
.getting-started__footer a {
color: $ui-secondary-color;
text-decoration: underline;

3
app/javascript/styles/mastodon/components.scss
View File

@@ -7970,7 +7970,8 @@ noscript {
.account__avatar {
background: var(--background-color);
border: 2px solid var(--background-border-color);
border: 1px solid var(--background-border-color);
border-radius: 4px;
}
}
}

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

@@ -56,3 +56,40 @@ table {
html {
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;
}