mirror/blueb-Chuckya-fe-standalone
1
0
Fork 0
mirror of https://iceshrimp.dev/blueb/Chuckya-fe-standalone.git synced 2026-01-11 13:33:21 -08:00
Code Issues Projects Releases Packages Wiki Activity

Merge commit '8156113d58' into glitch-soc/merge-upstream

Browse source 
Conflicts:
- `app/javascript/packs/admin.jsx`:
  Change applied to `app/javascript/core/admin.js` instead.
This commit is contained in:
Claire 2024-02-26 17:43:16 +01:00
commit 67ca8bb56a
121 changed files with 513 additions and 375 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5195,7 +5195,6 @@ a.status-card {
.icon {
position: absolute;
top: 12px + 2px;
inset-inline-start: 16px - 2px;
display: inline-block;
opacity: 0;
transition: all 100ms linear;
@ -5210,6 +5209,10 @@ a.status-card {
pointer-events: auto;
opacity: 1;
}
@media screen and (min-width: $no-gap-breakpoint) {
inset-inline-start: 16px - 2px;
}
}
.icon-search {
@ -5965,6 +5968,7 @@ a.status-card {
.report-modal__comment {
box-sizing: border-box;
width: 50%;
min-width: 50%;
@media screen and (width <= 480px) {
width: 100%;
@ -6033,6 +6037,14 @@ a.status-card {
min-height: 100px;
max-height: 50vh;
border: 0;
@media screen and (height <= 600px) {
max-height: 20vh;
}
@media screen and (max-width: $no-columns-breakpoint) {
max-height: 20vh;
}
}
.setting-toggle {