From 2f95210a2907c1b74a390f143f58550cec1f77ca Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Thu, 12 Nov 2015 18:09:18 +0500 Subject: UI Improvements for centre channel due to preview --- web/sass-files/sass/partials/_files.scss | 1 + web/sass-files/sass/partials/_navbar.scss | 6 ++--- web/sass-files/sass/partials/_post.scss | 33 ++++++++++++++------------- web/sass-files/sass/partials/_responsive.scss | 15 ++++++++---- 4 files changed, 32 insertions(+), 23 deletions(-) (limited to 'web/sass-files/sass/partials') diff --git a/web/sass-files/sass/partials/_files.scss b/web/sass-files/sass/partials/_files.scss index d3ab3b9f8..49fb8e847 100644 --- a/web/sass-files/sass/partials/_files.scss +++ b/web/sass-files/sass/partials/_files.scss @@ -1,5 +1,6 @@ .preview-container { position: relative; + margin-top: 10px; width: 100%; max-height: 110px; height: 110px; diff --git a/web/sass-files/sass/partials/_navbar.scss b/web/sass-files/sass/partials/_navbar.scss index 2e78a8728..c06feffcf 100644 --- a/web/sass-files/sass/partials/_navbar.scss +++ b/web/sass-files/sass/partials/_navbar.scss @@ -96,9 +96,9 @@ } .badge-notify { - background:red; + background: red; position: absolute; - right: -5px; - top: -5px; + left: 4px; + top: 3px; z-index: 100; } diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index 3e2d6f045..d5aeaabad 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -46,21 +46,22 @@ body.ios { .textarea-wrapper { position:relative; - min-height:57px; - .textbox-preview-area { - position: absolute; - z-index: 2; - top: 0; - left: 0; - box-shadow: none; - } - .textbox-preview-link { - position: absolute; - z-index: 3; - bottom: 0; - right: 10px; - cursor: pointer; - } + min-height: 36px; + .textbox-preview-area { + position: absolute; + z-index: 2; + top: 0; + left: 0; + box-shadow: none; + } + .textbox-preview-link { + position: absolute; + z-index: 3; + bottom: -23px; + right: 0; + font-size: 13px; + cursor: pointer; + } } .date-separator, .new-separator { @@ -339,7 +340,7 @@ body.ios { } .msg-typing { min-height: 20px; - line-height: 18px; + line-height: 25px; display: inline-block; font-size: 13px; @include opacity(0.7); diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index 339412b45..cb140dce6 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -507,8 +507,16 @@ form { padding: 0; } + .post-create-footer { + .msg-typing { + margin-left: 45px; + width: 55%; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + } + } .post-create-body { - padding-bottom: 10px; display: table; width: 100%; .post-body__cell { @@ -532,11 +540,10 @@ display: table-cell; } } - .post-create-footer .msg-typing { - display: none; - } } .preview-container { + padding: 0px 10px; + margin-top: 20px; .preview-div { margin-top: 0; } -- cgit v1.2.3-1-g7c22 From 1c4d7f2d503df8fcd66c079b250ec9c1a15a1bfe Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Thu, 12 Nov 2015 18:36:19 +0500 Subject: Fixing preview stuff for the RHS --- web/sass-files/sass/partials/_post.scss | 4 ++-- web/sass-files/sass/partials/_post_right.scss | 16 +++++++++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) (limited to 'web/sass-files/sass/partials') diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index d5aeaabad..79a97fbf9 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -339,9 +339,9 @@ body.ios { } } .msg-typing { - min-height: 20px; + min-height: 25px; line-height: 25px; - display: inline-block; + display: block; font-size: 13px; @include opacity(0.7); } diff --git a/web/sass-files/sass/partials/_post_right.scss b/web/sass-files/sass/partials/_post_right.scss index c1d291073..ba41d3b95 100644 --- a/web/sass-files/sass/partials/_post_right.scss +++ b/web/sass-files/sass/partials/_post_right.scss @@ -13,6 +13,7 @@ &.post--root { padding: 1em 1em 0; margin: 0 0 1em; + width: 100%; hr { border-color: #DDD; margin: 1em 0 0 0; @@ -21,9 +22,10 @@ } .post-create__container { + width: 100%; margin-top: 10px; .textarea-wrapper { - min-height: 120px; + min-height: 100px; } .custom-textarea { min-height: 100px; @@ -31,10 +33,18 @@ .msg-typing { @include opacity(0.7); float: left; - padding-top: 17px; + margin-top: 3px; + font-size: 13px; + line-height: 20px; + min-width: 1px; + display: block; + height: 20px; + max-width: 200px; + @include clearfix; } .post-create-footer { - padding-top: 10px; + width: 100%; + padding-top: 5px; } .post-right-comments-upload-in-progress { padding: 6px 0; -- cgit v1.2.3-1-g7c22 From dc1c589369b2b754401159b7896f7fcd3ec4bc47 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Thu, 12 Nov 2015 18:51:49 +0500 Subject: Updating profile image and textbox resizing --- web/sass-files/sass/partials/_settings.scss | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'web/sass-files/sass/partials') diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss index b304450bc..0d75a42df 100644 --- a/web/sass-files/sass/partials/_settings.scss +++ b/web/sass-files/sass/partials/_settings.scss @@ -64,6 +64,10 @@ } } } + .profile-img { + width: 128px; + height: 128px; + } .settings-table { display: table; table-layout: fixed; -- cgit v1.2.3-1-g7c22