Merge pull request #797 from asaadmahmoodspin/bug-fixes
Bug fixes and UI improvements for multiple tickets
Этот коммит содержится в:
@@ -5,6 +5,8 @@ var UserStore = require('../stores/user_store.jsx');
|
||||
var utils = require('../utils/utils.jsx');
|
||||
|
||||
var Constants = require('../utils/constants.jsx');
|
||||
var Tooltip = ReactBootstrap.Tooltip;
|
||||
var OverlayTrigger = ReactBootstrap.OverlayTrigger;
|
||||
|
||||
export default class PostInfo extends React.Component {
|
||||
constructor(props) {
|
||||
@@ -148,15 +150,19 @@ export default class PostInfo extends React.Component {
|
||||
|
||||
var dropdown = this.createDropdown();
|
||||
|
||||
let tooltip = <Tooltip>{utils.displayDate(post.create_at)} at ${utils.displayTime(post.create_at)}</Tooltip>;
|
||||
|
||||
return (
|
||||
<ul className='post-header post-info'>
|
||||
<li className='post-header-col'>
|
||||
<time
|
||||
className='post-profile-time'
|
||||
title={`${utils.displayDate(post.create_at)} at ${utils.displayTime(post.create_at)}`}
|
||||
<OverlayTrigger
|
||||
placement='top'
|
||||
overlay={tooltip}
|
||||
>
|
||||
{utils.displayDateTime(post.create_at)}
|
||||
</time>
|
||||
<time className='post-profile-time'>
|
||||
{utils.displayDateTime(post.create_at)}
|
||||
</time>
|
||||
</OverlayTrigger>
|
||||
</li>
|
||||
<li className='post-header-col post-header__reply'>
|
||||
<div className='dropdown'>
|
||||
|
||||
@@ -615,8 +615,9 @@ export function applyTheme(theme) {
|
||||
}
|
||||
|
||||
if (theme.centerChannelColor) {
|
||||
changeCss('.app__content', 'color:' + theme.centerChannelColor, 2);
|
||||
changeCss('.app__content, .post-create__container .post-create-body .btn-file', 'color:' + theme.centerChannelColor, 1);
|
||||
changeCss('#post-create', 'color:' + theme.centerChannelColor, 2);
|
||||
changeCss('.post-body hr', 'background:' + theme.centerChannelColor, 1);
|
||||
changeCss('.channel-header .heading', 'color:' + theme.centerChannelColor, 1);
|
||||
changeCss('.markdown__table tbody tr:nth-child(2n)', 'background:' + changeOpacity(theme.centerChannelColor, 0.07), 1);
|
||||
changeCss('.channel-header__info>div.dropdown .header-dropdown__icon', 'color:' + changeOpacity(theme.centerChannelColor, 0.8), 1);
|
||||
|
||||
Ссылка в новой задаче
Block a user