Этот коммит содержится в:
Asaad Mahmood
2016-03-29 17:55:30 +05:00
родитель 4c28726760
Коммит 501eef0385
8 изменённых файлов: 44 добавлений и 30 удалений

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

@@ -570,8 +570,10 @@ function FloatingTimestamp({isScrolling, post}) {
return ( return (
<div className={className}> <div className={className}>
<div>
<span>{dateString}</span> <span>{dateString}</span>
</div> </div>
</div>
); );
} }

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

@@ -131,7 +131,7 @@ export default class Textbox extends React.Component {
const helpText = ( const helpText = (
<div <div
style={{visibility: hasText ? 'visible' : 'hidden', opacity: hasText ? '0.5' : '0'}} style={{visibility: hasText ? 'visible' : 'hidden', opacity: hasText ? '0.5' : '0'}}
className='help_format_text' className='help__format-text'
> >
<b> <b>
<FormattedMessage <FormattedMessage
@@ -208,8 +208,8 @@ export default class Textbox extends React.Component {
dangerouslySetInnerHTML={{__html: this.state.preview ? TextFormatting.formatText(this.props.messageText) : ''}} dangerouslySetInnerHTML={{__html: this.state.preview ? TextFormatting.formatText(this.props.messageText) : ''}}
> >
</div> </div>
{helpText}
<div className='help__text'> <div className='help__text'>
{helpText}
{previewLink} {previewLink}
<a <a
target='_blank' target='_blank'

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

@@ -66,6 +66,7 @@ body.ios {
font-size: 13px; font-size: 13px;
position: absolute; position: absolute;
right: 0; right: 0;
text-align: right;
z-index: 3; z-index: 3;
} }
@@ -74,16 +75,14 @@ body.ios {
} }
} }
.help_format_text { .help__format-text {
@include opacity(0); @include opacity(0);
@include single-transition(all .2s ease); @include single-transition(all .2s ease);
bottom: -23px; display: inline-block;
display: none !important;
font-size: .85em; font-size: .85em;
left: 0; margin-right: 10px;
overflow: hidden; vertical-align: bottom;
position: absolute; white-space: nowrap;
text-overflow: ellipsis;
b, b,
i, i,
@@ -275,39 +274,36 @@ body.ios {
outline: none; outline: none;
text-align: center; text-align: center;
} }
.beginning-messages-text {
color: grey;
display: block;
margin-bottom: 5px;
margin-top: 2px;
text-align: center;
}
} }
.post-list__timestamp { .post-list__timestamp {
@include border-radius(3px);
@include opacity(0); @include opacity(0);
@include single-transition(all, .6s, ease); @include single-transition(all, .6s, ease);
@include translateY(-45px); @include translateY(-45px);
@include font-smoothing(initial);
background: $primary-color;
color: $white;
display: none; display: none;
font-size: 12px; left: 0;
left: 50%;
line-height: 25px;
margin-left: -60px;
position: absolute; position: absolute;
text-align: center; text-align: center;
top: 8px; top: 8px;
width: 120px; width: 100%;
z-index: 50; z-index: 50;
&.scrolling { &.scrolling {
@include translateY(0); @include translateY(0);
@include opacity(.8); @include opacity(.8);
} }
> div {
@include border-radius(3px);
@include font-smoothing(initial);
background: $primary-color;
color: $white;
display: inline-block;
font-size: 12px;
line-height: 25px;
padding: 0 8px;
text-align: center;
}
} }
.post-list__arrows { .post-list__arrows {

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

@@ -25,6 +25,10 @@
} }
} }
.help__format-text {
display: none;
}
.sidebar--right__content { .sidebar--right__content {
@include display-flex; @include display-flex;
@include flex-direction(column); @include flex-direction(column);

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

@@ -17,6 +17,14 @@
} }
@media screen and (max-width: 1440px) { @media screen and (max-width: 1440px) {
.inner-wrap {
&.move--left {
.help__format-text {
display: none;
}
}
}
.date-separator, .date-separator,
.new-separator { .new-separator {
&.hovered--comment { &.hovered--comment {

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

@@ -15,6 +15,10 @@
} }
} }
.help__format-text {
display: none;
}
.inner-wrap { .inner-wrap {
&.move--left { &.move--left {
margin-right: 0; margin-right: 0;

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

@@ -200,7 +200,7 @@
display: block; display: block;
height: 40px; height: 40px;
line-height: 34px; line-height: 34px;
margin: 1em 1rem; margin: 1em 0;
min-width: 200px; min-width: 200px;
padding: 0 1em; padding: 0 1em;
width: 200px; width: 200px;

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

@@ -651,7 +651,7 @@ export function applyTheme(theme) {
} }
if (theme.sidebarHeaderBg) { if (theme.sidebarHeaderBg) {
changeCss('.sidebar--left .team__header, .sidebar--menu .team__header, .post-list__timestamp', 'background:' + theme.sidebarHeaderBg, 1); changeCss('.sidebar--left .team__header, .sidebar--menu .team__header, .post-list__timestamp > div', 'background:' + theme.sidebarHeaderBg, 1);
changeCss('.modal .modal-header', 'background:' + theme.sidebarHeaderBg, 1); changeCss('.modal .modal-header', 'background:' + theme.sidebarHeaderBg, 1);
changeCss('#navbar .navbar-default', 'background:' + theme.sidebarHeaderBg, 1); changeCss('#navbar .navbar-default', 'background:' + theme.sidebarHeaderBg, 1);
changeCss('@media(max-width: 768px){.search-bar__container', 'background:' + theme.sidebarHeaderBg, 1); changeCss('@media(max-width: 768px){.search-bar__container', 'background:' + theme.sidebarHeaderBg, 1);
@@ -659,7 +659,7 @@ export function applyTheme(theme) {
} }
if (theme.sidebarHeaderTextColor) { if (theme.sidebarHeaderTextColor) {
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 .header__info, .sidebar--menu .team__header .header__info, .post-list__timestamp > div', '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 .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 .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); changeCss('.sidebar--left .team__header:hover .user__name, .sidebar--menu .team__header:hover .user__name', 'color:' + theme.sidebarHeaderTextColor, 1);