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

WIP <Compose> Refactor; Fin~

pull/293/head
kibigo! 2018-01-04 21:17:30 -08:00
parent 42f50049ff
commit d7ce339c2e
6 changed files with 38 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/flavours/glitch/features/composer/textarea/index.js
View File

@ -32,7 +32,7 @@ const handlers = {
// When blurring the textarea, suggestions are hidden. // When blurring the textarea, suggestions are hidden.
handleBlur () { handleBlur () {
this.setState({ suggestionsHidden: true }); //this.setState({ suggestionsHidden: true });
}, },
// When the contents of the textarea change, we have to pull up new // When the contents of the textarea change, we have to pull up new

2
app/javascript/flavours/glitch/features/composer/textarea/suggestions/item/index.js
View File

@ -7,7 +7,7 @@ import React from 'react';
import AccountContainer from 'flavours/glitch/containers/account_container'; import AccountContainer from 'flavours/glitch/containers/account_container';
// Utils. // Utils.
import { unicodeMapping } from 'flavours/glitch/util/emoji/emoji_unicode_mapping_light'; import { unicodeMapping } from 'flavours/glitch/util/emoji';
import { assignHandlers } from 'flavours/glitch/util/react_helpers'; import { assignHandlers } from 'flavours/glitch/util/react_helpers';
// Gets our asset host from the environment, if available. // Gets our asset host from the environment, if available.

2
app/javascript/flavours/glitch/reducers/compose.js
View File

@ -179,7 +179,7 @@ export default function compose(state = initialState, action) {
case COMPOSE_MOUNT: case COMPOSE_MOUNT:
return state.set('mounted', true); return state.set('mounted', true);
case COMPOSE_UNMOUNT: case COMPOSE_UNMOUNT:
return state.set('mounted', false) return state.set('mounted', false);
case COMPOSE_ADVANCED_OPTIONS_CHANGE: case COMPOSE_ADVANCED_OPTIONS_CHANGE:
return state return state
.set('advanced_options', .set('advanced_options',

6
app/javascript/flavours/glitch/styles/components/composer.scss
View File

@ -180,15 +180,15 @@
&:hover, &:hover,
&:focus, &:focus,
&:active, &:active,
&.active { background: darken($ui-secondary-color, 10%) } &.selected { background: darken($ui-secondary-color, 10%) }
& > .emoji { & > .emoji {
img { img {
display: block; display: block;
float: left; float: left;
margin-right: 8px; margin-right: 8px;
width: 16px; width: 18px;
height: 16px; height: 18px;
} }
} }
} }

31
app/javascript/flavours/glitch/styles/components/index.scss
View File

@ -754,6 +754,37 @@
text-decoration: none; text-decoration: none;
font-size: 14px; font-size: 14px;
} }
&.small {
border: none;
padding: 0;
& > .account__avatar-wrapper { margin: 0 8px 0 0 }
& > .display-name {
display: block;
padding: 0;
height: auto;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
& > strong {
display: inline;
font-size: inherit;
line-height: inherit;
}
& > span {
display: inline;
color: lighten($ui-base-color, 36%);
font-size: inherit;
line-height: inherit;
&::before { content: " " }
}
}
}
} }
.account__wrapper { .account__wrapper {

1
app/javascript/flavours/glitch/util/emoji/index.js
View File

@ -70,6 +70,7 @@ const emojify = (str, customEmojis = {}) => {
}; };
export default emojify; export default emojify;
export { unicodeMapping };
export const buildCustomEmojis = (customEmojis) => { export const buildCustomEmojis = (customEmojis) => {
const emojis = []; const emojis = [];