ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Glitch] Fix edge case where settings/admin page sidebar would be incorrectly hidden 

Port 00b45b967e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
rebase/4.0.0rc2
Claire 2022-02-16 21:44:19 +01:00
parent 41d52ee4b5
commit d70e4e3da0
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/javascript/flavours/glitch/packs/public.js
View File

@ -147,13 +147,7 @@ function main() {
}); });
delegate(document, '.sidebar__toggle__icon', 'click', () => { delegate(document, '.sidebar__toggle__icon', 'click', () => {
const target = document.querySelector('.sidebar ul'); document.querySelector('.sidebar ul').classList.toggle('visible');
if (target.style.display === 'block') {
target.style.display = 'none';
} else {
target.style.display = 'block';
}
}); });
// Empty the honeypot fields in JS in case something like an extension // Empty the honeypot fields in JS in case something like an extension

8
app/javascript/flavours/glitch/packs/settings.js
View File

@ -7,13 +7,7 @@ function main() {
const { delegate } = require('@rails/ujs'); const { delegate } = require('@rails/ujs');
delegate(document, '.sidebar__toggle__icon', 'click', () => { delegate(document, '.sidebar__toggle__icon', 'click', () => {
const target = document.querySelector('.sidebar ul'); document.querySelector('.sidebar ul').classList.toggle('visible');
if (target.style.display === 'block') {
target.style.display = 'none';
} else {
target.style.display = 'block';
}
}); });
} }

4
app/javascript/flavours/glitch/styles/admin.scss
View File

@ -322,6 +322,10 @@ $content-width: 840px;
& > ul { & > ul {
display: none; display: none;
&.visible {
display: block;
}
} }
ul a, ul a,