Multiple Ui improvements (#5398)
* PLT-5475 - Adjusting tutorials on mobile * PLT-5475 - Adjusting tutorials on mobile * PLT-5457 - Adjusting save button * PLT-5443 - Updating highllight on status compact * PLT-5413 - Team sidebar not scrolling * PLT-5358 - Maintaing aspect ratio for emojis * PLT-5411 - Removing help text from LDAP signin * PLT-5420 - Updating emoticon for headings * Updating emoji size * Updating emoji size * Removing emoticon tag * Updating emoticon sizes * Updating emoji size
Этот коммит содержится в:
коммит произвёл
Harrison Healey
родитель
d60d05f2d8
Коммит
c6ffb73999
@@ -186,9 +186,9 @@ export default class AddEmoji extends React.Component {
|
|||||||
defaultMessage='This is a sentence with {image} in it.'
|
defaultMessage='This is a sentence with {image} in it.'
|
||||||
values={{
|
values={{
|
||||||
image: (
|
image: (
|
||||||
<img
|
<span
|
||||||
className='emoticon'
|
className='emoticon'
|
||||||
src={this.state.imageUrl}
|
style={{backgroundImage: 'url(' + this.state.imageUrl + ')'}}
|
||||||
/>
|
/>
|
||||||
)
|
)
|
||||||
}}
|
}}
|
||||||
|
|||||||
@@ -98,9 +98,9 @@ export default class EmojiListItem extends React.Component {
|
|||||||
{':' + emoji.name + ':'}
|
{':' + emoji.name + ':'}
|
||||||
</td>
|
</td>
|
||||||
<td className='emoji-list__image'>
|
<td className='emoji-list__image'>
|
||||||
<img
|
<span
|
||||||
className='emoticon'
|
className='emoticon'
|
||||||
src={EmojiStore.getEmojiImageUrl(emoji)}
|
style={{backgroundImage: 'url(' + EmojiStore.getEmojiImageUrl(emoji) + ')'}}
|
||||||
/>
|
/>
|
||||||
</td>
|
</td>
|
||||||
<td className='emoji-list__creator'>
|
<td className='emoji-list__creator'>
|
||||||
|
|||||||
@@ -188,9 +188,9 @@ export default class Reaction extends React.Component {
|
|||||||
className={className}
|
className={className}
|
||||||
onClick={handleClick}
|
onClick={handleClick}
|
||||||
>
|
>
|
||||||
<img
|
<span
|
||||||
className='post-reaction__emoji'
|
className='post-reaction__emoji emoticon'
|
||||||
src={EmojiStore.getEmojiImageUrl(EmojiStore.get(this.props.emojiName))}
|
style={{backgroundImage: 'url(' + EmojiStore.getEmojiImageUrl(EmojiStore.get(this.props.emojiName)) + ')'}}
|
||||||
/>
|
/>
|
||||||
<span className='post-reaction__count'>
|
<span className='post-reaction__count'>
|
||||||
{this.props.reactions.length}
|
{this.props.reactions.length}
|
||||||
|
|||||||
@@ -244,7 +244,7 @@ export default class ProfilePopover extends React.Component {
|
|||||||
<div
|
<div
|
||||||
data-toggle='tooltip'
|
data-toggle='tooltip'
|
||||||
key='user-popover-dm'
|
key='user-popover-dm'
|
||||||
className='popover-dm__content'
|
className='popover__row'
|
||||||
>
|
>
|
||||||
<a
|
<a
|
||||||
href='#'
|
href='#'
|
||||||
|
|||||||
@@ -500,7 +500,6 @@ class UserSettingsGeneralTab extends React.Component {
|
|||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
{helpText}
|
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
} else if (this.props.user.auth_service === Constants.SAML_SERVICE) {
|
} else if (this.props.user.auth_service === Constants.SAML_SERVICE) {
|
||||||
|
|||||||
@@ -6,7 +6,9 @@
|
|||||||
background-size: contain;
|
background-size: contain;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
height: 20px;
|
height: 20px;
|
||||||
vertical-align: text-top;
|
min-height: 1em;
|
||||||
|
min-width: 1em;
|
||||||
|
vertical-align: middle;
|
||||||
width: 20px;
|
width: 20px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -35,26 +35,16 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.popover-dm__content {
|
.popover__row {
|
||||||
-webkit-border-radius: 0;
|
border-top: 1px solid transparent;
|
||||||
-moz-border-radius: 0;
|
margin: 9px -15px 0;
|
||||||
-ms-border-radius: 0;
|
padding: 9px 15px 0;
|
||||||
-o-border-radius: 0;
|
|
||||||
border-radius: 0;
|
|
||||||
max-width: 100%;
|
|
||||||
overflow: hidden;
|
|
||||||
padding: 5px 5px 5px 0px;
|
|
||||||
text-overflow: ellipsis;
|
|
||||||
margin: 0;
|
|
||||||
font-size: 14px;
|
|
||||||
border-top: 1px solid #ebebeb;
|
|
||||||
border-color: rgba(221, 221, 221, 0.2);
|
|
||||||
margin-top: 5px;
|
|
||||||
margin-bottom: -5px;
|
|
||||||
> a {
|
> a {
|
||||||
> i {
|
> i {
|
||||||
margin-right: 5px;
|
margin-right: 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
> span {
|
> span {
|
||||||
text-transform: capitalize;
|
text-transform: capitalize;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -575,14 +575,16 @@
|
|||||||
|
|
||||||
.status {
|
.status {
|
||||||
bottom: auto;
|
bottom: auto;
|
||||||
left: -3px;
|
height: 13px;
|
||||||
|
left: -2px;
|
||||||
position: relative;
|
position: relative;
|
||||||
right: auto;
|
right: auto;
|
||||||
top: auto;
|
top: auto;
|
||||||
|
width: 13px;
|
||||||
}
|
}
|
||||||
|
|
||||||
svg {
|
svg {
|
||||||
top: 0;
|
top: 1px;
|
||||||
}
|
}
|
||||||
|
|
||||||
&:after {
|
&:after {
|
||||||
@@ -1023,7 +1025,7 @@
|
|||||||
word-wrap: break-word;
|
word-wrap: break-word;
|
||||||
|
|
||||||
div {
|
div {
|
||||||
margin: 0 0 .4em;
|
margin-bottom: .4em;
|
||||||
}
|
}
|
||||||
|
|
||||||
p + p {
|
p + p {
|
||||||
@@ -1135,10 +1137,11 @@
|
|||||||
padding: 0 4px 0 3px;
|
padding: 0 4px 0 3px;
|
||||||
|
|
||||||
.post-reaction__emoji {
|
.post-reaction__emoji {
|
||||||
height: 16px;
|
height: auto;
|
||||||
margin: 2px 3px 0 0;
|
margin: 2px 3px 0 0;
|
||||||
vertical-align: top;
|
max-height: 16px;
|
||||||
width: 16px;
|
max-width: 16px;
|
||||||
|
vertical-align: middle;
|
||||||
}
|
}
|
||||||
|
|
||||||
.post-reaction__count {
|
.post-reaction__count {
|
||||||
|
|||||||
@@ -8,7 +8,8 @@
|
|||||||
z-index: 5;
|
z-index: 5;
|
||||||
|
|
||||||
.team-wrapper {
|
.team-wrapper {
|
||||||
background-color: rgba(0, 0, 0, 0.2);
|
-webkit-overflow-scrolling: touch;
|
||||||
|
background-color: alpha-color($black, .2);
|
||||||
height: 100%;
|
height: 100%;
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
padding-top: 15px;
|
padding-top: 15px;
|
||||||
|
|||||||
@@ -1556,17 +1556,24 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.tutorial-steps__container {
|
.tutorial-steps__container {
|
||||||
|
left: 0;
|
||||||
|
position: fixed;
|
||||||
|
top: 0;
|
||||||
|
|
||||||
.tutorial__content {
|
.tutorial__content {
|
||||||
.tutorial__steps {
|
.tutorial__steps {
|
||||||
|
margin-top: 20px;
|
||||||
|
min-height: auto;
|
||||||
padding: 0 20px;
|
padding: 0 20px;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
|
||||||
h1 {
|
h1 {
|
||||||
font-size: 35px;
|
font-size: 2em;
|
||||||
margin: -5px 0 20px;
|
margin: -5px 0 20px;
|
||||||
}
|
}
|
||||||
|
|
||||||
h3 {
|
h3 {
|
||||||
|
font-size: 1.5em;
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1575,14 +1582,14 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.tutorial__circles {
|
.tutorial__circles {
|
||||||
bottom: 60px;
|
bottom: auto;
|
||||||
margin: 0 0 15px;
|
margin: 15px 0 20px;
|
||||||
position: absolute;
|
position: relative;
|
||||||
}
|
}
|
||||||
|
|
||||||
.tutorial__footer {
|
.tutorial__footer {
|
||||||
bottom: 30px;
|
bottom: auto;
|
||||||
position: absolute;
|
position: relative;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -396,22 +396,22 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.emoji-list__name {
|
.emoji-list__name {
|
||||||
padding: 20px 0px 20px 15px;
|
padding: 20px 0 20px 15px;
|
||||||
width: 30%;
|
width: 30%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.emoji-list__image {
|
.emoji-list__image {
|
||||||
padding: 15px 0px;
|
padding: 15px 0;
|
||||||
width: 15%;
|
width: 15%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.emoji-list__creator {
|
.emoji-list__creator {
|
||||||
padding: 15px 0px;
|
padding: 15px 0;
|
||||||
width: 40%;
|
width: 40%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.emoji-list__actions {
|
.emoji-list__actions {
|
||||||
padding: 20px 15px 20px 0px;
|
padding: 20px 15px 20px 0;
|
||||||
width: 15%;
|
width: 15%;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -434,8 +434,4 @@
|
|||||||
.add-emoji__filename,
|
.add-emoji__filename,
|
||||||
.add-emoji__preview {
|
.add-emoji__preview {
|
||||||
padding-top: 7px;
|
padding-top: 7px;
|
||||||
|
|
||||||
.emoticon {
|
|
||||||
margin-bottom: 0;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,6 +19,7 @@
|
|||||||
.get-app__continue-with-browser {
|
.get-app__continue-with-browser {
|
||||||
display: block;
|
display: block;
|
||||||
margin-top: 40px;
|
margin-top: 40px;
|
||||||
|
padding-bottom: 30px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -548,6 +548,7 @@ export function applyTheme(theme) {
|
|||||||
|
|
||||||
if (theme.centerChannelBg) {
|
if (theme.centerChannelBg) {
|
||||||
changeCss('@media(min-width: 768px){.app__body .post:hover .post__header .col__reply, .app__body .post.post--hovered .post__header .col__reply', 'background:' + theme.centerChannelBg);
|
changeCss('@media(min-width: 768px){.app__body .post:hover .post__header .col__reply, .app__body .post.post--hovered .post__header .col__reply', 'background:' + theme.centerChannelBg);
|
||||||
|
changeCss('@media(max-width: 320px){.tutorial-steps__container', 'background:' + theme.centerChannelBg);
|
||||||
changeCss('.app__body .app__content, .app__body .markdown__table, .app__body .markdown__table tbody tr, .app__body .suggestion-list__content, .app__body .modal .modal-content, .app__body .modal .modal-footer, .app__body .post.post--compact .post-image__column, .app__body .suggestion-list__divider > span, .app__body .status-wrapper .status', 'background:' + theme.centerChannelBg);
|
changeCss('.app__body .app__content, .app__body .markdown__table, .app__body .markdown__table tbody tr, .app__body .suggestion-list__content, .app__body .modal .modal-content, .app__body .modal .modal-footer, .app__body .post.post--compact .post-image__column, .app__body .suggestion-list__divider > span, .app__body .status-wrapper .status', 'background:' + theme.centerChannelBg);
|
||||||
changeCss('#post-list .post-list-holder-by-time, .app__body .post .dropdown-menu a', 'background:' + theme.centerChannelBg);
|
changeCss('#post-list .post-list-holder-by-time, .app__body .post .dropdown-menu a', 'background:' + theme.centerChannelBg);
|
||||||
changeCss('#post-create', 'background:' + theme.centerChannelBg);
|
changeCss('#post-create', 'background:' + theme.centerChannelBg);
|
||||||
@@ -594,7 +595,7 @@ export function applyTheme(theme) {
|
|||||||
changeCss('.app__body .popover.left>.arrow', 'border-left-color:' + changeOpacity(theme.centerChannelColor, 0.25));
|
changeCss('.app__body .popover.left>.arrow', 'border-left-color:' + changeOpacity(theme.centerChannelColor, 0.25));
|
||||||
changeCss('.app__body .popover.top>.arrow', 'border-top-color:' + changeOpacity(theme.centerChannelColor, 0.25));
|
changeCss('.app__body .popover.top>.arrow', 'border-top-color:' + changeOpacity(theme.centerChannelColor, 0.25));
|
||||||
changeCss('.app__body .suggestion-list__content .command, .app__body .popover .popover-title', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2));
|
changeCss('.app__body .suggestion-list__content .command, .app__body .popover .popover-title', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2));
|
||||||
changeCss('.app__body .suggestion-list__content .command, .app__body .popover .popover-dm__content', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2));
|
changeCss('.app__body .suggestion-list__content .command, .app__body .popover .popover__row', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2));
|
||||||
changeCss('.app__body .suggestion-list__divider:before, .app__body .dropdown-menu .divider, .app__body .search-help-popover .search-autocomplete__divider:before', 'background:' + theme.centerChannelColor);
|
changeCss('.app__body .suggestion-list__divider:before, .app__body .dropdown-menu .divider, .app__body .search-help-popover .search-autocomplete__divider:before', 'background:' + theme.centerChannelColor);
|
||||||
changeCss('.app__body .custom-textarea', 'color:' + theme.centerChannelColor);
|
changeCss('.app__body .custom-textarea', 'color:' + theme.centerChannelColor);
|
||||||
changeCss('.app__body .post-image__column', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2));
|
changeCss('.app__body .post-image__column', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2));
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user