diff options
author | Stas Vovk <stas@vovk.me> | 2015-10-16 14:21:51 +0300 |
---|---|---|
committer | Stas Vovk <stas@vovk.me> | 2015-10-16 14:21:51 +0300 |
commit | 79fcb9808421dd93342a9538d05dd2259f5dd14b (patch) | |
tree | 33a1a865144f280e37fde07a7c91ed8825c53801 /web/sass-files | |
parent | 2bd81ff379acb347534e4d6a1a27624e0262deb0 (diff) | |
parent | 50a8e2bd4fa53c6bb2f12a03237be4fbaf259617 (diff) | |
download | chat-79fcb9808421dd93342a9538d05dd2259f5dd14b.tar.gz chat-79fcb9808421dd93342a9538d05dd2259f5dd14b.tar.bz2 chat-79fcb9808421dd93342a9538d05dd2259f5dd14b.zip |
Merge remote-tracking branch 'upstream/master' into PLT-637
Conflicts:
web/react/utils/constants.jsx
Diffstat (limited to 'web/sass-files')
-rw-r--r-- | web/sass-files/sass/partials/_admin-console.scss | 9 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_base.scss | 11 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_files.scss | 1 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_markdown.scss | 1 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_modal.scss | 46 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_post_right.scss | 6 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_responsive.scss | 5 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_search.scss | 1 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_sidebar--left.scss | 2 |
9 files changed, 72 insertions, 10 deletions
diff --git a/web/sass-files/sass/partials/_admin-console.scss b/web/sass-files/sass/partials/_admin-console.scss index 4b4fc1664..14f1d9c2f 100644 --- a/web/sass-files/sass/partials/_admin-console.scss +++ b/web/sass-files/sass/partials/_admin-console.scss @@ -15,12 +15,11 @@ .nav { li { padding: 0; + @include opacity(1); .icon { width: 17px; } > a { - padding: 9px 15px; - display: block; &:hover, &.active, &:focus { background-color: #EAEAEA; } @@ -117,8 +116,10 @@ .form-group { margin-bottom: 25px; } - ul, ol { - padding-left: 23px; + .help-text { + ul, ol { + padding-left: 23px; + } } .help-text { margin: 10px 0 0 15px; diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss index 44a474213..cb5ff67b5 100644 --- a/web/sass-files/sass/partials/_base.scss +++ b/web/sass-files/sass/partials/_base.scss @@ -39,10 +39,6 @@ img { height: auto; } -.input-group-addon { - background: transparent; -} - .popover { color: #333; &.bottom, &.right, &.top, &.left { @@ -53,6 +49,9 @@ img { .popover-title { background: rgba(black, 0.05); } + .popover-content { + white-space: pre-wrap; + } } .dropdown-menu { @@ -182,6 +181,10 @@ a:focus, a:hover { background-color: white !important; } +.alert { + padding: 8px 12px; +} + .emoji { width: 1.5em; height: 1.5em; diff --git a/web/sass-files/sass/partials/_files.scss b/web/sass-files/sass/partials/_files.scss index 6dbb82810..01057423d 100644 --- a/web/sass-files/sass/partials/_files.scss +++ b/web/sass-files/sass/partials/_files.scss @@ -194,6 +194,7 @@ vertical-align: top; .file-details__name { + color: #333; font-size: 16px; } .file-details__info { diff --git a/web/sass-files/sass/partials/_markdown.scss b/web/sass-files/sass/partials/_markdown.scss index 1aa942ad0..70c99f504 100644 --- a/web/sass-files/sass/partials/_markdown.scss +++ b/web/sass-files/sass/partials/_markdown.scss @@ -1,5 +1,6 @@ .markdown__heading { font-weight: 700; + line-height: 1.5; } .markdown__paragraph-inline { display: inline; diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index 90ea8ce2c..b942a5a40 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -329,3 +329,49 @@ } } } + +.modal-direct-channels { + .user-list { + list-style-type: none; + margin: 15px 0px 0px; + max-height: 600px; + padding: 0px; + overflow: auto; + + li { + border-bottom: 1px solid #ddd; + height: 60px; + padding: 10px 0px; + + .image-div { + padding: 0px; + + .profile-image { + width: 40px; + height: 40px; + @include border-radius(20px); + } + } + + .username { + font-weight: bold; + } + + .nickname { + color: #888; + } + + .btn-div { + padding: 0px; + .btn-message { + position: relative; + top: 5px; + } + } + + &:last-child { + border-bottom: 0px; + } + } + } +} diff --git a/web/sass-files/sass/partials/_post_right.scss b/web/sass-files/sass/partials/_post_right.scss index e4860b286..9557d7570 100644 --- a/web/sass-files/sass/partials/_post_right.scss +++ b/web/sass-files/sass/partials/_post_right.scss @@ -36,6 +36,11 @@ .post-create-footer { padding-top: 10px; } + .post-right-comments-upload-in-progress { + padding: 6px 0; + color: #a8adb7; + margin-right: 10px; + } } } @@ -88,6 +93,7 @@ .post-right__scroll { position: relative; + overflow: auto; } .post-right-comment-time { diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index dbe6029ec..09f2c179e 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -586,11 +586,14 @@ &.move--right { @include translate3d(0, 0, 0); } + .nav-pills__unread-indicator-bottom { + bottom: 10px; + } .badge { top: 13px; } > div { - padding-bottom: 105px; + padding-bottom: 65px; } .team__header { display: none; diff --git a/web/sass-files/sass/partials/_search.scss b/web/sass-files/sass/partials/_search.scss index 2de1b5380..ca90ec46d 100644 --- a/web/sass-files/sass/partials/_search.scss +++ b/web/sass-files/sass/partials/_search.scss @@ -67,6 +67,7 @@ } .search-items-container { + overflow: auto; position: relative; } diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss index 24aaef059..831c19cff 100644 --- a/web/sass-files/sass/partials/_sidebar--left.scss +++ b/web/sass-files/sass/partials/_sidebar--left.scss @@ -69,7 +69,7 @@ top: 66px; } .nav-pills__unread-indicator-bottom { - bottom: 10px; + bottom: 20px; } .nav { |