diff options
author | Joram Wilander <jwawilander@gmail.com> | 2015-09-11 07:43:10 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2015-09-11 07:43:10 -0400 |
commit | 27e8b28672ede105044b19e2aebcf2f2ff51de28 (patch) | |
tree | da4c78a3b4db11fa1fe2043bbb51215bb0c81919 | |
parent | d2c82dd191d54b65abf16e8e0fe0622884083cae (diff) | |
parent | ae8e9c3dfd0f8606064f29d56141b0b3fe35cdef (diff) | |
download | chat-27e8b28672ede105044b19e2aebcf2f2ff51de28.tar.gz chat-27e8b28672ede105044b19e2aebcf2f2ff51de28.tar.bz2 chat-27e8b28672ede105044b19e2aebcf2f2ff51de28.zip |
Merge pull request #649 from asaadmahmoodspin/master
Updating UI for modals and notification bar
-rw-r--r-- | web/sass-files/sass/partials/_modal.scss | 3 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_sidebar--left.scss | 2 | ||||
-rw-r--r-- | web/templates/channel.html | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index d32306cbc..a046cd904 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -123,6 +123,7 @@ } .more-channel-table { margin: 0; + table-layout: fixed; p { font-size: 0.9em; overflow: hidden; @@ -154,7 +155,7 @@ &.td--action { text-align: right; padding: 8px 15px 8px 8px; - width: 70px; + width: 80px; vertical-align: middle; } } diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss index 0a504b765..63426dae9 100644 --- a/web/sass-files/sass/partials/_sidebar--left.scss +++ b/web/sass-files/sass/partials/_sidebar--left.scss @@ -49,7 +49,7 @@ left: 0; right: 0; width: 72%; - color: #777; + color: #fff; background: #2389D7; @include border-radius(50px); margin: 0 auto; diff --git a/web/templates/channel.html b/web/templates/channel.html index 9bfd1fa35..a732a25ce 100644 --- a/web/templates/channel.html +++ b/web/templates/channel.html @@ -52,6 +52,7 @@ <script> window.setup_channel_page('{{ .Props.TeamDisplayName }}', '{{ .Props.TeamType }}', '{{ .Props.TeamId }}', '{{ .Props.ChannelName }}', '{{ .Props.ChannelId }}'); $('body').tooltip( {selector: '[data-toggle=tooltip]'} ); + $('.modal-body').css('max-height', $(window).height() * 0.7); $('.modal-body').perfectScrollbar(); </script> </body> |