summaryrefslogtreecommitdiffstats
path: root/web/sass-files/sass/partials/_modal.scss
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2015-10-19 09:40:43 -0400
committerHarrison Healey <harrisonmhealey@gmail.com>2015-10-19 09:40:43 -0400
commit814aa57fc1cebd1e430e36102d8b3c3830351cb8 (patch)
tree206886be7d1baa2e2e13b753ec139e92e8d22120 /web/sass-files/sass/partials/_modal.scss
parente308923aeca0a45463aeeeea7b0b3e3bc313f033 (diff)
parent13a35539f335c44cebdd285cc6b2e27ffeea3a75 (diff)
downloadchat-814aa57fc1cebd1e430e36102d8b3c3830351cb8.tar.gz
chat-814aa57fc1cebd1e430e36102d8b3c3830351cb8.tar.bz2
chat-814aa57fc1cebd1e430e36102d8b3c3830351cb8.zip
Merge pull request #1087 from asaadmahmoodspin/ui-improvements
Improving direct messages modal and some improvements for popovers
Diffstat (limited to 'web/sass-files/sass/partials/_modal.scss')
-rw-r--r--web/sass-files/sass/partials/_modal.scss76
1 files changed, 38 insertions, 38 deletions
diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss
index b942a5a40..0e474a1e2 100644
--- a/web/sass-files/sass/partials/_modal.scss
+++ b/web/sass-files/sass/partials/_modal.scss
@@ -140,7 +140,7 @@
padding: 0;
}
}
- .more-channel-table {
+ .more-table {
margin: 0;
table-layout: fixed;
p {
@@ -150,9 +150,11 @@
@include opacity(0.8);
margin: 5px 0;
}
- .more-channel-name {
+ .more-name {
font-weight: 600;
font-size: 0.95em;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
tbody {
> tr {
@@ -175,6 +177,9 @@
padding: 8px 15px 8px 8px;
width: 80px;
vertical-align: middle;
+ &.lg {
+ width: 110px;
+ }
}
}
}
@@ -331,47 +336,42 @@
}
.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;
+ .user-list {
+ margin-top: 20px;
+ overflow: auto;
+ -webkit-overflow-scrolling: touch;
+ max-height: 500px;
+ position: relative;
+ }
- .image-div {
- padding: 0px;
+ .table {
+ margin-top: 10px;
+ }
- .profile-image {
- width: 40px;
- height: 40px;
- @include border-radius(20px);
- }
- }
+ .modal-body {
+ padding: 20px 0 0;
+ @include clearfix;
+ }
- .username {
- font-weight: bold;
- }
+ .filter-row {
+ padding: 0 15px;
+ }
- .nickname {
- color: #888;
- }
+ .member-count {
+ margin-top: 5px;
+ float: right;
+ @include opacity(0.8);
+ }
- .btn-div {
- padding: 0px;
- .btn-message {
- position: relative;
- top: 5px;
- }
- }
+ .more-description {
+ @include opacity(0.7);
+ }
- &:last-child {
- border-bottom: 0px;
- }
- }
- }
+ .profile-img {
+ -moz-border-radius: 50px;
+ -webkit-border-radius: 50px;
+ border-radius: 50px;
+ margin-right: 8px;
+ }
}