diff --git a/app/javascript/flavours/glitch/styles/components/compose_form.scss b/app/javascript/flavours/glitch/styles/components/compose_form.scss index 72d3aad1d3..00d395ce99 100644 --- a/app/javascript/flavours/glitch/styles/components/compose_form.scss +++ b/app/javascript/flavours/glitch/styles/components/compose_form.scss @@ -123,6 +123,7 @@ } } +.quote-indicator, .reply-indicator { margin: 0 0 10px; border-radius: 4px; @@ -133,6 +134,7 @@ flex: 0 2 auto; } +.quote-indicator__header, .reply-indicator__header { margin-bottom: 5px; overflow: hidden; @@ -140,11 +142,13 @@ & > .account.small { color: $inverted-text-color; } } +.quote-indicator__cancel, .reply-indicator__cancel { float: right; line-height: 24px; } +.quote-indicator__content, .reply-indicator__content { position: relative; margin: 10px 0; diff --git a/app/javascript/flavours/glitch/styles/components/status.scss b/app/javascript/flavours/glitch/styles/components/status.scss index c23e9478dd..b19c72cbef 100644 --- a/app/javascript/flavours/glitch/styles/components/status.scss +++ b/app/javascript/flavours/glitch/styles/components/status.scss @@ -696,6 +696,7 @@ } a.status__display-name, +.quote-indicator__display-name, .reply-indicator__display-name, .detailed-status__display-name, .account__display-name { diff --git a/app/javascript/flavours/glitch/styles/contrast/diff.scss b/app/javascript/flavours/glitch/styles/contrast/diff.scss index 4fa1a03616..97b7aa9fe5 100644 --- a/app/javascript/flavours/glitch/styles/contrast/diff.scss +++ b/app/javascript/flavours/glitch/styles/contrast/diff.scss @@ -14,6 +14,7 @@ .status__content a, .link-footer a, +.quote-indicator__content a, .reply-indicator__content a, .status__content__read-more-button { text-decoration: underline; diff --git a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss index 6489c2f805..660ea707c9 100644 --- a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss +++ b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss @@ -257,6 +257,7 @@ html { } // Change the background colors of status__content__spoiler-link +.quote-indicator__content .status__content__spoiler-link, .reply-indicator__content .status__content__spoiler-link, .status__content .status__content__spoiler-link { background: $ui-base-color; @@ -662,6 +663,7 @@ html { } } +.quote-indicator, .reply-indicator { background: transparent; border: 1px solid lighten($ui-base-color, 8%); @@ -673,6 +675,7 @@ html { } .status__content, +.quote-indicator__content, .reply-indicator__content { a { color: $highlight-text-color;