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

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `Gemfile.lock`:
  glitch-soc-only dependency textually too close to updated upstream
  dependencies. Updated to upsteam dependencies.
This commit is contained in:
Thibaut Girka
2020-11-25 15:31:45 +01:00
parent 24696458bf 41b38b0273
commit e71b16ae2b
22 changed files with 452 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4439,8 +4439,6 @@ a.status-card.compact:hover {
.modal-root {
position: relative;
transition: opacity 0.3s linear;
will-change: opacity;
z-index: 9999;
}