diff options
author | Corey Hulen <corey@hulen.com> | 2015-12-04 08:48:11 -0800 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2015-12-04 08:48:11 -0800 |
commit | 1d67f26664f8cf98f52433ef8b081b6fb485eadb (patch) | |
tree | 04ae12ae8b1d75720f22c9d381985cd8cbe51651 /web/sass-files/sass | |
parent | 622fbc67402fe36bc01163a5a80643a15758e094 (diff) | |
parent | 38a0c5dd761fed5d82b26614447d238628bee6e1 (diff) | |
download | chat-1d67f26664f8cf98f52433ef8b081b6fb485eadb.tar.gz chat-1d67f26664f8cf98f52433ef8b081b6fb485eadb.tar.bz2 chat-1d67f26664f8cf98f52433ef8b081b6fb485eadb.zip |
Merge pull request #1617 from asaadmahmoodspin/ui-improvements
Multiple UI Improvements
Diffstat (limited to 'web/sass-files/sass')
-rw-r--r-- | web/sass-files/sass/partials/_base.scss | 2 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_content.scss | 23 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_post.scss | 4 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_responsive.scss | 3 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_search.scss | 8 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_sidebar--right.scss | 8 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_suggestion_list.scss | 14 |
7 files changed, 40 insertions, 22 deletions
diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss index 7efe70cb4..0f8cd56f7 100644 --- a/web/sass-files/sass/partials/_base.scss +++ b/web/sass-files/sass/partials/_base.scss @@ -123,7 +123,7 @@ a:focus, a:hover { } select { - -webkit-appearance: none; + -moz-appearance:none; } .form-control { diff --git a/web/sass-files/sass/partials/_content.scss b/web/sass-files/sass/partials/_content.scss index 817817854..471ba63af 100644 --- a/web/sass-files/sass/partials/_content.scss +++ b/web/sass-files/sass/partials/_content.scss @@ -18,30 +18,29 @@ margin-left: 220px; position: relative; background: #fff; - @include display-flex; - @include flex-direction(column); + @include display-flex; + @include flex-direction(column); .channel__wrap & { padding-top: 0; } } #post-create { - @include flex(0 0 auto); + @include flex(0 0 auto); background: #fff; width: 100%; z-index: 3; } #archive-link-home { - @include flex(0 0 auto); - background: #fff; - width: 100%; - min-height: 50px; - z-index: 3; - background-color: beige; - text-align: center; - vertical-align: middle; - padding-top: 10px; + @include flex(0 0 auto); cursor: pointer; + padding: 10px; + font-size: 13px; + + a { + color: inherit; + } + } .post-list { diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index ed1632681..adb1e0fff 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -599,6 +599,10 @@ body.ios { @include legacy-pie-clearfix; width: calc(100% - 70px); + img { + max-height: 400px; + } + ul { padding: 5px 0 0 20px; } diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index 9b316d48e..2011a25f2 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -296,6 +296,9 @@ } } } + .section-min:hover { + background: none; + } .no-padding--left { padding-left: 15px; } diff --git a/web/sass-files/sass/partials/_search.scss b/web/sass-files/sass/partials/_search.scss index 0debb7e54..3af0f3f2c 100644 --- a/web/sass-files/sass/partials/_search.scss +++ b/web/sass-files/sass/partials/_search.scss @@ -1,9 +1,9 @@ #channel-header .search-bar__container { - padding: 0 8px 0 3px; + padding: 0 8px 0 3px; } .search-bar__container { padding: 12px 8px 0 0; - @include flex(0 0 56px); + @include flex(0 0 56px); } .search__clear { display: none; @@ -107,7 +107,9 @@ } .search-item__jump { - margin-left: 10px; + position: absolute; + right: 0; + top: 0; } .search-item-time { diff --git a/web/sass-files/sass/partials/_sidebar--right.scss b/web/sass-files/sass/partials/_sidebar--right.scss index 735b2a99e..ada43fb99 100644 --- a/web/sass-files/sass/partials/_sidebar--right.scss +++ b/web/sass-files/sass/partials/_sidebar--right.scss @@ -12,6 +12,14 @@ right: 0; } + .post-body { + + img { + max-height: 200px; + } + + } + .sidebar--right__content { height: 100%; @include display-flex; diff --git a/web/sass-files/sass/partials/_suggestion_list.scss b/web/sass-files/sass/partials/_suggestion_list.scss index 0cf3fff5f..5e91a126d 100644 --- a/web/sass-files/sass/partials/_suggestion_list.scss +++ b/web/sass-files/sass/partials/_suggestion_list.scss @@ -47,17 +47,19 @@ } .emoticon-suggestion { + @include clearfix; width: 100%; - height: 36px; + height: 30px; cursor: pointer; font-size: 13px; - line-height: 36px; + line-height: 30px; } .emoticon-suggestion__image { - width: 32px; - height: 32px; - margin-right: 6px; - padding: 2px; + width: 20px; + height: 20px; + margin: 6px 6px 0 5px; + padding: 0; text-align: center; + vertical-align: top; } |