tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity

Fix mascot being too large, and a code style issue (#13002)

Browse Source
This commit is contained in:
Eugen Rochko 2020-01-29 16:18:33 +01:00 committed by GitHub
parent 60e160a02d
commit bba0269d97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/javascript/mastodon/reducers/statuses.js
View File

@ -42,8 +42,7 @@ export default function statuses(state = initialState, action) {
case FAVOURITE_REQUEST: case FAVOURITE_REQUEST:
return state.setIn([action.status.get('id'), 'favourited'], true); return state.setIn([action.status.get('id'), 'favourited'], true);
case UNFAVOURITE_SUCCESS: case UNFAVOURITE_SUCCESS:
const favouritesCount = action.status.get('favourites_count'); return state.updateIn([action.status.get('id'), 'favourites_count'], x => Math.max(0, x - 1));
return state.setIn([action.status.get('id'), 'favourites_count'], favouritesCount - 1);
case FAVOURITE_FAIL: case FAVOURITE_FAIL:
return state.get(action.status.get('id')) === undefined ? state : state.setIn([action.status.get('id'), 'favourited'], false); return state.get(action.status.get('id')) === undefined ? state : state.setIn([action.status.get('id'), 'favourited'], false);
case BOOKMARK_REQUEST: case BOOKMARK_REQUEST:

2
app/javascript/styles/mastodon/components.scss
View File

@ -2522,7 +2522,7 @@ a.account__display-name {
display: block; display: block;
object-fit: contain; object-fit: contain;
object-position: bottom left; object-position: bottom left;
width: 100%; width: 85%;
height: 100%; height: 100%;
pointer-events: none; pointer-events: none;
user-drag: none; user-drag: none;