mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Glitch] Fix mascot being too large, and a code style issue 

Port bba0269d97 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
pull/1274/head
Eugen Rochko 2020-01-29 16:18:33 +01:00 committed by Thibaut Girka
parent 369201a425
commit 9dc1f7d299
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/flavours/glitch/reducers/statuses.js
View File

@ -41,8 +41,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/flavours/glitch/styles/components/drawer.scss
View File

@ -210,7 +210,7 @@
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;