* PLT-6729 - Fixing close button

* PLT-5216 - Updating mattermost theme

* PLT-6679 - Fixing styling for active state
Этот коммит содержится в:
Asaad Mahmood
2017-06-02 20:46:54 +05:00
коммит произвёл Corey Hulen
родитель e7e59cc40f
Коммит 2f88bcb223
4 изменённых файлов: 25 добавлений и 21 удалений

Двоичные данные
webapp/images/themes/mattermost.png

Двоичный файл не отображается.

До

Ширина:  |  Высота:  |  Размер: 92 KiB

После

Ширина:  |  Высота:  |  Размер: 66 KiB

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

@@ -213,14 +213,18 @@
line-height: 30px; line-height: 30px;
position: absolute; position: absolute;
right: 10px; right: 10px;
text-shadow: none;
width: 30px; width: 30px;
z-index: 5; z-index: 5;
text-shadow: none;
&:hover { &:hover {
@include alpha-property(background, $black, .1); @include alpha-property(background, $black, .1);
} }
.sr-only {
display: none;
}
span { span {
font-family: 'Open Sans', sans-serif; font-family: 'Open Sans', sans-serif;
line-height: 10px; line-height: 10px;

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

@@ -481,28 +481,28 @@ export const Constants = {
}, },
mattermost: { mattermost: {
type: 'Mattermost', type: 'Mattermost',
sidebarBg: '#fafafa', sidebarBg: '#1a1d1f',
sidebarText: '#333333', sidebarText: '#ffffff',
sidebarUnreadText: '#333333', sidebarUnreadText: '#e8e8e8',
sidebarTextHoverBg: '#e6f2fa', sidebarTextHoverBg: '#525252',
sidebarTextActiveBorder: '#378FD2', sidebarTextActiveBorder: '#27a1b2',
sidebarTextActiveColor: '#111111', sidebarTextActiveColor: '#ffffff',
sidebarHeaderBg: '#3481B9', sidebarHeaderBg: '#1a1d1f',
sidebarHeaderTextColor: '#ffffff', sidebarHeaderTextColor: '#ffffff',
onlineIndicator: '#7DBE00', onlineIndicator: '#1fc1d9',
awayIndicator: '#DCBD4E', awayIndicator: '#c4c492',
mentionBj: '#2389d7', mentionBj: '#ba3939',
mentionColor: '#ffffff', mentionColor: '#ffffff',
centerChannelBg: '#ffffff', centerChannelBg: '#ffffff',
centerChannelColor: '#333333', centerChannelColor: '#2d3138',
newMessageSeparator: '#FF8800', newMessageSeparator: '#1c8c99',
linkColor: '#2389d7', linkColor: '#1c8c99',
buttonBg: '#23A2FF', buttonBg: '#27a1b2',
buttonColor: '#FFFFFF', buttonColor: '#FFFFFF',
errorTextColor: '#a94442', errorTextColor: '#cc2d2d',
mentionHighlightBg: '#f3e197', mentionHighlightBg: '#1c8c99',
mentionHighlightLink: '#2f81b7', mentionHighlightLink: '#ffffff',
codeTheme: 'github', codeTheme: 'monokai',
image: mattermostThemeImage image: mattermostThemeImage
}, },
mattermostDark: { mattermostDark: {

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

@@ -697,9 +697,9 @@ export function applyTheme(theme) {
} }
if (theme.linkColor) { if (theme.linkColor) {
changeCss('.app__body a, .app__body a:focus, .app__body a:hover, .app__body .btn, .app__body .btn:focus, .app__body .btn:hover, .app__body .channel-header #member_popover:hover', 'color:' + theme.linkColor); changeCss('.app__body .channel-header__links > a.active, .app__body a, .app__body a:focus, .app__body a:hover, .app__body .btn, .app__body .btn:focus, .app__body .btn:hover, .app__body .channel-header #member_popover:hover', 'color:' + theme.linkColor);
changeCss('.app__body .attachment .attachment__container', 'border-left-color:' + changeOpacity(theme.linkColor, 0.5)); changeCss('.app__body .attachment .attachment__container', 'border-left-color:' + changeOpacity(theme.linkColor, 0.5));
changeCss('.app__body .channel-header__links .icon:hover, .app__body .post .flag-icon__container.visible, .app__body .post .reacticon__container, .app__body .post .comment-icon__container, .app__body .post .post__reply', 'fill:' + theme.linkColor); changeCss('.app__body .channel-header__links .icon:hover, .app__body .channel-header__links > a.active .icon, .app__body .post .flag-icon__container.visible, .app__body .post .reacticon__container, .app__body .post .comment-icon__container, .app__body .post .post__reply', 'fill:' + theme.linkColor);
changeCss('.app__body .channel-header__links .icon:hover, .app__body .post .flag-icon__container.visible, .app__body .post .comment-icon__container, .app__body .post .post__reply, .app__body .channel-header .pinned-posts-button:hover svg', 'fill:' + theme.linkColor); changeCss('.app__body .channel-header__links .icon:hover, .app__body .post .flag-icon__container.visible, .app__body .post .comment-icon__container, .app__body .post .post__reply, .app__body .channel-header .pinned-posts-button:hover svg', 'fill:' + theme.linkColor);
changeCss('.app__body .post-reaction.post-reaction--current-user', 'background:' + changeOpacity(theme.linkColor, 0.1)); changeCss('.app__body .post-reaction.post-reaction--current-user', 'background:' + changeOpacity(theme.linkColor, 0.1));
changeCss('.app__body .post-reaction.post-reaction--current-user', 'border-color:' + changeOpacity(theme.linkColor, 0.4)); changeCss('.app__body .post-reaction.post-reaction--current-user', 'border-color:' + changeOpacity(theme.linkColor, 0.4));