diff options
| author | Asaad Mahmood <Unknowngi@live.com> | 2015-10-18 18:55:22 +0500 |
|---|---|---|
| committer | Asaad Mahmood <Unknowngi@live.com> | 2015-10-18 18:55:22 +0500 |
| commit | 3a1636b7cea9805c16fcd626917de01a51c6cb2f (patch) | |
| tree | 8ca5a24b77573908207905092bdefad7125ffbc6 /web/sass-files | |
| parent | 7849a48a859302e9d3e3ed14f3de380705f3ba78 (diff) | |
| parent | 7e457dd8d9ad0e22be7dd7753bb37a611303c808 (diff) | |
| download | chat-3a1636b7cea9805c16fcd626917de01a51c6cb2f.tar.gz chat-3a1636b7cea9805c16fcd626917de01a51c6cb2f.tar.bz2 chat-3a1636b7cea9805c16fcd626917de01a51c6cb2f.zip | |
Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements
Diffstat (limited to 'web/sass-files')
| -rw-r--r-- | web/sass-files/sass/partials/_command-box.scss | 1 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_videos.scss | 7 |
2 files changed, 2 insertions, 6 deletions
diff --git a/web/sass-files/sass/partials/_command-box.scss b/web/sass-files/sass/partials/_command-box.scss index f1aa4dca2..184fb55eb 100644 --- a/web/sass-files/sass/partials/_command-box.scss +++ b/web/sass-files/sass/partials/_command-box.scss @@ -5,6 +5,7 @@ border: $border-gray; bottom: 38px; overflow: auto; + z-index: 100; @extend %popover-box-shadow; .sidebar--right & { bottom: 100px; diff --git a/web/sass-files/sass/partials/_videos.scss b/web/sass-files/sass/partials/_videos.scss index 9e1ce29b7..6ae5b488b 100644 --- a/web/sass-files/sass/partials/_videos.scss +++ b/web/sass-files/sass/partials/_videos.scss @@ -26,11 +26,6 @@ padding:0px; } -.video-uploader { - font-size: 13px; - margin: 0 0 15px; -} - .video-title { font-size:15px; margin-top:3px; @@ -54,4 +49,4 @@ border-top:36px solid transparent; border-bottom:36px solid transparent; border-left:60px solid rgba(255,255,255,0.4); -}
\ No newline at end of file +} |