From c4fac97242fbbeebbcda0e5330e72a31506c2c55 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Mon, 7 Sep 2015 23:08:55 +0500 Subject: MM-2123 and MM-2124 - UI changes --- web/sass-files/sass/partials/_responsive.scss | 33 ++++++++++++++++++++------- 1 file changed, 25 insertions(+), 8 deletions(-) (limited to 'web/sass-files/sass/partials') diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index 682809f02..c56625b88 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -243,6 +243,23 @@ } } @media screen and (max-width: 768px) { + .file-details__container { + display: block; + .file-details__preview { + display: block; + width: 100%; + height: 150px; + border-right: none; + border-bottom: 1px solid #ddd; + img { + width: 64px; + height: 64px; + } + } + .file-details { + height: auto; + } + } .center-file-overlay { font-size: 1.3em; } @@ -405,23 +422,23 @@ margin-top: 0; } .remove-preview { - width: 50px; - height: 50px; - left: 50%; - top: 50%; + width: 28px; + height: 28px; + left: auto; + right: 0; + top: 0; background: #444; - margin: -25px 0 0 -25px; - @include border-radius(50px); + background: rgba(#000, 0.5); text-align: center; &:after { display: none; } i { - line-height: 50px; + line-height: 29px; top: auto; right: auto; position: relative; - font-size: 28px; + font-size: 16px; } } } -- cgit v1.2.3-1-g7c22 From 5c0680397de9d3cfd0018743e0b1d58dfbdca25d Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Tue, 8 Sep 2015 10:11:57 -0400 Subject: Add post list container to hold mounted post lists for faster rendering/channel switching. --- web/sass-files/sass/partials/_post.scss | 6 ++++++ 1 file changed, 6 insertions(+) (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 231e6fe3f..a8e77f7d5 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -143,6 +143,12 @@ body.ios { &.hide-scroll::-webkit-scrollbar { width: 0px !important; } + &.inactive { + display: none; + } + &.active { + display: inline; + } } .post-list__table { display: table; -- cgit v1.2.3-1-g7c22 From 62940fb72f8ba89b97bbbd2bdc484fd42f5e09ce Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Tue, 8 Sep 2015 21:12:36 +0500 Subject: UI changes for various tickets --- web/sass-files/sass/partials/_modal.scss | 4 ++-- web/sass-files/sass/partials/_post.scss | 2 +- web/sass-files/sass/partials/_responsive.scss | 9 +++++++++ web/sass-files/sass/partials/_settings.scss | 16 +++++++++------- web/sass-files/sass/partials/_sidebar--left.scss | 4 ++++ 5 files changed, 25 insertions(+), 10 deletions(-) (limited to 'web/sass-files/sass/partials') diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index dec08b567..29e05f6bf 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -63,7 +63,6 @@ margin: 0; } button.close { - margin: -2px -2px 0 0; color: #fff; @include opacity(1); z-index: 5; @@ -71,7 +70,8 @@ height: 30px; line-height: 30px; @include single-transition(all, 0.25s, ease-in); - position: relative; + position: absolute; + right: 10px; &:hover { background: rgba(0, 0, 0, 0.1); } diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index 231e6fe3f..9a6e6e4c7 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -140,7 +140,7 @@ body.ios { padding: 1em 0 0; position: relative; -webkit-overflow-scrolling: touch; - &.hide-scroll::-webkit-scrollbar { + &::-webkit-scrollbar { width: 0px !important; } } diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index c56625b88..a850d5a7f 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -365,6 +365,9 @@ width: 100%; z-index: 5; } + .modal-title { + padding-left: 15px; + } .user-settings { .tab-header { display: none; @@ -513,6 +516,12 @@ height: 45px; position: relative; @include single-transition(all, 0.2s, linear); + .glyphicon-refresh-animate { + right: 33px; + top: 15px; + color: #fff; + color: rgba(255,255,255,0.5); + } .form-control { border: none; padding: 0 10px 0 31px; diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss index 8d743dfe2..25c093957 100644 --- a/web/sass-files/sass/partials/_settings.scss +++ b/web/sass-files/sass/partials/_settings.scss @@ -14,13 +14,15 @@ width:800px; max-width: 100%; .modal-back { - width: 8px; - height: 13px; - background: url("../images/arrow-left.png"); - @include background-size(100% 100%); - margin-right: 10px; - display: inline-block; + width: 40px; + height: 56px; + background: url("../images/arrow-left.png") no-repeat; + @include background-size(8px 13px); + background-position: center; + top: 0; + left: 0; cursor: pointer; + position: absolute; } .modal-body { padding: 0; @@ -59,7 +61,7 @@ .section-max { background: #f2f2f2; - padding: 1em 0; + padding: 1em 0 1.3em; margin-bottom: 0; @include clearfix; .section-title { diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss index 432b8eb46..933be96ff 100644 --- a/web/sass-files/sass/partials/_sidebar--left.scss +++ b/web/sass-files/sass/partials/_sidebar--left.scss @@ -10,6 +10,10 @@ &.sidebar--padded { padding-top: 44px; } + .dropdown-menu { + max-height: 300px; + overflow: auto; + } .search__form { margin: 0; padding: 1em 1em 0; -- cgit v1.2.3-1-g7c22 From c6b1368cc7b011ac522ada7e3c927fa1ec57c9e0 Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Tue, 8 Sep 2015 15:47:15 -0400 Subject: Added send icon button to create post control for mobile view. --- web/sass-files/sass/partials/_post.scss | 19 +++++++++++++++++++ web/sass-files/sass/partials/_responsive.scss | 15 ++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) (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 231e6fe3f..5b209f41b 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -182,6 +182,25 @@ body.ios { max-width: 850px; padding: 0 0 2px; position: relative; + .post-body__cell { + vertical-align: top; + position: relative; + } + .send-button { + display: none; + cursor: pointer; + padding-right: 4px; + width: 45px; + height: 37px; + font-size: 18px; + line-height: 37px; + vertical-align: top; + text-align: center; + @include single-transition(all, 0.15s); + &:active { + @include opacity(0.75); + } + } .custom-textarea { padding-top: 8px; padding-right: 28px; diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index c56625b88..71e9d0f96 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -409,9 +409,22 @@ } } } - #post-create { + .post-create__container { + form { + padding: 0; + } .post-create-body { padding-bottom: 10px; + display: table; + width: 100%; + table-layout: fixed; + .post-body__cell { + display: table-cell; + padding-left: 1em; + } + .send-button { + display: table-cell; + } } .post-create-footer .msg-typing { display: none; -- cgit v1.2.3-1-g7c22 From 2a876f33006497f35dff18272088d373bdd07805 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Wed, 9 Sep 2015 11:02:46 +0500 Subject: Removing jsx container from × in team_import_tab.jsx --- web/sass-files/sass/partials/_responsive.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web/sass-files/sass/partials') diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index a850d5a7f..5f516704d 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -366,7 +366,7 @@ z-index: 5; } .modal-title { - padding-left: 15px; + padding-left: 20px; } .user-settings { .tab-header { -- cgit v1.2.3-1-g7c22 From f74f066a4472ad5ceac379eb3518307b51a18280 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Wed, 9 Sep 2015 19:42:03 +0500 Subject: MM-1866 - Adding download icon and adding download link for both file title and download icon --- web/sass-files/sass/partials/_files.scss | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 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 70f440989..405265f92 100644 --- a/web/sass-files/sass/partials/_files.scss +++ b/web/sass-files/sass/partials/_files.scss @@ -61,8 +61,8 @@ cursor: pointer; z-index: 5; opacity: inherit; - text-shadow: 0 0px 3px #444; - text-shadow: 0 0px 3px rgba(0, 0, 0, 0.7); + text-shadow: 0 0px 3px #444; + text-shadow: 0 0px 3px rgba(0, 0, 0, 0.7); } } } @@ -159,6 +159,14 @@ padding: 7px; .post-image__name { margin-bottom: 3px; + display: block; + color: #333; + } + .post-image__download { + display: inline-block; + padding-right: 7px; + cursor: pointer; + color: #555; } .post-image__type { color: grey; -- cgit v1.2.3-1-g7c22 From c5ce2fe933996c718522fb260c7a5a1bf3c63148 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Wed, 9 Sep 2015 21:26:15 +0500 Subject: MM-1825 - Improving UI for settings --- web/sass-files/sass/partials/_settings.scss | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (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 25c093957..468880724 100644 --- a/web/sass-files/sass/partials/_settings.scss +++ b/web/sass-files/sass/partials/_settings.scss @@ -56,7 +56,11 @@ .section-min { padding: 1em 0; margin-bottom: 0; + cursor: pointer; @include clearfix; + &:hover { + background: #f9f9f9; + } } .section-max { @@ -97,7 +101,6 @@ } .setting-list__hint { - color: #555; margin-top: 20px; } -- cgit v1.2.3-1-g7c22 From 7fba0adc805f3b633bf5ef23e0c8143c525a23e6 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Wed, 9 Sep 2015 22:25:01 +0500 Subject: PLT-188 - Moving attachment button to the left and fixing buttons in modal header --- web/sass-files/sass/partials/_modal.scss | 2 +- web/sass-files/sass/partials/_post.scss | 2 +- web/sass-files/sass/partials/_responsive.scss | 10 +++++++++- 3 files changed, 11 insertions(+), 3 deletions(-) (limited to 'web/sass-files/sass/partials') diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index 29e05f6bf..b94ed2113 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -82,7 +82,7 @@ .btn { &.btn-primary { float: right; - margin-top: -4px; + margin: -4px 25px 0 0; position: relative; i { margin-right: 5px; diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index 5ae9e656d..6940cf2fb 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -200,7 +200,7 @@ body.ios { height: 37px; font-size: 18px; line-height: 37px; - vertical-align: top; + vertical-align: bottom; text-align: center; @include single-transition(all, 0.15s); &:active { diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index 24c79e6c2..65619f25a 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -423,7 +423,15 @@ table-layout: fixed; .post-body__cell { display: table-cell; - padding-left: 1em; + padding-left: 45px; + } + .btn-file { + width: 45px; + padding: 0; + line-height: 36px; + bottom: -2px; + left: 0; + top: auto; } .send-button { display: table-cell; -- cgit v1.2.3-1-g7c22 From 1f5e43b38817b8c6a3b121d6bd4447411e135f5d Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Wed, 9 Sep 2015 22:32:21 +0500 Subject: Adding minor hover changes for settings --- web/sass-files/sass/partials/_settings.scss | 12 ++++++++++++ 1 file changed, 12 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 468880724..2b59a943b 100644 --- a/web/sass-files/sass/partials/_settings.scss +++ b/web/sass-files/sass/partials/_settings.scss @@ -61,6 +61,12 @@ &:hover { background: #f9f9f9; } + &:hover .fa { + display: inline-block; + } + &:hover .section-edit { + text-decoration: underline; + } } .section-max { @@ -81,6 +87,12 @@ .section-edit { text-align: right; margin-bottom: 5px; + .fa { + margin-right: 7px; + font-size: 12px; + color: #aaa; + display: none; + } } .section-describe { -- cgit v1.2.3-1-g7c22 From 0eab8b88561638d02715ca3eca25c48439757bcc Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Thu, 10 Sep 2015 18:15:39 +0500 Subject: Fixing attachment button in RHS --- web/sass-files/sass/partials/_responsive.scss | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'web/sass-files/sass/partials') diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index 65619f25a..32d65b86b 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -413,6 +413,9 @@ } } .post-create__container { + .post-right__container & { + padding: 0 1em; + } form { padding: 0; } @@ -425,13 +428,15 @@ display: table-cell; padding-left: 45px; } - .btn-file { - width: 45px; - padding: 0; - line-height: 36px; - bottom: -2px; - left: 0; - top: auto; + .app__content & { + .btn-file { + width: 45px; + padding: 0; + line-height: 36px; + bottom: -2px; + left: 0; + top: auto; + } } .send-button { display: table-cell; -- cgit v1.2.3-1-g7c22 From 1440c953817aac3a5ebc6762f6c3e2668213fd70 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Thu, 10 Sep 2015 23:34:30 +0500 Subject: PM-183 and PM-162 - Updating UI for more modal and unread notification bar --- web/sass-files/sass/partials/_modal.scss | 13 +++++++------ web/sass-files/sass/partials/_sidebar--left.scss | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) (limited to 'web/sass-files/sass/partials') diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index b94ed2113..d5db5fc46 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -118,12 +118,11 @@ } &#more_channels { .modal-body { - padding: 5px 10px; + padding: 0; } } .more-channel-table { margin: 0; - table-layout: fixed; p { font-size: 0.9em; overflow: hidden; @@ -138,16 +137,18 @@ } tbody { > tr { - &:first-child { - td { - border: none; - } + &:hover td { + background: #f7f7f7; } td { + width: 100%; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + padding: 8px 8px 8px 15px; &.td--action { + text-align: right; + padding: 8px 15px 8px 8px; width: 70px; vertical-align: middle; } diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss index 933be96ff..0a504b765 100644 --- a/web/sass-files/sass/partials/_sidebar--left.scss +++ b/web/sass-files/sass/partials/_sidebar--left.scss @@ -50,7 +50,7 @@ right: 0; width: 72%; color: #777; - background: #DCF0FF; + background: #2389D7; @include border-radius(50px); margin: 0 auto; padding: 3px 0 4px; -- cgit v1.2.3-1-g7c22 From 72b9c3d7f6b24f74e145b0be9d9e733f0364ccb6 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Thu, 10 Sep 2015 23:36:10 +0500 Subject: Removing border from first tr tds in more modal --- web/sass-files/sass/partials/_modal.scss | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'web/sass-files/sass/partials') diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index d5db5fc46..d32306cbc 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -140,6 +140,11 @@ &:hover td { background: #f7f7f7; } + &:first-child { + td { + border: none; + } + } td { width: 100%; white-space: nowrap; -- cgit v1.2.3-1-g7c22