From f2401dd91f7e0ae005e1efddd1132d91bf4dad02 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Fri, 26 Jun 2015 03:07:20 +0500 Subject: MM-1184 - Updating image preview --- web/sass-files/sass/partials/_modal.scss | 13 +++++++------ web/sass-files/sass/partials/_responsive.scss | 1 - 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'web/sass-files') diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index 43dbdc077..22013aa4f 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -129,15 +129,16 @@ width:100%; margin: 0 auto; .image-wrapper { - padding: 4px; background: #FFF; position: relative; max-width: 80%; - min-height: 280px; min-width: 280px; - @include border-radius(4px); + @include border-radius(3px); display: table; margin: 0 auto; + &:hover { + @include border-radius(3px 3px 0 0); + } &:hover .modal-close { @include opacity(1); } @@ -217,10 +218,11 @@ } .modal-button-bar { position:absolute; - bottom:0px; + bottom:-40px; left:0px; right:0px; - background-color:rgba(0, 0, 0, 0.8); + background-color: #222; + @include border-radius(0 0 3px 3px); @include opacity(0); -webkit-transition: opacity 0.6s; -moz-transition: opacity 0.6s; @@ -228,7 +230,6 @@ transition: opacity 0.6s; line-height: 40px; padding: 0 10px; - margin: 4px; &.footer--show { @include opacity(1); } diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index bed2f6324..3949fc064 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -538,7 +538,6 @@ .modal { .modal-image { .image-wrapper { - padding-bottom: 40px; .modal-close { @include opacity(1); } -- cgit v1.2.3-1-g7c22 From febb6e3b656f0a5e48c928f26d071d2f1baf5b33 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Fri, 26 Jun 2015 23:19:29 +0500 Subject: mm-1256 - Improving view modal and close modal button --- web/sass-files/sass/partials/_modal.scss | 23 +++++++++++++++++++++-- web/sass-files/sass/partials/_responsive.scss | 11 ++++------- 2 files changed, 25 insertions(+), 9 deletions(-) (limited to 'web/sass-files') diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index 22013aa4f..9009dd768 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -1,9 +1,17 @@ +.modal-body { + padding: 20px 15px; +} .modal { &.image_modal { .modal-backdrop.in { @include opacity(0.7); } } + .info__label { + font-weight: bold; + text-align: right; + padding-right: 0; + } .remove__member { float: right; } @@ -29,7 +37,7 @@ border-radius: 0; background: $primary-color; color: #FFF; - padding: 15px 15px 11px; + padding: 15px 15px 11px; border: none; min-height: 56px; @include clearfix; @@ -41,11 +49,22 @@ margin: 0; } button.close { - margin-top: 0; + margin: -2px -2px 0 0; color: #fff; @include opacity(1); z-index: 5; + width: 30px; + height: 30px; + line-height: 30px; + @include single-transition(all, 0.25s, ease-in); position: relative; + &:hover { + background: rgba(0, 0, 0, 0.1); + } + span { + position: relative; + top: -1px; + } } .btn { margin-right: 10px; diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index 3949fc064..509c764b3 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -231,17 +231,14 @@ } } .modal { + .info__label { + text-align: left; + padding-bottom: 5px; + } .modal-header { - padding-left: 20px; - padding-right: 20px; .modal-action { margin-top: 10px; } - button.close { - width: 35px; - height: 32px; - margin: -5px -10px 0; - } .modal-title { float: none; } -- cgit v1.2.3-1-g7c22 From 0104bf822c70eef7793b8a31b78d5c72c0f1514e Mon Sep 17 00:00:00 2001 From: test Date: Fri, 26 Jun 2015 11:07:22 -0700 Subject: gui: fix mentions dropdown --- web/sass-files/sass/partials/_mentions.scss | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'web/sass-files') diff --git a/web/sass-files/sass/partials/_mentions.scss b/web/sass-files/sass/partials/_mentions.scss index 11cd4e9e4..cb6ff16c5 100644 --- a/web/sass-files/sass/partials/_mentions.scss +++ b/web/sass-files/sass/partials/_mentions.scss @@ -3,21 +3,19 @@ background: $primary-color; position: relative; z-index: 10; - padding-bottom: 1px; + padding-bottom: 2px; @include border-radius(3px); - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; } .mentions--top { position: absolute; - z-index:99999; + z-index: 1040; .mentions-box { position:absolute; background-color:#fff; - border:1px solid #ddd; - overflow:scroll; + border: $border-gray; + overflow-x: hidden; + overflow-y: scroll; bottom:0; } } @@ -29,10 +27,10 @@ height:37px; padding:2px; z-index:101; -} - -.mentions-name:hover { - background-color:#e8eaed; + cursor: pointer; + &:hover { + background-color:#e8eaed; + } } .mentions-text { @@ -46,6 +44,11 @@ border-radius: 10%; } +.mention-fullname { + color: grey; + padding-left: 10px; +} + .mention-highlight { background-color:#fff2bb; } -- cgit v1.2.3-1-g7c22 From 9e7ba4aa5dec9882e6fcf747b464cd8d5cee1e98 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Sat, 27 Jun 2015 00:29:37 +0500 Subject: Removing relative from span --- web/sass-files/sass/partials/_modal.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'web/sass-files') diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index 9009dd768..4427cb7dd 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -62,8 +62,7 @@ background: rgba(0, 0, 0, 0.1); } span { - position: relative; - top: -1px; + line-height: 10px; } } .btn { -- cgit v1.2.3-1-g7c22 From ce74e4a7288c1edded736f1315beb8b1909a4641 Mon Sep 17 00:00:00 2001 From: ralder Date: Mon, 29 Jun 2015 01:39:31 +0300 Subject: fix pr #82 mention list inside modal --- web/sass-files/sass/partials/_mentions.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web/sass-files') diff --git a/web/sass-files/sass/partials/_mentions.scss b/web/sass-files/sass/partials/_mentions.scss index cb6ff16c5..86fe400c9 100644 --- a/web/sass-files/sass/partials/_mentions.scss +++ b/web/sass-files/sass/partials/_mentions.scss @@ -9,7 +9,7 @@ .mentions--top { position: absolute; - z-index: 1040; + z-index: 1060; .mentions-box { position:absolute; background-color:#fff; -- cgit v1.2.3-1-g7c22 From ffe1e36a55035298ee5b5b7401347d2abdf2bcec Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Mon, 22 Jun 2015 14:51:20 -0400 Subject: make channel notifications modal visible in mobile mode --- web/sass-files/sass/partials/_responsive.scss | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'web/sass-files') diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index 509c764b3..d28d23f67 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -258,11 +258,13 @@ .settings-table { display: block; .settings-content { + &.minimize-settings { display: block; .section-edit { text-align: left; } } + } .settings-links { display: none; } @@ -284,12 +286,14 @@ } .settings-table { .settings-content { + &.minimize-settings { padding: 0; display: none; .user-settings { padding: 70px 20px 30px; } } + } .settings-links { background: #fff; } -- cgit v1.2.3-1-g7c22 From a8089fec3a1ece728408cbaf015d1ea1a33926fd Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Mon, 22 Jun 2015 14:52:56 -0400 Subject: fixed CSS indenting --- web/sass-files/sass/partials/_responsive.scss | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'web/sass-files') diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index d28d23f67..25533c770 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -258,13 +258,13 @@ .settings-table { display: block; .settings-content { - &.minimize-settings { - display: block; - .section-edit { - text-align: left; + &.minimize-settings { + display: block; + .section-edit { + text-align: left; + } } } - } .settings-links { display: none; } @@ -286,14 +286,14 @@ } .settings-table { .settings-content { - &.minimize-settings { - padding: 0; - display: none; - .user-settings { - padding: 70px 20px 30px; + &.minimize-settings { + padding: 0; + display: none; + .user-settings { + padding: 70px 20px 30px; + } } } - } .settings-links { background: #fff; } -- cgit v1.2.3-1-g7c22 From 495b0e45235b646e7bb6aedf53004ee359b6887f Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Tue, 30 Jun 2015 08:42:08 -0400 Subject: add default icon for non-user autocompletes --- web/sass-files/sass/partials/_mentions.scss | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'web/sass-files') diff --git a/web/sass-files/sass/partials/_mentions.scss b/web/sass-files/sass/partials/_mentions.scss index cb6ff16c5..ee254b546 100644 --- a/web/sass-files/sass/partials/_mentions.scss +++ b/web/sass-files/sass/partials/_mentions.scss @@ -56,3 +56,8 @@ .mention-link { color:$primary-color; } + +.mention-align { + position:relative; + top:5px; +} -- cgit v1.2.3-1-g7c22 From 494781d3cc67a0784ee36c4448194df66392b1e0 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Wed, 1 Jul 2015 23:30:41 +0500 Subject: Fixing height for content --- web/sass-files/sass/partials/_base.scss | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'web/sass-files') diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss index 5808aeb44..444f8db29 100644 --- a/web/sass-files/sass/partials/_base.scss +++ b/web/sass-files/sass/partials/_base.scss @@ -10,9 +10,6 @@ body { height: 100%; &.white { background: #fff; - .inner__wrap { - height: 100%; - } .row.content { min-height: 100%; height: auto !important; @@ -20,8 +17,12 @@ body { margin-bottom: -89px; } } + .inner__wrap, .row.main { + height: 100%; + } > .container-fluid { @include clearfix; + height: 100%; position: relative; } } -- cgit v1.2.3-1-g7c22 From 64c88565654b9cfcd973961245a796d104c4e266 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Wed, 1 Jul 2015 23:36:51 +0500 Subject: Just arranging the css more properly --- web/sass-files/sass/partials/_base.scss | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'web/sass-files') diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss index 444f8db29..4f069b23b 100644 --- a/web/sass-files/sass/partials/_base.scss +++ b/web/sass-files/sass/partials/_base.scss @@ -17,8 +17,11 @@ body { margin-bottom: -89px; } } - .inner__wrap, .row.main { + .inner__wrap { height: 100%; + > .row.main { + height: 100%; + } } > .container-fluid { @include clearfix; -- cgit v1.2.3-1-g7c22 From c15bc9ad94b80f3342c5daf3702231ce86561073 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Wed, 1 Jul 2015 23:37:50 +0500 Subject: Improving targeting for row content --- web/sass-files/sass/partials/_base.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'web/sass-files') diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss index 4f069b23b..4fb918bd1 100644 --- a/web/sass-files/sass/partials/_base.scss +++ b/web/sass-files/sass/partials/_base.scss @@ -10,11 +10,11 @@ body { height: 100%; &.white { background: #fff; - .row.content { - min-height: 100%; - height: auto !important; - height: 100%; - margin-bottom: -89px; + .inner__wrap { + > .row.content { + min-height: 100%; + margin-bottom: -89px; + } } } .inner__wrap { -- cgit v1.2.3-1-g7c22 From e46561339f59ff19f68d69596567d1498ed5a857 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Fri, 17 Jul 2015 21:04:33 +0500 Subject: MM-1426 - Updating UI --- web/sass-files/sass/partials/_base.scss | 8 ++++++-- web/sass-files/sass/partials/_modal.scss | 4 ++-- web/sass-files/sass/partials/_post.scss | 14 +++++++++++--- web/sass-files/sass/partials/_responsive.scss | 17 +++++++++++------ web/sass-files/sass/partials/_search.scss | 2 +- web/sass-files/sass/partials/_settings.scss | 4 ++-- web/sass-files/sass/partials/_sidebar--left.scss | 3 ++- 7 files changed, 35 insertions(+), 17 deletions(-) (limited to 'web/sass-files') diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss index 4fb918bd1..cf28e44e8 100644 --- a/web/sass-files/sass/partials/_base.scss +++ b/web/sass-files/sass/partials/_base.scss @@ -3,7 +3,7 @@ html, body { } body { - font-family: 'Lato', sans-serif; + font-family: 'Open Sans', sans-serif; -webkit-font-smoothing: antialiased; background: #e9e9e9; position: relative; @@ -30,6 +30,10 @@ body { } } +b, strong { + font-weight: 600; +} + a { word-break: break-word; } @@ -146,7 +150,7 @@ div.theme { top: 0; color: #FFF; font-size: 20px; - font-weight: bold; + font-weight: 600; text-decoration: none; padding: 0 10px; } diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index 4427cb7dd..7367b5d1a 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -8,7 +8,7 @@ } } .info__label { - font-weight: bold; + font-weight: 600; text-align: right; padding-right: 0; } @@ -120,7 +120,7 @@ } .more-channel-name { color: #444; - font-weight: bold; + font-weight: 600; font-size: 0.95em; } tbody { diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index 745d50173..7551d8d58 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -86,10 +86,11 @@ body.ios { background: #FFF; display: inline-block; padding: 0 1em; - font-weight: 900; + font-weight: 700; @include border-radius(50px); position: relative; z-index: 5; + font-size: 13px; } } .new-separator { @@ -212,6 +213,11 @@ body.ios { } } } + &.current--user { + .post-body { + background: #f5f5f5; + } + } &.same--root { .comment-icon__container { @include opacity(0); @@ -269,7 +275,7 @@ body.ios { float: left; .post-profile-img { margin-right: 10px; - @include border-radius(3px); + @include border-radius(50px); } } &.post__content { @@ -290,6 +296,8 @@ body.ios { width: 600px; float: left; word-wrap: break-word; + padding: 0.3em 0 0.1em; + margin: -0.3em 0 0; .post-link { @include clearfix; text-overflow: ellipsis; @@ -359,7 +367,7 @@ body.ios { .embed-title { margin: 3px 0 1px; color: #555; - font-weight: bold; + font-weight: 600; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index 25533c770..403e84521 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -22,11 +22,17 @@ width: 825px; } .post-body { - padding-left: 0; border: none; margin: 0; } } + .post-body { + float: none; + width: 750px; + padding-left: 0.5em; + padding-right: 0.5em; + margin: 0; + } .post__content { width: 920px; } @@ -63,10 +69,6 @@ } } } - .post-body { - float: none; - width: 750px; - } } } } @@ -89,6 +91,7 @@ margin-left: 60px; padding-left: 10px; border-left: 4px solid #EEE; + margin-bottom: 10px; div.post-profile-img__container { .post-profile-img { display: none; @@ -98,7 +101,6 @@ width: 825px; } .post-body { - padding-left: 0; border: none; margin: 0; } @@ -135,6 +137,9 @@ } } .post-body { + margin: 0; + padding-left: 0.5em; + padding-right: 0.5em; float: none; width: 750px; } diff --git a/web/sass-files/sass/partials/_search.scss b/web/sass-files/sass/partials/_search.scss index ca5d25720..8d51d00c0 100644 --- a/web/sass-files/sass/partials/_search.scss +++ b/web/sass-files/sass/partials/_search.scss @@ -77,7 +77,7 @@ border: none; } .search-channel__name { - font-weight: bold; + font-weight: 600; margin: 0 0 10px 0; } } diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss index dbaab8b58..af759c650 100644 --- a/web/sass-files/sass/partials/_settings.scss +++ b/web/sass-files/sass/partials/_settings.scss @@ -56,7 +56,7 @@ .section-title { margin-bottom: 5px; - font-weight: bold; + font-weight: 600; } .section-edit { @@ -172,7 +172,7 @@ border-top:1px solid lightgrey; } .post-profile-img { - @include border-radius(3px); + @include border-radius(50px); margin-right: 8px; } .member-name { diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss index b1dd470d2..46b328d43 100644 --- a/web/sass-files/sass/partials/_sidebar--left.scss +++ b/web/sass-files/sass/partials/_sidebar--left.scss @@ -59,7 +59,7 @@ color: #999; &.unread-title { color: #333; - font-weight: bold; + font-weight: 600; } &:hover, &:focus { background: #e6f2fa; @@ -70,6 +70,7 @@ color: #111; background-color: #e1e1e1; border-radius: 0; + font-weight: 600; } } } -- cgit v1.2.3-1-g7c22 From 138d0ea12b6e0f2cd26f658224018c6a76e4d2a8 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Fri, 17 Jul 2015 21:07:53 +0500 Subject: Adding border radius --- web/sass-files/sass/partials/_post.scss | 1 + 1 file changed, 1 insertion(+) (limited to 'web/sass-files') diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index 7551d8d58..8ce1bf984 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -215,6 +215,7 @@ body.ios { } &.current--user { .post-body { + @include border-radius(4px); background: #f5f5f5; } } -- cgit v1.2.3-1-g7c22 From 30239d255ae8ecbed70bb7b5b10db23039ca649b Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Fri, 17 Jul 2015 22:06:53 +0500 Subject: Improving image modals --- web/sass-files/sass/partials/_headers.scss | 2 +- web/sass-files/sass/partials/_modal.scss | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'web/sass-files') diff --git a/web/sass-files/sass/partials/_headers.scss b/web/sass-files/sass/partials/_headers.scss index 89bbaef2b..e240d5151 100644 --- a/web/sass-files/sass/partials/_headers.scss +++ b/web/sass-files/sass/partials/_headers.scss @@ -65,7 +65,7 @@ float:left; } .channel-intro-title { - font-weight:bold; + font-weight:600; } .channel-intro-text { margin-top:35px; diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index 7367b5d1a..b26af1d32 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -145,6 +145,7 @@ .modal-image { position:relative; width:100%; + height: 100%; margin: 0 auto; .image-wrapper { background: #FFF; -- cgit v1.2.3-1-g7c22 From 764bd97bc72ac335ce42b5c4e19931b6a72b803b Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Fri, 17 Jul 2015 23:10:10 +0500 Subject: Improving modal UI --- web/sass-files/sass/partials/_modal.scss | 1 - 1 file changed, 1 deletion(-) (limited to 'web/sass-files') diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index b26af1d32..5438f58fb 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -66,7 +66,6 @@ } } .btn { - margin-right: 10px; &.btn-primary { float: right; margin-top: -4px; -- cgit v1.2.3-1-g7c22 From f5c4cf10c484111e817c1111d9138d891c6d84cf Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Fri, 17 Jul 2015 23:39:09 +0500 Subject: Adding highlights and improving css for posts on responsive screens --- web/sass-files/sass/partials/_modal.scss | 1 - web/sass-files/sass/partials/_post.scss | 4 ++-- web/sass-files/sass/partials/_responsive.scss | 6 ++---- 3 files changed, 4 insertions(+), 7 deletions(-) (limited to 'web/sass-files') diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index 5438f58fb..971ed0935 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -21,7 +21,6 @@ margin-right: auto; } .modal-body { - max-height: 75%; overflow: auto; } .modal-push-down { diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index 8ce1bf984..72b527311 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -215,7 +215,7 @@ body.ios { } &.current--user { .post-body { - @include border-radius(4px); + @include border-radius(0 4px 4px 0); background: #f5f5f5; } } @@ -297,7 +297,7 @@ body.ios { width: 600px; float: left; word-wrap: break-word; - padding: 0.3em 0 0.1em; + padding: 0.3em 0.5em 0.1em; margin: -0.3em 0 0; .post-link { @include clearfix; diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index 403e84521..5497e2c6c 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -22,6 +22,7 @@ width: 825px; } .post-body { + width: 736px; border: none; margin: 0; } @@ -29,8 +30,6 @@ .post-body { float: none; width: 750px; - padding-left: 0.5em; - padding-right: 0.5em; margin: 0; } .post__content { @@ -101,6 +100,7 @@ width: 825px; } .post-body { + width: 736px; border: none; margin: 0; } @@ -138,8 +138,6 @@ } .post-body { margin: 0; - padding-left: 0.5em; - padding-right: 0.5em; float: none; width: 750px; } -- cgit v1.2.3-1-g7c22 From dafc49dcaead4ba7a0210aebc578ba258c991261 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Sat, 18 Jul 2015 01:09:02 +0500 Subject: Minor fixes to mattermost UI --- web/sass-files/sass/partials/_post.scss | 1 + web/sass-files/sass/partials/_sidebar--left.scss | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'web/sass-files') diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index 72b527311..769cb1091 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -256,6 +256,7 @@ body.ios { } p { margin: 0 0 5px; + font-size: 0.97em; white-space: pre-wrap; } .comment-icon__container { diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss index 46b328d43..89d1ff416 100644 --- a/web/sass-files/sass/partials/_sidebar--left.scss +++ b/web/sass-files/sass/partials/_sidebar--left.scss @@ -70,7 +70,7 @@ color: #111; background-color: #e1e1e1; border-radius: 0; - font-weight: 600; + font-weight: 400; } } } -- cgit v1.2.3-1-g7c22 From 1005dfb8e4a276fc394c655f891388795cc60b09 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Sat, 18 Jul 2015 01:19:53 +0500 Subject: Updating margins --- web/sass-files/sass/partials/_responsive.scss | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'web/sass-files') diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index 5497e2c6c..a34bbe8d8 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -5,7 +5,8 @@ &.post--comment { &.other--root { .post-comment { - margin-left: 0; + margin-left: -7px; + background: #e8e8e8; } } } @@ -82,7 +83,8 @@ &.post--comment { &.other--root { .post-comment { - margin-left: 0; + margin-left: -7px; + background: #e8e8e8; } } } @@ -578,7 +580,7 @@ &.post--comment { &.other--root { .post-comment { - margin-left: 11px; + margin-left: 4px; } } } -- cgit v1.2.3-1-g7c22 From ea1ef222b717394e8019b203ad37e63d102d0ab9 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Sat, 18 Jul 2015 01:52:37 +0500 Subject: MM-1319 - Copy link and background change --- web/sass-files/sass/partials/_responsive.scss | 2 -- 1 file changed, 2 deletions(-) (limited to 'web/sass-files') diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index a34bbe8d8..0037879cf 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -6,7 +6,6 @@ &.other--root { .post-comment { margin-left: -7px; - background: #e8e8e8; } } } @@ -84,7 +83,6 @@ &.other--root { .post-comment { margin-left: -7px; - background: #e8e8e8; } } } -- cgit v1.2.3-1-g7c22 From a3d521298a3b65dd3870deffecc8b95efa6cfabe Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Sat, 18 Jul 2015 01:54:56 +0500 Subject: Fixing padding in sidebar dropdown --- web/sass-files/sass/partials/_headers.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web/sass-files') diff --git a/web/sass-files/sass/partials/_headers.scss b/web/sass-files/sass/partials/_headers.scss index e240d5151..1ec1109a5 100644 --- a/web/sass-files/sass/partials/_headers.scss +++ b/web/sass-files/sass/partials/_headers.scss @@ -88,7 +88,7 @@ } .dropdown-menu { li a { - padding: 3 20px; + padding: 3px 20px; color: #555; } } -- cgit v1.2.3-1-g7c22 From d5d9481c0f4c1ddd86f2e30f798da50c37f56a3a Mon Sep 17 00:00:00 2001 From: Reed Garmsen Date: Tue, 30 Jun 2015 20:01:35 -0700 Subject: Added new files for adding new loading animation --- web/sass-files/sass/partials/_loading.scss | 68 ++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 web/sass-files/sass/partials/_loading.scss (limited to 'web/sass-files') diff --git a/web/sass-files/sass/partials/_loading.scss b/web/sass-files/sass/partials/_loading.scss new file mode 100644 index 000000000..185a42180 --- /dev/null +++ b/web/sass-files/sass/partials/_loading.scss @@ -0,0 +1,68 @@ +.loading-screen { + display: table; + width: 100%; + height: 100%; + position: absolute; + @include box-sizing(border-box); + text-align: center; + .loading__content { + display: table-cell; + vertical-align: middle; + h3 { + font-weight: 400; + margin: 0 0.2em 0; + display: inline-block; + } + } +} + +.loading-screen { + .loading__content { + .round { + background-color: #444; + width: 4px; + height: 4px; + display: inline-block; + margin: 0 1px; + opacity: 0.1; + @include border-radius(10px); + -moz-animation: move 0.75s infinite linear; + -webkit-animation: move 0.75s infinite linear; + } + + #round_1 { + -moz-animation-delay: .2s; + -webkit-animation-delay: .2s; + } + + #round_2 { + -moz-animation-delay: .4s; + -webkit-animation-delay: .4s; + } + + #round_3 { + -moz-animation-delay: .6s; + -webkit-animation-delay: .6s; + } + + @-moz-keyframes move { + 0% { + opacity: 1; + } + + 100% { + opacity: 0.1; + }; + } + + @-webkit-keyframes move { + 0% { + opacity: 1; + } + + 100% { + opacity: 0.1; + }; + } + } +} -- cgit v1.2.3-1-g7c22 From cbfc85fde2cea70e944f22cc2620d343af839395 Mon Sep 17 00:00:00 2001 From: Reed Garmsen Date: Thu, 2 Jul 2015 12:20:39 -0700 Subject: Added import statement to styles.scss --- web/sass-files/sass/styles.scss | 1 + 1 file changed, 1 insertion(+) (limited to 'web/sass-files') diff --git a/web/sass-files/sass/styles.scss b/web/sass-files/sass/styles.scss index 8446f1c01..9cc26320c 100644 --- a/web/sass-files/sass/styles.scss +++ b/web/sass-files/sass/styles.scss @@ -29,6 +29,7 @@ @import "partials/modal"; @import "partials/mentions"; @import "partials/error"; +@import "partials/loading"; // Responsive Css @import "partials/responsive"; -- cgit v1.2.3-1-g7c22