Merge pull request #925 from asaadmahmoodspin/ui-improvements

Multiple UI Improvements
Этот коммит содержится в:
Harrison Healey
2015-10-05 16:12:29 -04:00
родитель e2e00d9d43 e7d7892fd7
Коммит da61bb38ff
8 изменённых файлов: 20 добавлений и 24 удалений

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

@@ -67,9 +67,6 @@ export default class PopoverListMembers extends React.Component {
> >
<div <div
id='member_tooltip' id='member_tooltip'
data-placement='left'
data-toggle='tooltip'
title='View Channel Members'
> >
{countText} {countText}
<span <span

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

@@ -150,7 +150,9 @@ export default class ImportThemeModal extends React.Component {
className='form-control' className='form-control'
onChange={this.handleChange} onChange={this.handleChange}
/> />
{this.state.inputError} <div className='input__help'>
{this.state.inputError}
</div>
</div> </div>
</div> </div>
</Modal.Body> </Modal.Body>

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

@@ -471,7 +471,7 @@ export function applyTheme(theme) {
} }
if (theme.centerChannelColor) { if (theme.centerChannelColor) {
changeCss('.app__content, .post-create__container .post-create-body .btn-file, .post-create__container .post-create-footer .msg-typing, .loading-screen .loading__content .round, .command-name, .modal .modal-content, .dropdown-menu, .popover, .mentions-name', 'color:' + theme.centerChannelColor, 1); changeCss('.app__content, .post-create__container .post-create-body .btn-file, .post-create__container .post-create-footer .msg-typing, .command-name, .modal .modal-content, .dropdown-menu, .popover, .mentions-name', 'color:' + theme.centerChannelColor, 1);
changeCss('#post-create', 'color:' + theme.centerChannelColor, 2); changeCss('#post-create', 'color:' + theme.centerChannelColor, 2);
changeCss('.mentions--top, .command-box', 'box-shadow:' + changeOpacity(theme.centerChannelColor, 0.2) + ' 1px -3px 12px', 3); changeCss('.mentions--top, .command-box', 'box-shadow:' + changeOpacity(theme.centerChannelColor, 0.2) + ' 1px -3px 12px', 3);
changeCss('.mentions--top, .command-box', '-webkit-box-shadow:' + changeOpacity(theme.centerChannelColor, 0.2) + ' 1px -3px 12px', 2); changeCss('.mentions--top, .command-box', '-webkit-box-shadow:' + changeOpacity(theme.centerChannelColor, 0.2) + ' 1px -3px 12px', 2);
@@ -479,7 +479,7 @@ export function applyTheme(theme) {
changeCss('.dropdown-menu, .popover ', 'box-shadow:' + changeOpacity(theme.centerChannelColor, 0.1) + ' 0px 6px 12px', 3); changeCss('.dropdown-menu, .popover ', 'box-shadow:' + changeOpacity(theme.centerChannelColor, 0.1) + ' 0px 6px 12px', 3);
changeCss('.dropdown-menu, .popover ', '-webkit-box-shadow:' + changeOpacity(theme.centerChannelColor, 0.1) + ' 0px 6px 12px', 2); changeCss('.dropdown-menu, .popover ', '-webkit-box-shadow:' + changeOpacity(theme.centerChannelColor, 0.1) + ' 0px 6px 12px', 2);
changeCss('.dropdown-menu, .popover ', '-moz-box-shadow:' + changeOpacity(theme.centerChannelColor, 0.1) + ' 0px 6px 12px', 1); changeCss('.dropdown-menu, .popover ', '-moz-box-shadow:' + changeOpacity(theme.centerChannelColor, 0.1) + ' 0px 6px 12px', 1);
changeCss('.post-body hr', 'background:' + theme.centerChannelColor, 1); changeCss('.post-body hr, .loading-screen .loading__content .round', 'background:' + theme.centerChannelColor, 1);
changeCss('.channel-header .heading', 'color:' + 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('.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); changeCss('.channel-header__info>div.dropdown .header-dropdown__icon', 'color:' + changeOpacity(theme.centerChannelColor, 0.8), 1);

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

@@ -36,14 +36,13 @@ body {
.popover { .popover {
color: #333; color: #333;
a { &.bottom {
color: $primary-color; >.arrow:after {
&:hover, &:focus { border-bottom-color: rgba(white, 0.5);
color: $primary-color;
} }
} }
.popover-title { .popover-title {
background: rgba(black, 0.1); background: rgba(black, 0.05);
} }
} }
@@ -60,7 +59,7 @@ body {
} }
.word-break--all { .word-break--all {
word-break: break-all; word-break: break-all;
} }
a { a {
@@ -165,9 +164,9 @@ a:focus, a:hover {
} }
.emoji { .emoji {
width: 1.5em; width: 1.5em;
height: 1.5em; height: 1.5em;
display: inline-block; display: inline-block;
margin-bottom: 0.25em; margin-bottom: 0.25em;
background-size: contain; background-size: contain;
} }

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

@@ -16,11 +16,12 @@
} }
} }
.input__help { .input__help {
color: #777; color: inherit;
margin: 10px 0 0 10px; margin: 10px 0 0 10px;
word-break: break-word; word-break: break-word;
@include opacity(0.8);
&.dark { &.dark {
color: #222; @include opacity(1);
} }
&.error { &.error {
color: #a94442; color: #a94442;

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

@@ -37,7 +37,7 @@
&.description { &.description {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
color: #888; @include opacity(0.6);
margin-top: 2px; margin-top: 2px;
max-height: 45px; max-height: 45px;
} }

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

@@ -55,10 +55,6 @@
padding-left: 10px; padding-left: 10px;
} }
.mention-link {
color: $primary-color;
}
.mention-highlight { .mention-highlight {
background-color:#fff2bb; background-color:#fff2bb;
color: #333; color: #333;

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

@@ -81,6 +81,7 @@
.appearance-section { .appearance-section {
.premade-themes { .premade-themes {
margin-bottom: 10px;
.theme-label { .theme-label {
font-weight: 400; font-weight: 400;
margin-top: 5px; margin-top: 5px;