From 23468b83a9bb755a1ef1e0c5f4286d7741784506 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 22 Sep 2021 12:18:06 -0500
Subject: [PATCH] IconButton: use opacity instead of hsla to avoid svg
 transparency issues (improves status icons)

---
 app/soapbox/components/icon_button.js   |  2 +-
 app/styles/components/emoji-reacts.scss | 22 +++++++++++++++-------
 app/styles/ui.scss                      | 10 +++++++---
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/app/soapbox/components/icon_button.js b/app/soapbox/components/icon_button.js
index ee7367370..e892903d7 100644
--- a/app/soapbox/components/icon_button.js
+++ b/app/soapbox/components/icon_button.js
@@ -164,7 +164,7 @@ export default class IconButton extends React.PureComponent {
             tabIndex={tabIndex}
             disabled={disabled}
           >
-            <div style={style}>
+            <div style={src ? {} : style}>
               {emoji
                 ? <div className='icon-button__emoji' style={{ transform: `rotate(${rotate}deg)` }} dangerouslySetInnerHTML={{ __html: emojify(emoji) }} aria-hidden='true' />
                 : <Icon id={icon} src={src} style={{ transform: `rotate(${rotate}deg)` }} fixedWidth aria-hidden='true' />}
diff --git a/app/styles/components/emoji-reacts.scss b/app/styles/components/emoji-reacts.scss
index 43fda752d..160b15d73 100644
--- a/app/styles/components/emoji-reacts.scss
+++ b/app/styles/components/emoji-reacts.scss
@@ -128,20 +128,28 @@
   @media (max-width: 455px) {
     position: static;
   }
-
-  .svg-icon {
-    height: 24px !important;
-  }
 }
 
+.status__action-bar,
 .detailed-status__action-bar {
   .svg-icon {
-    width: 24px;
+    width: 20px;
     height: 20px;
   }
 
-  &--favourite .svg-icon {
-    height: 24px !important;
+  svg.icon-tabler {
+    // Tabler icons are a little thicker than Feather icons
+    stroke-width: 1.6px !important;
+  }
+}
+
+// This icon is a little different than the others...
+.status__action-bar__counter--favourite,
+.detailed-status__button--favourite {
+  .svg-icon {
+    width: 26px !important;
+    height: 26px !important;
+    transform: translateY(-1px);
   }
 }
 
diff --git a/app/styles/ui.scss b/app/styles/ui.scss
index e1318fd48..715c75ecd 100644
--- a/app/styles/ui.scss
+++ b/app/styles/ui.scss
@@ -1,11 +1,12 @@
 .icon-button {
   display: inline-block;
   padding: 0;
-  color: hsla(var(--primary-text-color_hsl), 0.4);
+  color: var(--primary-text-color);
   border: 0;
   background: transparent;
   cursor: pointer;
   transition: color 100ms ease-in;
+  opacity: 0.4;
 
   i.fa {
     margin: 0;
@@ -14,17 +15,18 @@
   &:hover,
   &:active,
   &:focus {
-    color: hsla(var(--primary-text-color_hsl), 0.6);
+    opacity: 0.6;
     transition: color 200ms ease-out;
   }
 
   &.disabled {
-    color: hsla(var(--primary-text-color_hsl), 0.2);
+    opacity: 0.2;
     cursor: default;
   }
 
   &.active {
     color: var(--highlight-text-color);
+    opacity: 1;
   }
 
   &::-moz-focus-inner {
@@ -39,6 +41,7 @@
 
   &.inverted {
     color: var(--primary-text-color--faint);
+    opacity: 1;
 
     &:hover,
     &:active,
@@ -65,6 +68,7 @@
     color: var(--primary-text-color--faint);
     border-radius: 6px;
     padding: 2px;
+    opacity: 1;
 
     > div {
       display: flex;