WIP <Compose> Refactor; Fin~
This commit is contained in:
parent
7a9aaf28c4
commit
55ead6a4b2
6 changed files with 38 additions and 6 deletions
|
@ -32,7 +32,7 @@ const handlers = {
|
|||
|
||||
// When blurring the textarea, suggestions are hidden.
|
||||
handleBlur () {
|
||||
this.setState({ suggestionsHidden: true });
|
||||
//this.setState({ suggestionsHidden: true });
|
||||
},
|
||||
|
||||
// When the contents of the textarea change, we have to pull up new
|
||||
|
|
|
@ -7,7 +7,7 @@ import React from 'react';
|
|||
import AccountContainer from 'flavours/glitch/containers/account_container';
|
||||
|
||||
// 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';
|
||||
|
||||
// Gets our asset host from the environment, if available.
|
||||
|
|
|
@ -179,7 +179,7 @@ export default function compose(state = initialState, action) {
|
|||
case COMPOSE_MOUNT:
|
||||
return state.set('mounted', true);
|
||||
case COMPOSE_UNMOUNT:
|
||||
return state.set('mounted', false)
|
||||
return state.set('mounted', false);
|
||||
case COMPOSE_ADVANCED_OPTIONS_CHANGE:
|
||||
return state
|
||||
.set('advanced_options',
|
||||
|
|
|
@ -180,15 +180,15 @@
|
|||
&:hover,
|
||||
&:focus,
|
||||
&:active,
|
||||
&.active { background: darken($ui-secondary-color, 10%) }
|
||||
&.selected { background: darken($ui-secondary-color, 10%) }
|
||||
|
||||
& > .emoji {
|
||||
img {
|
||||
display: block;
|
||||
float: left;
|
||||
margin-right: 8px;
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
width: 18px;
|
||||
height: 18px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -754,6 +754,37 @@
|
|||
text-decoration: none;
|
||||
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 {
|
||||
|
|
|
@ -70,6 +70,7 @@ const emojify = (str, customEmojis = {}) => {
|
|||
};
|
||||
|
||||
export default emojify;
|
||||
export { unicodeMapping };
|
||||
|
||||
export const buildCustomEmojis = (customEmojis) => {
|
||||
const emojis = [];
|
||||
|
|
Loading…
Reference in a new issue