Merge branch 'main' of https://github.com/glitch-soc/mastodon into 4.1.4-glitch-fix

Pulling update
This commit is contained in:
2023-07-28 07:39:27 -04:00
8 changed files with 85 additions and 111 deletions

View File

@@ -200,6 +200,7 @@ button {
}
}
.error-boundary,
.app-holder noscript {
flex-direction: column;
font-size: 16px;

View File

@@ -1,30 +0,0 @@
.error-boundary {
color: $primary-text-color;
font-size: 15px;
line-height: 20px;
h1 {
font-size: 26px;
line-height: 36px;
font-weight: 400;
margin-bottom: 8px;
}
a {
color: $primary-text-color;
text-decoration: underline;
}
ul {
list-style: disc;
margin-inline-start: 0;
padding-inline-start: 1em;
}
textarea.web_app_crash-stacktrace {
width: 100%;
resize: none;
white-space: pre;
font-family: $font-monospace, monospace;
}
}

View File

@@ -17,7 +17,6 @@
@import 'lists';
@import 'emoji_picker';
@import 'local_settings';
@import 'error_boundary';
@import 'single_column';
@import 'announcements';
@import 'explore';