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

Use upstream's settings for CW auto-expand and column swiping (#1770)

Browse Source 
* Use Mastodon server-side settings for automatically expanding toots with CWs

* Add modal warning about settings changes

* Use Mastodon server-side settings for disabling swiping
This commit is contained in:
Claire
2022-05-15 17:30:40 +02:00
committed by GitHub
parent aa08399e6f
commit dc350be6f5
20 changed files with 396 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
app/javascript/flavours/glitch/styles/components/local_settings.scss
View File

@ -98,6 +98,18 @@
.glitch.local-settings__page__item {
margin-bottom: 2px;
.hint a {
color: $lighter-text-color;
font-weight: 500;
text-decoration: underline;
&:active,
&:focus,
&:hover {
text-decoration: none;
}
}
}
.glitch.local-settings__page__item.string,
@ -120,3 +132,29 @@
}
}
}
.deprecated-settings-label {
white-space: nowrap;
}
.deprecated-settings-info {
text-align: start;
ul {
padding: 10px;
margin-left: 12px;
list-style: disc inside;
}
a {
color: $lighter-text-color;
font-weight: 500;
text-decoration: underline;
&:active,
&:focus,
&:hover {
text-decoration: none;
}
}
}

7
app/javascript/flavours/glitch/styles/components/modal.scss
View File

@ -1279,3 +1279,10 @@
pointer-events: auto;
z-index: 9999;
}
img.modal-warning {
display: block;
margin: auto;
margin-bottom: 15px;
width: 60px;
}