UI Improvements for Slack and post dropdown
Этот коммит содержится в:
@@ -50,7 +50,7 @@ export default class ImportThemeModal extends React.Component {
|
|||||||
theme.sidebarText = colors[5];
|
theme.sidebarText = colors[5];
|
||||||
theme.sidebarUnreadText = colors[5];
|
theme.sidebarUnreadText = colors[5];
|
||||||
theme.sidebarTextHoverBg = colors[4];
|
theme.sidebarTextHoverBg = colors[4];
|
||||||
theme.sidebarTextActiveBg = colors[2];
|
theme.sidebarTextActiveBorder = colors[2];
|
||||||
theme.sidebarTextActiveColor = colors[3];
|
theme.sidebarTextActiveColor = colors[3];
|
||||||
theme.sidebarHeaderBg = colors[1];
|
theme.sidebarHeaderBg = colors[1];
|
||||||
theme.sidebarHeaderTextColor = colors[5];
|
theme.sidebarHeaderTextColor = colors[5];
|
||||||
@@ -59,9 +59,13 @@ export default class ImportThemeModal extends React.Component {
|
|||||||
theme.mentionColor = '#ffffff';
|
theme.mentionColor = '#ffffff';
|
||||||
theme.centerChannelBg = '#ffffff';
|
theme.centerChannelBg = '#ffffff';
|
||||||
theme.centerChannelColor = '#333333';
|
theme.centerChannelColor = '#333333';
|
||||||
|
theme.newMessageSeparator = '#F80';
|
||||||
theme.linkColor = '#2389d7';
|
theme.linkColor = '#2389d7';
|
||||||
theme.buttonBg = '#26a970';
|
theme.buttonBg = '#26a970';
|
||||||
theme.buttonColor = '#ffffff';
|
theme.buttonColor = '#ffffff';
|
||||||
|
theme.mentionHighlightBg = '#fff2bb';
|
||||||
|
theme.mentionHighlightLink = '#2f81b7';
|
||||||
|
theme.codeTheme = 'github';
|
||||||
|
|
||||||
let user = UserStore.getCurrentUser();
|
let user = UserStore.getCurrentUser();
|
||||||
user.theme_props = theme;
|
user.theme_props = theme;
|
||||||
|
|||||||
@@ -172,13 +172,13 @@ export default class UserSettingsDisplay extends React.Component {
|
|||||||
</label>
|
</label>
|
||||||
<br/>
|
<br/>
|
||||||
</div>
|
</div>
|
||||||
<div><br/>{'How should other users be shown in Direct Messages list?'}</div>
|
<div><br/>{'Set what name to display in the Direct Messages list.'}</div>
|
||||||
</div>
|
</div>
|
||||||
];
|
];
|
||||||
|
|
||||||
nameFormatSection = (
|
nameFormatSection = (
|
||||||
<SettingItemMax
|
<SettingItemMax
|
||||||
title='Show real names, nick names or usernames?'
|
title='Teammate Name Display'
|
||||||
inputs={inputs}
|
inputs={inputs}
|
||||||
submit={this.handleSubmit}
|
submit={this.handleSubmit}
|
||||||
server_error={serverError}
|
server_error={serverError}
|
||||||
@@ -200,7 +200,7 @@ export default class UserSettingsDisplay extends React.Component {
|
|||||||
|
|
||||||
nameFormatSection = (
|
nameFormatSection = (
|
||||||
<SettingItemMin
|
<SettingItemMin
|
||||||
title='Show real names, nick names or usernames?'
|
title='Teammate Name Display'
|
||||||
describe={describe}
|
describe={describe}
|
||||||
updateSection={() => {
|
updateSection={() => {
|
||||||
this.props.updateSection('name_format');
|
this.props.updateSection('name_format');
|
||||||
|
|||||||
@@ -212,6 +212,20 @@ body.ios {
|
|||||||
.post-list__content {
|
.post-list__content {
|
||||||
display: table-cell;
|
display: table-cell;
|
||||||
vertical-align: bottom;
|
vertical-align: bottom;
|
||||||
|
div {
|
||||||
|
&:last-child {
|
||||||
|
.post {
|
||||||
|
.post-header {
|
||||||
|
.post-header-col.post-header__reply {
|
||||||
|
.dropdown-menu {
|
||||||
|
top: auto;
|
||||||
|
bottom: 25px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.more-messages-text {
|
.more-messages-text {
|
||||||
@@ -387,16 +401,6 @@ body.ios {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
&.post--last {
|
|
||||||
.post-header {
|
|
||||||
.post-header-col.post-header__reply {
|
|
||||||
.dropdown-menu {
|
|
||||||
top: auto;
|
|
||||||
bottom: 25px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.post-create-footer {
|
.post-create-footer {
|
||||||
padding: 0;
|
padding: 0;
|
||||||
}
|
}
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user