Merge pull request #1892 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

1 files changed, 39 insertions, 35 deletions

diff --git a/app/javascript/styles/contrast/diff.scss b/app/javascript/styles/contrast/diff.scss
index 27eb837df..4fa1a0361 100644
--- a/app/javascript/styles/contrast/diff.scss
+++ b/app/javascript/styles/contrast/diff.scss
@@ -1,4 +1,3 @@
-// components.scss
 .compose-form {
   .compose-form__modifiers {
     .compose-form__upload {
@@ -14,61 +13,66 @@
 }
 
 .status__content a,
-.reply-indicator__content a {
-  color: lighten($ui-highlight-color, 12%);
+.link-footer a,
+.reply-indicator__content a,
+.status__content__read-more-button {
   text-decoration: underline;
 
-  &.mention {
+  &:hover,
+  &:focus,
+  &:active {
     text-decoration: none;
   }
 
-  &.mention span {
-    text-decoration: underline;
+  &.mention {
+    text-decoration: none;
+
+    span {
+      text-decoration: underline;
+    }
 
     &:hover,
     &:focus,
     &:active {
-      text-decoration: none;
+      span {
+        text-decoration: none;
+      }
     }
   }
+}
 
-  &:hover,
-  &:focus,
-  &:active {
-    text-decoration: none;
-  }
+.status__content a {
+  color: $highlight-text-color;
+}
 
-  &.status__content__spoiler-link {
-    color: $secondary-text-color;
-    text-decoration: none;
-  }
+.nothing-here {
+  color: $darker-text-color;
 }
 
-.status__content__read-more-button {
-  text-decoration: underline;
+.compose-form__poll-wrapper .button.button-secondary,
+.compose-form .autosuggest-textarea__textarea::placeholder,
+.compose-form .spoiler-input__input::placeholder,
+.report-dialog-modal__textarea::placeholder,
+.language-dropdown__dropdown__results__item__common-name,
+.compose-form .icon-button {
+  color: $inverted-text-color;
+}
 
-  &:hover,
-  &:focus,
-  &:active {
-    text-decoration: none;
-  }
+.text-icon-button.active {
+  color: $ui-highlight-color;
 }
 
-.getting-started__footer a {
-  text-decoration: underline;
+.language-dropdown__dropdown__results__item.active {
+  background: $ui-highlight-color;
+  font-weight: 500;
+}
+
+.link-button:disabled {
+  cursor: not-allowed;
 
   &:hover,
   &:focus,
   &:active {
-    text-decoration: none;
+    text-decoration: none !important;
   }
 }
-
-.nothing-here {
-  color: $darker-text-color;
-}
-
-.compose-form .autosuggest-textarea__textarea::placeholder,
-.compose-form .spoiler-input__input::placeholder {
-  color: $inverted-text-color;
-}