diff --git a/app/javascript/mastodon/components/display_name.js b/app/javascript/mastodon/components/display_name.js
index 3894f3e82..eaa371b45 100644
--- a/app/javascript/mastodon/components/display_name.js
+++ b/app/javascript/mastodon/components/display_name.js
@@ -83,12 +83,12 @@ export default class DisplayName extends React.PureComponent {
acct = `${acct}@${localDomain}`;
}
- displayName =
- ;
+ );
suffix = @{acct};
}
diff --git a/app/javascript/mastodon/features/follow_requests/components/account_authorize.js b/app/javascript/mastodon/features/follow_requests/components/account_authorize.js
index 038a77c5a..6116d6d8c 100644
--- a/app/javascript/mastodon/features/follow_requests/components/account_authorize.js
+++ b/app/javascript/mastodon/features/follow_requests/components/account_authorize.js
@@ -4,10 +4,10 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import Permalink from '../../../components/permalink';
import Avatar from '../../../components/avatar';
import DisplayName from '../../../components/display_name';
-import IconButton from '../../../components/icon_button';
import { defineMessages, FormattedMessage, injectIntl } from 'react-intl';
import { shortNumberFormat } from 'mastodon/utils/numbers';
import ImmutablePureComponent from 'react-immutable-pure-component';
+import { NavLink } from 'react-router-dom';
const messages = defineMessages({
authorize: { id: 'follow_request.authorize', defaultMessage: 'Authorize' },
@@ -36,18 +36,56 @@ class AccountAuthorize extends ImmutablePureComponent {
to={`/accounts/${account.get('id')}`}
className='detailed-status__display-name'
>
-
+
- {/*count posts*/}
- {shortNumberFormat(account.get('statuses_count'))}
-
+ {/*count posts*/}
+
+
+
+ {shortNumberFormat(account.get('statuses_count'))}
-
+
+
+
+ {shortNumberFormat(account.get('following_count'))}
+
+
+
+ {shortNumberFormat(account.get('followers_count'))}
+
+
+
-
-
+ {intl.formatMessage(messages.authorize)}
+ >
+ {intl.formatMessage(messages.authorize)}
-
-
+ {intl.formatMessage(messages.reject)}
+ >
+ {intl.formatMessage(messages.reject)}
diff --git a/app/javascript/styles/bliss/basics.scss b/app/javascript/styles/bliss/basics.scss
index 42cdae7aa..b5b5c5f73 100644
--- a/app/javascript/styles/bliss/basics.scss
+++ b/app/javascript/styles/bliss/basics.scss
@@ -192,3 +192,18 @@ button {
}
}
+.clickable {
+ cursor: pointer;
+
+ &:hover {
+ color: $ui-highlight-color;
+ }
+}
+
+.pull-right {
+ float: right;
+}
+
+.pull-left {
+ float: left;
+}
diff --git a/app/javascript/styles/bliss/components.scss b/app/javascript/styles/bliss/components.scss
index 6e6af8a4d..85d9dd1bf 100644
--- a/app/javascript/styles/bliss/components.scss
+++ b/app/javascript/styles/bliss/components.scss
@@ -1420,10 +1420,19 @@ a .account__avatar {
padding: 14px 10px;
.detailed-status__display-name {
- display: block;
+ display: inline-block;
margin-bottom: 15px;
overflow: hidden;
}
+
+ &--more-data {
+ margin-bottom: 0.5em;
+
+ a {
+ padding: 1em;
+ color: $highlight-text-color;
+ }
+ }
}
.account-authorize__avatar {
@@ -2265,7 +2274,7 @@ a.account__display-name {
.columns-area__panels__pane--compositional {
display: none;
}
- .hide-on-smaller-screens{
+ .hide-on-smaller-screens {
display: none;
}
}
@@ -2322,7 +2331,7 @@ a.account__display-name {
flex-direction: column;
height: calc(100% - 10px);
overflow-y: hidden;
- z-index:1;
+ z-index: 1;
.navigation-bar {
padding-top: 20px;