-
+
);
};
diff --git a/app/javascript/mastodon/features/status/index.jsx b/app/javascript/mastodon/features/status/index.jsx
index fb8f3d81d91..404faf609e4 100644
--- a/app/javascript/mastodon/features/status/index.jsx
+++ b/app/javascript/mastodon/features/status/index.jsx
@@ -648,8 +648,8 @@ class Status extends ImmutablePureComponent {
- {remoteHint}
{descendants}
+ {remoteHint}
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 7721cc36d3f..f949c303396 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -865,8 +865,13 @@
"status.cannot_quote": "You are not allowed to quote this post",
"status.cannot_reblog": "This post cannot be boosted",
"status.contains_quote": "Contains quote",
- "status.context.load_new_replies": "New replies available",
- "status.context.loading": "Checking for more replies",
+ "status.context.loading": "Loading more replies",
+ "status.context.loading_error": "Couldn't load new replies",
+ "status.context.loading_more": "Loading more replies",
+ "status.context.loading_success": "All replies loaded",
+ "status.context.more_replies_found": "More replies found",
+ "status.context.retry": "Retry",
+ "status.context.show": "Show",
"status.continued_thread": "Continued thread",
"status.copy": "Copy link to post",
"status.delete": "Delete",
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 079985c404d..d893a358367 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -2969,7 +2969,6 @@ a.account__display-name {
flex: 1 1 auto;
flex-direction: row;
justify-content: flex-start;
- overflow-x: auto;
position: relative;
&.unscrollable {
@@ -3145,6 +3144,29 @@ a.account__display-name {
}
}
+.column__alert {
+ position: sticky;
+ bottom: 1rem;
+ z-index: 10;
+ box-sizing: border-box;
+ display: grid;
+ width: 100%;
+ max-width: 360px;
+ padding-inline: 10px;
+ margin-top: 1rem;
+ margin-inline: auto;
+
+ @media (max-width: #{$mobile-menu-breakpoint - 1}) {
+ bottom: 4rem;
+ }
+
+ & > * {
+ // Make all nested alerts occupy the same space
+ // rather than stack
+ grid-area: 1 / 1;
+ }
+}
+
.ui {
--mobile-bottom-nav-height: 55px;
--last-content-item-border-width: 2px;
@@ -3185,7 +3207,6 @@ a.account__display-name {
.column,
.drawer {
flex: 1 1 100%;
- overflow: hidden;
}
@media screen and (width > $mobile-breakpoint) {
@@ -10397,6 +10418,21 @@ noscript {
}
}
+.notification-bar__loading-indicator {
+ --spinner-size: 22px;
+
+ position: relative;
+ height: var(--spinner-size);
+ width: var(--spinner-size);
+ margin-inline-start: 2px;
+
+ svg {
+ color: $white;
+ height: var(--spinner-size);
+ width: var(--spinner-size);
+ }
+}
+
.hashtag-header {
border-bottom: 1px solid var(--background-border-color);
padding: 15px;