diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2020-01-29 16:18:33 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-29 16:18:33 +0100 |
commit | bba0269d9741c8c4daaa9048c265a1321d93fbba (patch) | |
tree | d1787e85727c1f6001bc5cc79763185c108455b0 | |
parent | 60e160a02d47c4b3825dc1fd249ee5b4847022c5 (diff) |
Fix mascot being too large, and a code style issue (#13002)
-rw-r--r-- | app/javascript/mastodon/reducers/statuses.js | 3 | ||||
-rw-r--r-- | app/javascript/styles/mastodon/components.scss | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/javascript/mastodon/reducers/statuses.js b/app/javascript/mastodon/reducers/statuses.js index 398a48cff..2554c008d 100644 --- a/app/javascript/mastodon/reducers/statuses.js +++ b/app/javascript/mastodon/reducers/statuses.js @@ -42,8 +42,7 @@ export default function statuses(state = initialState, action) { case FAVOURITE_REQUEST: return state.setIn([action.status.get('id'), 'favourited'], true); case UNFAVOURITE_SUCCESS: - const favouritesCount = action.status.get('favourites_count'); - return state.setIn([action.status.get('id'), 'favourites_count'], favouritesCount - 1); + return state.updateIn([action.status.get('id'), 'favourites_count'], x => Math.max(0, x - 1)); case FAVOURITE_FAIL: return state.get(action.status.get('id')) === undefined ? state : state.setIn([action.status.get('id'), 'favourited'], false); case BOOKMARK_REQUEST: diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 28b2fa86f..d72f2e059 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -2522,7 +2522,7 @@ a.account__display-name { display: block; object-fit: contain; object-position: bottom left; - width: 100%; + width: 85%; height: 100%; pointer-events: none; user-drag: none; |