From 7710a6c4b18da58b466e044995047bdf50dc4005 Mon Sep 17 00:00:00 2001 From: Takeshi Umeda Date: Sun, 27 Dec 2020 07:50:34 +0900 Subject: [PATCH] [Glitch] Fix logo button style Port ba748a83f2050dff27758bce67c05d37a8b7d8f3 to glitch-soc Signed-off-by: Claire --- app/javascript/flavours/glitch/components/button.js | 12 ------------ .../glitch/features/account/components/header.js | 12 ++++++------ .../flavours/glitch/styles/components/index.scss | 5 +++++ .../flavours/glitch/styles/containers.scss | 5 +++++ app/javascript/flavours/glitch/styles/rtl.scss | 5 +++++ app/javascript/flavours/glitch/styles/statuses.scss | 9 +++++++-- 6 files changed, 28 insertions(+), 20 deletions(-) diff --git a/app/javascript/flavours/glitch/components/button.js b/app/javascript/flavours/glitch/components/button.js index cd6528f5837..b1815c3e190 100644 --- a/app/javascript/flavours/glitch/components/button.js +++ b/app/javascript/flavours/glitch/components/button.js @@ -10,17 +10,11 @@ export default class Button extends React.PureComponent { disabled: PropTypes.bool, block: PropTypes.bool, secondary: PropTypes.bool, - size: PropTypes.number, className: PropTypes.string, title: PropTypes.string, - style: PropTypes.object, children: PropTypes.node, }; - static defaultProps = { - size: 36, - }; - handleClick = (e) => { if (!this.props.disabled) { this.props.onClick(e); @@ -44,12 +38,6 @@ export default class Button extends React.PureComponent { disabled: this.props.disabled, onClick: this.handleClick, ref: this.setRef, - style: { - padding: `0 ${this.props.size / 2.25}px`, - height: `${this.props.size}px`, - lineHeight: `${this.props.size}px`, - ...this.props.style, - }, }; if (this.props.title) attrs.title = this.props.title; diff --git a/app/javascript/flavours/glitch/features/account/components/header.js b/app/javascript/flavours/glitch/features/account/components/header.js index 9b080a14e3d..15515a99a73 100644 --- a/app/javascript/flavours/glitch/features/account/components/header.js +++ b/app/javascript/flavours/glitch/features/account/components/header.js @@ -159,13 +159,17 @@ class Header extends ImmutablePureComponent { info.push(); } + if (account.getIn(['relationship', 'requested']) || account.getIn(['relationship', 'following'])) { + bellBtn = ; + } + if (me !== account.get('id')) { if (!account.get('relationship')) { // Wait until the relationship is loaded actionBtn = ''; } else if (account.getIn(['relationship', 'requested'])) { - actionBtn =