diff --git a/app/javascript/mastodon/components/icon_button.js b/app/javascript/mastodon/components/icon_button.js
index 7ec39198a..6a653675b 100644
--- a/app/javascript/mastodon/components/icon_button.js
+++ b/app/javascript/mastodon/components/icon_button.js
@@ -27,6 +27,7 @@ export default class IconButton extends React.PureComponent {
tabIndex: PropTypes.string,
counter: PropTypes.number,
obfuscateCount: PropTypes.bool,
+ href: PropTypes.string,
};
static defaultProps = {
@@ -102,6 +103,7 @@ export default class IconButton extends React.PureComponent {
title,
counter,
obfuscateCount,
+ href,
} = this.props;
const {
@@ -123,6 +125,20 @@ export default class IconButton extends React.PureComponent {
style.width = 'auto';
}
+ let contents = (
+
+ {typeof counter !== 'undefined' && }
+
+ );
+
+ if (href) {
+ contents = (
+
+ {contents}
+
+ );
+ }
+
return (
);
}
diff --git a/app/javascript/mastodon/features/picture_in_picture/components/footer.js b/app/javascript/mastodon/features/picture_in_picture/components/footer.js
index 690a77531..0cb42b25a 100644
--- a/app/javascript/mastodon/features/picture_in_picture/components/footer.js
+++ b/app/javascript/mastodon/features/picture_in_picture/components/footer.js
@@ -156,7 +156,7 @@ class Footer extends ImmutablePureComponent {
- {withOpenButton && }
+ {withOpenButton && }
);
}
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 647e7ea31..6b18ca6f2 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -166,6 +166,11 @@
transition-property: background-color, color;
text-decoration: none;
+ a {
+ color: inherit;
+ text-decoration: none;
+ }
+
&:hover,
&:active,
&:focus {