Merge pull request #1740 from hmhealey/plt730

PLT-730/PLT-731 Added remaining mobile UI V2 components
Этот коммит содержится в:
Joram Wilander
2015-12-28 09:02:20 -05:00
родитель 0b55c5f861 cf00525565
Коммит 2f04ea6dd2
6 изменённых файлов: 224 добавлений и 23 удалений

27
web/react/utils/delayed_action.jsx Обычный файл
Просмотреть файл

@@ -0,0 +1,27 @@
// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
export default class DelayedAction {
constructor(action) {
this.action = action;
this.timer = -1;
// bind fire since it doesn't get passed the correct this value with setTimeout
this.fire = this.fire.bind(this);
}
fire() {
this.action();
this.timer = -1;
}
fireAfter(timeout) {
if (this.timer >= 0) {
window.clearTimeout(this.timer);
}
this.timer = window.setTimeout(this.fire, timeout);
}
}

Просмотреть файл

@@ -567,7 +567,7 @@ export function applyTheme(theme) {
}
if (theme.sidebarHeaderBg) {
changeCss('.sidebar--left .team__header, .sidebar--menu .team__header', 'background:' + theme.sidebarHeaderBg, 1);
changeCss('.sidebar--left .team__header, .sidebar--menu .team__header, .post-list__timestamp', 'background:' + theme.sidebarHeaderBg, 1);
changeCss('.modal .modal-header', 'background:' + theme.sidebarHeaderBg, 1);
changeCss('#navbar .navbar-default', 'background:' + theme.sidebarHeaderBg, 1);
changeCss('@media(max-width: 768px){.search-bar__container', 'background:' + theme.sidebarHeaderBg, 1);
@@ -575,7 +575,7 @@ export function applyTheme(theme) {
}
if (theme.sidebarHeaderTextColor) {
changeCss('.sidebar--left .team__header .header__info, .sidebar--menu .team__header .header__info', 'color:' + theme.sidebarHeaderTextColor, 1);
changeCss('.sidebar--left .team__header .header__info, .sidebar--menu .team__header .header__info, .post-list__timestamp', 'color:' + theme.sidebarHeaderTextColor, 1);
changeCss('.sidebar--left .team__header .navbar-right .dropdown__icon, .sidebar--menu .team__header .navbar-right .dropdown__icon', 'fill:' + theme.sidebarHeaderTextColor, 1);
changeCss('.sidebar--left .team__header .user__name, .sidebar--menu .team__header .user__name', 'color:' + changeOpacity(theme.sidebarHeaderTextColor, 0.8), 1);
changeCss('.sidebar--left .team__header:hover .user__name, .sidebar--menu .team__header:hover .user__name', 'color:' + theme.sidebarHeaderTextColor, 1);