Merge branch 'next' into 'next'

next

See merge request soapbox-pub/soapbox-fe!1268

app/soapbox/components/status_action_bar.tsx

@@ -632,7 +632,11 @@ class StatusActionBar extends ImmutablePureComponent<IStatusActionBar, IStatusAc
         />
 
         {features.quotePosts && me ? (
-          <DropdownMenuContainer items={reblogMenu} onShiftClick={this.handleReblogClick}>
+          <DropdownMenuContainer
+            items={reblogMenu}
+            disabled={!publicStatus}
+            onShiftClick={this.handleReblogClick}
+          >
             {reblogButton}
           </DropdownMenuContainer>
         ) : (

app/styles/components/reply-mentions.scss

@@ -2,11 +2,7 @@
   @apply text-gray-500 dark:text-gray-400 mb-1 text-sm;
 
   &__account {
-    @apply text-primary-600 no-underline;
-
-    &:hover {
-      @apply underline text-primary-800;
-    }
+    @apply text-primary-600 dark:text-primary-400 hover:text-primary-800 dark:hover:text-primary-300 no-underline hover:underline;
   }
 }
 

app/styles/forms.scss

@@ -338,6 +338,7 @@ code {
   input[type=password],
   textarea,
   .rfipbtn {
+    @apply border border-gray-300 dark:border-gray-600 bg-white dark:bg-slate-800 text-black dark:text-white;
     box-sizing: border-box;
     font-size: 16px;
     color: var(--primary-text-color);
@@ -643,6 +644,7 @@ code {
     }
 
     .icon-button {
+      @apply text-black dark:text-white;
       position: absolute;
       top: 0;
       right: 0;
@@ -651,7 +653,6 @@ code {
       padding: 0;
       margin: 0;
       background: transparent;
-      color: var(--primary-text-color);
 
       .svg-icon {
         height: 20px;