From 470f629b06477eb3fb049de16de73c6e829f20b5 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Fri, 2 Dec 2016 14:52:41 +0100 Subject: [PATCH] Fix #284 - Alignment in notifications column --- .../components/components/account.jsx | 17 +++++----- .../notifications/components/notification.jsx | 33 ++++++++++++++++--- 2 files changed, 36 insertions(+), 14 deletions(-) diff --git a/app/assets/javascripts/components/components/account.jsx b/app/assets/javascripts/components/components/account.jsx index 413a956b92..558b38b423 100644 --- a/app/assets/javascripts/components/components/account.jsx +++ b/app/assets/javascripts/components/components/account.jsx @@ -31,7 +31,8 @@ const noteStyle = { }; const buttonsStyle = { - padding: '10px' + padding: '10px', + height: '18px' }; const Account = React.createClass({ @@ -68,25 +69,23 @@ const Account = React.createClass({ note =
{account.get('note')}
; } - if (account.get('id') !== me) { + if (account.get('id') !== me && account.get('relationship', null) != null) { const following = account.getIn(['relationship', 'following']); - buttons = ( -
- -
- ); + buttons = ; } return (
-
+
- {buttons} +
+ {buttons} +
{note} diff --git a/app/assets/javascripts/components/features/notifications/components/notification.jsx b/app/assets/javascripts/components/features/notifications/components/notification.jsx index be8cf36167..a8208f02c8 100644 --- a/app/assets/javascripts/components/features/notifications/components/notification.jsx +++ b/app/assets/javascripts/components/features/notifications/components/notification.jsx @@ -6,11 +6,13 @@ import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; const messageStyle = { - padding: '8px 10px', + marginLeft: '68px', + padding: '8px 0', paddingBottom: '0', cursor: 'default', color: '#d9e1e8', - fontSize: '15px' + fontSize: '15px', + position: 'relative' }; const linkStyle = { @@ -28,7 +30,14 @@ const Notification = React.createClass({ renderFollow (account, link) { return (
-
+
+
+ +
+ + +
+
); @@ -41,7 +50,14 @@ const Notification = React.createClass({ renderFavourite (notification, link) { return (
-
+
+
+ +
+ + +
+
); @@ -50,7 +66,14 @@ const Notification = React.createClass({ renderReblog (notification, link) { return (
-
+
+
+ +
+ + +
+
);