tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream moved some settings, where glitch-soc has an extra setting.
  Ported upstream changes, moving the same settings as them.
This commit is contained in:
Claire
2023-08-22 18:31:28 +02:00
parent 128daefc7a d9c21293aa
commit 2126812f65
139 changed files with 161 additions and 697 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -170,11 +170,6 @@
display: block;
width: 100%;
}
.layout-multiple-columns &.button--with-bell {
font-size: 12px;
padding: 0 8px;
}
}
.column__wrapper {