diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-11-02 07:59:37 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-11-02 07:59:37 -0500 |
| commit | 2ba0f1fe2c5384e7fa815aa8682f298eddd89985 (patch) | |
| tree | a9ec3e16caa6a36003fa59e9b4efb724715650c8 | |
| parent | 144e26ede455956594db2bb03593eb0d9cf38460 (diff) | |
| parent | ec8c97d96ee8d0dfb17e3997e1267e01758cda04 (diff) | |
| download | chat-2ba0f1fe2c5384e7fa815aa8682f298eddd89985.tar.gz chat-2ba0f1fe2c5384e7fa815aa8682f298eddd89985.tar.bz2 chat-2ba0f1fe2c5384e7fa815aa8682f298eddd89985.zip | |
Merge pull request #1257 from florianorben/align_channel_header
correctly align channel header with sidebar header
| -rw-r--r-- | web/sass-files/sass/partials/_headers.scss | 3 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_responsive.scss | 2 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_search.scss | 5 |
3 files changed, 8 insertions, 2 deletions
diff --git a/web/sass-files/sass/partials/_headers.scss b/web/sass-files/sass/partials/_headers.scss index 7e776bf76..feb392234 100644 --- a/web/sass-files/sass/partials/_headers.scss +++ b/web/sass-files/sass/partials/_headers.scss @@ -1,3 +1,6 @@ +#channel-header { + padding: 3px 0; +} .row { &.header { position: relative; diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index b85fa638a..8f353c401 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -763,7 +763,7 @@ .channel__wrap & { padding-top: 45px; } - .channel-header { + #channel-header { display: none; } } diff --git a/web/sass-files/sass/partials/_search.scss b/web/sass-files/sass/partials/_search.scss index e50dc398a..73b69c866 100644 --- a/web/sass-files/sass/partials/_search.scss +++ b/web/sass-files/sass/partials/_search.scss @@ -1,5 +1,8 @@ +#channel-header .search-bar__container { + padding: 8px 8px 8px 0; +} .search-bar__container { - padding: 8px 8px 8px 0; + padding: 12px 8px 12px 0; } .search__clear { display: none; |