PLT-5897: Respect intrinsic ratio of img in emoji picker (#5987)
Changed style of img emoji picker, also fixed preview of emoji.
Этот коммит содержится в:
коммит произвёл
Corey Hulen
родитель
dc9c73a46b
Коммит
f9502ff14b
@@ -44,12 +44,14 @@ export default class EmojiPickerItem extends React.Component {
|
|||||||
|
|
||||||
if (this.props.category === 'recent' || this.props.category === 'custom') {
|
if (this.props.category === 'recent' || this.props.category === 'custom') {
|
||||||
item =
|
item =
|
||||||
(<span>
|
(<span
|
||||||
|
onMouseOver={this.handleMouseOver}
|
||||||
|
onMouseOut={this.handleMouseOut}
|
||||||
|
onClick={this.handleClick}
|
||||||
|
className='emoji-picker__item-wrapper'
|
||||||
|
>
|
||||||
<img
|
<img
|
||||||
className='emoji-picker__item emoticon'
|
className='emoji-picker__item emoticon'
|
||||||
onMouseOver={this.handleMouseOver}
|
|
||||||
onMouseOut={this.handleMouseOut}
|
|
||||||
onClick={this.handleClick}
|
|
||||||
src={EmojiStore.getEmojiImageUrl(this.props.emoji)}
|
src={EmojiStore.getEmojiImageUrl(this.props.emoji)}
|
||||||
/>
|
/>
|
||||||
</span>);
|
</span>);
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ export default class EmojiPickerPreview extends React.Component {
|
|||||||
<div className='emoji-picker__preview-image-box'>
|
<div className='emoji-picker__preview-image-box'>
|
||||||
{previewImage}
|
{previewImage}
|
||||||
</div>
|
</div>
|
||||||
<div className='emoji-picker__preview-detail-box'>
|
<div className='emoji-picker__preview-image-label-box'>
|
||||||
<span className='emoji-picker__preview-name'>{name}</span>
|
<span className='emoji-picker__preview-name'>{name}</span>
|
||||||
<span
|
<span
|
||||||
className='emoji-picker__preview-aliases'
|
className='emoji-picker__preview-aliases'
|
||||||
|
|||||||
@@ -230,15 +230,26 @@
|
|||||||
width: 21px;
|
width: 21px;
|
||||||
padding: 0px;
|
padding: 0px;
|
||||||
border: 0px;
|
border: 0px;
|
||||||
|
text-align: center;
|
||||||
|
border-radius: 6px;
|
||||||
|
overflow: hidden;
|
||||||
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.emoji-picker__item {
|
.emoji-picker__item {
|
||||||
border-radius: 6px;
|
|
||||||
cursor: pointer;
|
|
||||||
font-size: 18px;
|
font-size: 18px;
|
||||||
margin: 3px;
|
margin: 3px;
|
||||||
}
|
}
|
||||||
|
.emoticon {
|
||||||
|
max-height: 21px;
|
||||||
|
max-width: 21px;
|
||||||
|
min-height: 0;
|
||||||
|
min-width: 0;
|
||||||
|
width: auto;
|
||||||
|
height: auto;
|
||||||
|
margin: 0 auto;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.emojisprite-wrapper {
|
.emojisprite-wrapper {
|
||||||
@@ -247,7 +258,11 @@
|
|||||||
|
|
||||||
.emoji-picker__preview {
|
.emoji-picker__preview {
|
||||||
border-top: 1px solid;
|
border-top: 1px solid;
|
||||||
display: table-cell;
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
justify-content: flex-start;
|
||||||
|
align-items: stretch;
|
||||||
|
vertical-align: middle;
|
||||||
flex-grow: 0;
|
flex-grow: 0;
|
||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
height: 45px;
|
height: 45px;
|
||||||
@@ -264,9 +279,29 @@
|
|||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.emoji-picker__preview-image-label-box {
|
||||||
|
margin-left: 3px;
|
||||||
|
.emoji-picker__preview-name {
|
||||||
|
font-size: 13px;
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
|
||||||
|
.emoji-picker__preview-aliases {
|
||||||
|
display: block;
|
||||||
|
font-size: 12px;
|
||||||
|
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
}
|
||||||
.emoji-picker__preview-image-box {
|
.emoji-picker__preview-image-box {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
height: 36px;
|
height: 36px;
|
||||||
|
max-height: 36px;
|
||||||
width: 42px;
|
width: 42px;
|
||||||
|
max-width: 42px;
|
||||||
|
text-align: center;
|
||||||
|
|
||||||
.sprite-preview {
|
.sprite-preview {
|
||||||
border: none;
|
border: none;
|
||||||
@@ -281,20 +316,6 @@
|
|||||||
.emoji-picker__preview-image {
|
.emoji-picker__preview-image {
|
||||||
max-height: 36px;
|
max-height: 36px;
|
||||||
max-width: 42px;
|
max-width: 42px;
|
||||||
padding: 0 10px 0 0;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.emoji-picker__preview-name {
|
|
||||||
|
|
||||||
font-size: 13px;
|
|
||||||
font-weight: bold;
|
|
||||||
}
|
|
||||||
|
|
||||||
.emoji-picker__preview-aliases {
|
|
||||||
display: block;
|
|
||||||
font-size: 12px;
|
|
||||||
|
|
||||||
font-weight: bold;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -682,7 +682,7 @@ export function applyTheme(theme) {
|
|||||||
changeCss('.app__body .emoji-picker__preview', 'border-top-color:' + changeOpacity(theme.centerChannelColor, 0.2));
|
changeCss('.app__body .emoji-picker__preview', 'border-top-color:' + changeOpacity(theme.centerChannelColor, 0.2));
|
||||||
changeCss('.app__body .emoji-picker__category, .app__body .emoji-picker__category:focus, .app__body .emoji-picker__category:hover', 'color:' + changeOpacity(theme.centerChannelColor, 0.3));
|
changeCss('.app__body .emoji-picker__category, .app__body .emoji-picker__category:focus, .app__body .emoji-picker__category:hover', 'color:' + changeOpacity(theme.centerChannelColor, 0.3));
|
||||||
changeCss('.app__body .emoji-picker__category--selected, .app__body .emoji-picker__category--selected:focus, .app__body .emoji-picker__category--selected:hover', 'color:' + theme.centerChannelColor);
|
changeCss('.app__body .emoji-picker__category--selected, .app__body .emoji-picker__category--selected:focus, .app__body .emoji-picker__category--selected:hover', 'color:' + theme.centerChannelColor);
|
||||||
changeCss('.app__body .emoji-picker__item:hover', 'background-color:' + changeOpacity(theme.centerChannelColor, 0.8));
|
changeCss('.app__body .emoji-picker__item-wrapper:hover', 'background-color:' + changeOpacity(theme.centerChannelColor, 0.8));
|
||||||
changeCss('.app__body .emojisprite:hover', 'background-color:' + changeOpacity(theme.centerChannelColor, 0.8));
|
changeCss('.app__body .emojisprite:hover', 'background-color:' + changeOpacity(theme.centerChannelColor, 0.8));
|
||||||
changeCss('.app__body .icon__postcontent_picker:hover', 'color:' + changeOpacity(theme.centerChannelColor, 0.8));
|
changeCss('.app__body .icon__postcontent_picker:hover', 'color:' + changeOpacity(theme.centerChannelColor, 0.8));
|
||||||
}
|
}
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user