diff options
author | Asaad Mahmood <asaadmahmood@users.noreply.github.com> | 2016-11-02 19:50:50 +0500 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2016-11-02 07:50:50 -0700 |
commit | b8fcc0a5c40a0d15db4606766d49b960e59b9bb4 (patch) | |
tree | c3ff42d2c4a7ed2c670b3fb097b09a6aef146a3d /webapp/sass/components | |
parent | 58cc061b3879400f5909f1bf056c44402afb4d19 (diff) | |
download | chat-b8fcc0a5c40a0d15db4606766d49b960e59b9bb4.tar.gz chat-b8fcc0a5c40a0d15db4606766d49b960e59b9bb4.tar.bz2 chat-b8fcc0a5c40a0d15db4606766d49b960e59b9bb4.zip |
Multiple UI Improvements (#4420)
Diffstat (limited to 'webapp/sass/components')
-rw-r--r-- | webapp/sass/components/_dropdown.scss | 15 | ||||
-rw-r--r-- | webapp/sass/components/_modal.scss | 6 | ||||
-rw-r--r-- | webapp/sass/components/_popover.scss | 6 | ||||
-rw-r--r-- | webapp/sass/components/_videos.scss | 4 | ||||
-rw-r--r-- | webapp/sass/components/_webrtc.scss | 1 |
5 files changed, 23 insertions, 9 deletions
diff --git a/webapp/sass/components/_dropdown.scss b/webapp/sass/components/_dropdown.scss index 39317358f..0051f09a3 100644 --- a/webapp/sass/components/_dropdown.scss +++ b/webapp/sass/components/_dropdown.scss @@ -17,13 +17,16 @@ @include opacity(.15); } - div > a { - color: inherit; - text-decoration: none; - - &:focus, - &:hover { + div, + li { + > a { color: inherit; + text-decoration: none; + + &:focus, + &:hover { + color: inherit; + } } } } diff --git a/webapp/sass/components/_modal.scss b/webapp/sass/components/_modal.scss index 5f22c9a6a..71ed8e693 100644 --- a/webapp/sass/components/_modal.scss +++ b/webapp/sass/components/_modal.scss @@ -21,7 +21,7 @@ .custom-textarea { max-height: 60vh; - min-height: 8em; + min-height: 20em; } .suggestion-list { @@ -192,7 +192,7 @@ .btn { &.btn-primary { float: right; - margin: -4px 25px 0 0; + margin: -4px 33px 0 0; position: relative; i { @@ -592,7 +592,7 @@ .more-modal__row { border-bottom: 1px solid $light-gray; display: flex; - min-height: 65px; + min-height: 50px; padding: 8px 15px; } diff --git a/webapp/sass/components/_popover.scss b/webapp/sass/components/_popover.scss index 2840c032e..4ff72da55 100644 --- a/webapp/sass/components/_popover.scss +++ b/webapp/sass/components/_popover.scss @@ -187,6 +187,12 @@ .member-list__popover { max-width: initial; + .more-modal__list { + .more-modal__row { + min-height: inherit; + } + } + .popover-content { max-height: 350px; padding: 0; diff --git a/webapp/sass/components/_videos.scss b/webapp/sass/components/_videos.scss index b2230f71d..93ad5707b 100644 --- a/webapp/sass/components/_videos.scss +++ b/webapp/sass/components/_videos.scss @@ -82,6 +82,10 @@ &.placeholder { height: 500px; } + + .sidebar--right & { + max-width: 100%; + } } .video-loading { diff --git a/webapp/sass/components/_webrtc.scss b/webapp/sass/components/_webrtc.scss index 42d491341..b025ab00c 100644 --- a/webapp/sass/components/_webrtc.scss +++ b/webapp/sass/components/_webrtc.scss @@ -65,6 +65,7 @@ .control-label { @include border-radius(3px); background: #f2f2f2; + color: alpha-color($black, .7); font-size: 14px; font-weight: normal; margin: 1em 0 -1em; |