diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-10-20 14:50:03 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-10-20 14:50:03 -0700 |
| commit | e1f94590290bf3061fdce48b25b2e74a2c8a0853 (patch) | |
| tree | b67ae40ea40f64f2e6c5a29e50b78199ed9a2c63 /web/sass-files/sass/partials | |
| parent | 1fc12dd8ba2238eba7d154eee55e1381e7415372 (diff) | |
| parent | e0cda76eb816da8fda9c42d67197be71201c242e (diff) | |
| download | chat-e1f94590290bf3061fdce48b25b2e74a2c8a0853.tar.gz chat-e1f94590290bf3061fdce48b25b2e74a2c8a0853.tar.bz2 chat-e1f94590290bf3061fdce48b25b2e74a2c8a0853.zip | |
Merge branch 'master' into PLT-44
Diffstat (limited to 'web/sass-files/sass/partials')
| -rw-r--r-- | web/sass-files/sass/partials/_modal.scss | 4 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_responsive.scss | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index 0e474a1e2..5570b5ce4 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -194,7 +194,7 @@ position: relative; max-width: 90%; min-height: 100px; - min-width: 240px; + min-width: 320px; @include border-radius(3px); display: table; margin: 0 auto; @@ -338,7 +338,7 @@ .modal-direct-channels { .user-list { - margin-top: 20px; + margin-top: 10px; overflow: auto; -webkit-overflow-scrolling: touch; max-height: 500px; diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index c41199cac..09ac2047c 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -267,6 +267,7 @@ } } .file-details { + width: 100%; height: auto; } } @@ -697,7 +698,7 @@ .modal-image { .image-wrapper { font-size: 12px; - min-width: 280px; + min-width: 250px; .modal-close { @include opacity(1); } |