diff options
author | Asaad Mahmood <Unknowngi@live.com> | 2015-09-30 19:30:45 +0500 |
---|---|---|
committer | Asaad Mahmood <Unknowngi@live.com> | 2015-09-30 19:30:45 +0500 |
commit | 296b93076888c9b26329938bd1cf1587397c7f51 (patch) | |
tree | a37a396752971c88e13fc97d88531357ca09542e /web/sass-files/sass/partials | |
parent | fb285d7b32a6c5e559277bcb32b3b7ff6889af22 (diff) | |
parent | 13ebb5fe94bfee4e529f634f02d285fa7d8c0dfc (diff) | |
download | chat-296b93076888c9b26329938bd1cf1587397c7f51.tar.gz chat-296b93076888c9b26329938bd1cf1587397c7f51.tar.bz2 chat-296b93076888c9b26329938bd1cf1587397c7f51.zip |
Merge branch 'master' of https://github.com/mattermost/platform into plt-383
Diffstat (limited to 'web/sass-files/sass/partials')
-rw-r--r-- | web/sass-files/sass/partials/_command-box.scss | 17 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_responsive.scss | 8 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_search.scss | 3 |
3 files changed, 15 insertions, 13 deletions
diff --git a/web/sass-files/sass/partials/_command-box.scss b/web/sass-files/sass/partials/_command-box.scss index 44eb9b8df..f1aa4dca2 100644 --- a/web/sass-files/sass/partials/_command-box.scss +++ b/web/sass-files/sass/partials/_command-box.scss @@ -4,20 +4,29 @@ width: 100%; border: $border-gray; bottom: 38px; + overflow: auto; @extend %popover-box-shadow; + .sidebar--right & { + bottom: 100px; + } } .command-name { position: relative; width: 100%; - background-color: #fff; - height: 37px; - line-height: 37px; - padding: 2px 10px 2px 5px; + line-height: 24px; + padding: 5px 10px 8px; z-index: 101; + font-size: 0.95em; + border-bottom: 1px solid #ddd; &:hover { background-color: #e8eaed; } + .command__desc { + margin-left: 5px; + @include opacity(0.5); + line-height: normal; + } } .command-desc { diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index d29c653ff..9e8d0dc7d 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -553,13 +553,7 @@ padding: 0 10px 0 31px; background: rgba(black, 0.2); @include border-radius(3px); - color: #fff; - } - input[type=text] { - @include input-placeholder { - color: #fff; - color: rgba(#fff, 0.5); - } + color: inherit; } } } diff --git a/web/sass-files/sass/partials/_search.scss b/web/sass-files/sass/partials/_search.scss index 9abdd40da..bcb8b5eac 100644 --- a/web/sass-files/sass/partials/_search.scss +++ b/web/sass-files/sass/partials/_search.scss @@ -32,8 +32,7 @@ top: 15px; margin-left: 10px; font-size: 14px; - color: #fff; - color: rgba(#fff, 0.5); + @include opacity(0.5); display: none; } .search__form { |