about summary refs log tree commit diff
path: root/app/javascript/styles
diff options
context:
space:
mode:
authorLynx Kotoura <admin@sanin.link>2018-06-04 11:39:42 +0900
committerEugen Rochko <eugen@zeonfederated.com>2018-06-04 04:39:42 +0200
commit73923ea6c4759e551d92d3e712bc3bb6d1ad3e60 (patch)
tree5f887e85c90d1d2ca22ca3131f70ff1216fce0aa /app/javascript/styles
parentc7405fda11e0f19db0f3641720d3feb4e52bb8b7 (diff)
Fix activity-stream-tabs colors and set text variables for text colors (#7722)
Diffstat (limited to 'app/javascript/styles')
-rw-r--r--app/javascript/styles/mastodon-light/diff.scss20
1 files changed, 7 insertions, 13 deletions
diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss
index fe304317d..eadb4cfcc 100644
--- a/app/javascript/styles/mastodon-light/diff.scss
+++ b/app/javascript/styles/mastodon-light/diff.scss
@@ -26,20 +26,20 @@
 }
 
 .compose-form .compose-form__modifiers .compose-form__upload__actions .icon-button {
-  color: $ui-base-color;
+  color: lighten($white, 7%);
 
   &:active,
   &:focus,
   &:hover {
-    color: darken($ui-base-color, 7%);
+    color: $white;
   }
 }
 
 .compose-form .compose-form__modifiers .compose-form__upload-description input {
-  color: $ui-base-color;
+  color: lighten($white, 7%);
 
   &::placeholder {
-    color: $ui-base-color;
+    color: lighten($white, 7%);
   }
 }
 
@@ -100,7 +100,7 @@
 .dropdown-menu__item {
   a {
     background: $ui-base-color;
-    color: $ui-secondary-color;
+    color: $darker-text-color;
   }
 }
 
@@ -189,12 +189,6 @@
 // Change the default colors used on some parts of the profile pages
 .activity-stream-tabs {
   background: $account-background-color;
-
-  a {
-    &.active {
-      color: $ui-primary-color;
-    }
-  }
 }
 
 .activity-stream {
@@ -219,7 +213,7 @@
   .account-grid-card {
     .controls {
       .icon-button {
-        color: $ui-secondary-color;
+        color: $darker-text-color;
       }
     }
 
@@ -230,7 +224,7 @@
     }
 
     .username {
-      color: $ui-secondary-color;
+      color: $darker-text-color;
     }
 
     .account__header__content {