-
+
);
};
diff --git a/app/javascript/flavours/glitch/features/status/index.jsx b/app/javascript/flavours/glitch/features/status/index.jsx
index 2aaa7b93d5..d196dff11a 100644
--- a/app/javascript/flavours/glitch/features/status/index.jsx
+++ b/app/javascript/flavours/glitch/features/status/index.jsx
@@ -678,8 +678,8 @@ class Status extends ImmutablePureComponent {
- {remoteHint}
{descendants}
+ {remoteHint}
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index a01ee2db25..7cadba58c1 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -3034,7 +3034,6 @@ a.account__display-name {
flex: 1 1 auto;
flex-direction: row;
justify-content: flex-start;
- overflow-x: auto;
position: relative;
&.unscrollable {
@@ -3210,6 +3209,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;
@@ -3250,7 +3272,6 @@ a.account__display-name {
.column,
.drawer {
flex: 1 1 100%;
- overflow: hidden;
}
@media screen and (width > $mobile-breakpoint) {
@@ -10706,6 +10727,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;