Этот коммит содержится в:
Asaad Mahmood
2016-11-02 19:50:50 +05:00
коммит произвёл Corey Hulen
родитель 58cc061b38
Коммит b8fcc0a5c4
11 изменённых файлов: 63 добавлений и 18 удалений

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

@@ -17,7 +17,9 @@
@include opacity(.15); @include opacity(.15);
} }
div > a { div,
li {
> a {
color: inherit; color: inherit;
text-decoration: none; text-decoration: none;
@@ -27,6 +29,7 @@
} }
} }
} }
}
.open { .open {
> .dropdown-menu__content { > .dropdown-menu__content {

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

@@ -21,7 +21,7 @@
.custom-textarea { .custom-textarea {
max-height: 60vh; max-height: 60vh;
min-height: 8em; min-height: 20em;
} }
.suggestion-list { .suggestion-list {
@@ -192,7 +192,7 @@
.btn { .btn {
&.btn-primary { &.btn-primary {
float: right; float: right;
margin: -4px 25px 0 0; margin: -4px 33px 0 0;
position: relative; position: relative;
i { i {
@@ -592,7 +592,7 @@
.more-modal__row { .more-modal__row {
border-bottom: 1px solid $light-gray; border-bottom: 1px solid $light-gray;
display: flex; display: flex;
min-height: 65px; min-height: 50px;
padding: 8px 15px; padding: 8px 15px;
} }

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

@@ -187,6 +187,12 @@
.member-list__popover { .member-list__popover {
max-width: initial; max-width: initial;
.more-modal__list {
.more-modal__row {
min-height: inherit;
}
}
.popover-content { .popover-content {
max-height: 350px; max-height: 350px;
padding: 0; padding: 0;

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

@@ -82,6 +82,10 @@
&.placeholder { &.placeholder {
height: 500px; height: 500px;
} }
.sidebar--right & {
max-width: 100%;
}
} }
.video-loading { .video-loading {

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

@@ -65,6 +65,7 @@
.control-label { .control-label {
@include border-radius(3px); @include border-radius(3px);
background: #f2f2f2; background: #f2f2f2;
color: alpha-color($black, .7);
font-size: 14px; font-size: 14px;
font-weight: normal; font-weight: normal;
margin: 1em 0 -1em; margin: 1em 0 -1em;

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

@@ -51,7 +51,6 @@
hr { hr {
border: none; border: none;
margin-bottom: 0;
} }
.post-create__container { .post-create__container {

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

@@ -530,9 +530,15 @@ body.ios {
} }
} }
.post__img {
padding-top: 0;
}
.status-wrapper { .status-wrapper {
height: 14px;
&:after { &:after {
bottom: 10px; bottom: 0;
} }
} }

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

@@ -192,7 +192,11 @@
&.post--compact { &.post--compact {
.status-wrapper { .status-wrapper {
&:after { &:after {
bottom: 12px; bottom: 3px;
.sidebar--right & {
bottom: 0;
}
} }
} }
} }
@@ -1305,6 +1309,24 @@
} }
@media screen and (max-width: 480px) { @media screen and (max-width: 480px) {
.sidebar--right {
.post {
&.post--compact {
.post__header {
height: auto;
}
}
.post__header {
.col__name {
.user-popover {
max-width: 100%;
}
}
}
}
}
.backstage-header { .backstage-header {
h1 { h1 {
float: none; float: none;

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

@@ -1,6 +1,14 @@
@charset 'UTF-8'; @charset 'UTF-8';
@media screen and (max-width: 960px) { @media screen and (max-width: 960px) {
.channel-header {
.search-bar__container {
.search__form {
width: 150px;
}
}
}
.signup-team__container { .signup-team__container {
&.branded { &.branded {
display: block; display: block;

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

@@ -172,10 +172,6 @@
margin-bottom: 0.5em; margin-bottom: 0.5em;
} }
.banner__content {
width: 80%;
}
&.warning { &.warning {
background: #e60000; background: #e60000;
} }

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

@@ -544,7 +544,7 @@ export function applyTheme(theme) {
if (theme.centerChannelBg) { if (theme.centerChannelBg) {
changeCss('@media(min-width: 768px){.app__body .post:hover .post__header .col__reply, .app__body .post.post--hovered .post__header .col__reply', 'background:' + theme.centerChannelBg, 1); changeCss('@media(min-width: 768px){.app__body .post:hover .post__header .col__reply, .app__body .post.post--hovered .post__header .col__reply', 'background:' + theme.centerChannelBg, 1);
changeCss('.app__body .app__content, .app__body .markdown__table, .app__body .markdown__table tbody tr, .app__body .suggestion-list__content, .app__body .modal .modal-content, .app__body .post.post--compact .post-image__column, .app__body .suggestion-list__divider > span', 'background:' + theme.centerChannelBg, 1); changeCss('.app__body .app__content, .app__body .markdown__table, .app__body .markdown__table tbody tr, .app__body .suggestion-list__content, .app__body .modal .modal-content, .app__body .modal .modal-footer, .app__body .post.post--compact .post-image__column, .app__body .suggestion-list__divider > span', 'background:' + theme.centerChannelBg, 1);
changeCss('#post-list .post-list-holder-by-time, .app__body .post .dropdown-menu a', 'background:' + theme.centerChannelBg, 1); changeCss('#post-list .post-list-holder-by-time, .app__body .post .dropdown-menu a', 'background:' + theme.centerChannelBg, 1);
changeCss('#post-create', 'background:' + theme.centerChannelBg, 1); changeCss('#post-create', 'background:' + theme.centerChannelBg, 1);
changeCss('.app__body .date-separator .separator__text, .app__body .new-separator .separator__text', 'background:' + theme.centerChannelBg, 1); changeCss('.app__body .date-separator .separator__text, .app__body .new-separator .separator__text', 'background:' + theme.centerChannelBg, 1);
@@ -568,7 +568,7 @@ export function applyTheme(theme) {
changeCss('@media(min-width: 768px){.app__body .post:hover .post__header .col__reply, .app__body .post.post--hovered .post__header .col__reply', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2), 2); changeCss('@media(min-width: 768px){.app__body .post:hover .post__header .col__reply, .app__body .post.post--hovered .post__header .col__reply', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2), 2);
changeCss('.app__body .post .dropdown-menu a, .app__body .sidebar--left, .app__body .sidebar--right .sidebar--right__header, .app__body .suggestion-list__content .command', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2), 1); changeCss('.app__body .post .dropdown-menu a, .app__body .sidebar--left, .app__body .sidebar--right .sidebar--right__header, .app__body .suggestion-list__content .command', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2), 1);
changeCss('.app__body .post.post--system .post__body', 'color:' + changeOpacity(theme.centerChannelColor, 0.6), 1); changeCss('.app__body .post.post--system .post__body', 'color:' + changeOpacity(theme.centerChannelColor, 0.6), 1);
changeCss('.app__body .input-group-addon, .app__body .app__content, .app__body .post-create__container .post-create-body .btn-file, .app__body .post-create__container .post-create-footer .msg-typing, .app__body .suggestion-list__content .command, .app__body .modal .modal-content, .app__body .dropdown-menu a, .app__body .popover, .app__body .mentions__name, .app__body .tip-overlay, .app__body .form-control[disabled], .app__body .form-control[readonly], .app__body fieldset[disabled] .form-control', 'color:' + theme.centerChannelColor, 1); changeCss('.app__body .input-group-addon, .app__body .app__content, .app__body .post-create__container .post-create-body .btn-file, .app__body .post-create__container .post-create-footer .msg-typing, .app__body .suggestion-list__content .command, .app__body .modal .modal-content, .app__body .dropdown-menu, .app__body .popover, .app__body .mentions__name, .app__body .tip-overlay, .app__body .form-control[disabled], .app__body .form-control[readonly], .app__body fieldset[disabled] .form-control', 'color:' + theme.centerChannelColor, 1);
changeCss('.app__body .post .post__link', 'color:' + changeOpacity(theme.centerChannelColor, 0.65), 1); changeCss('.app__body .post .post__link', 'color:' + changeOpacity(theme.centerChannelColor, 0.65), 1);
changeCss('.app__body #archive-link-home, .video-div .video-thumbnail__error', 'background:' + changeOpacity(theme.centerChannelColor, 0.15), 1); changeCss('.app__body #archive-link-home, .video-div .video-thumbnail__error', 'background:' + changeOpacity(theme.centerChannelColor, 0.15), 1);
changeCss('.app__body #post-create', 'color:' + theme.centerChannelColor, 2); changeCss('.app__body #post-create', 'color:' + theme.centerChannelColor, 2);