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/sass/partials/_modal.scss | |
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/sass/partials/_modal.scss')
-rw-r--r-- | web/sass-files/sass/partials/_modal.scss | 46 |
1 files changed, 46 insertions, 0 deletions
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; + } + } + } +} |