From db4273d3570cc818f64e144558380b24d21ed949 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Fri, 23 Oct 2015 19:59:32 +0500 Subject: Multiple UI Improvements --- web/sass-files/sass/partials/_base.scss | 9 +++++- web/sass-files/sass/partials/_responsive.scss | 8 +++++ web/sass-files/sass/partials/_settings.scss | 42 ++++++++++++++++++++------- web/sass-files/sass/partials/_webhooks.scss | 31 ++++++++++++++++++++ 4 files changed, 78 insertions(+), 12 deletions(-) create mode 100644 web/sass-files/sass/partials/_webhooks.scss (limited to 'web/sass-files/sass/partials') diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss index 6b2e79933..6399b8fd8 100644 --- a/web/sass-files/sass/partials/_base.scss +++ b/web/sass-files/sass/partials/_base.scss @@ -94,8 +94,11 @@ a:focus, a:hover { margin: 0; } -.text-danger { +.text-danger, a.text-danger { color: #E05F5D; + &:hover, &:focus { + color: #E05F5D; + } } .btn { @@ -112,6 +115,10 @@ a:focus, a:hover { &:focus { @include box-shadow(none); } + &.no-padding { + line-height: 32px; + padding: 0; + } &.no-resize { resize: none; } diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index f4e57eec5..892d4d9df 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -401,6 +401,9 @@ text-align: left; } } + .no-padding--left { + padding-left: 15px; + } } .settings-links { display: none; @@ -425,6 +428,11 @@ } } .settings-table { + .nav { + position: relative; + top: auto; + width: 100%; + } .settings-content { &.minimize-settings { padding: 0; diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss index 9af045f98..83f6cddde 100644 --- a/web/sass-files/sass/partials/_settings.scss +++ b/web/sass-files/sass/partials/_settings.scss @@ -1,5 +1,6 @@ @import "access-history"; @import "activity-log"; +@import "webhooks"; .user-settings { min-height:300px; @@ -29,6 +30,9 @@ li { list-style: none; } + label { + font-weight: 600; + } .settings-table { display: table; table-layout: fixed; @@ -37,6 +41,11 @@ display: table-cell; vertical-align: top; } + .nav { + position: fixed; + top: 55px; + width: 180px; + } .security-links { margin-right: 20px; .fa { @@ -129,10 +138,6 @@ } } - .font--small { - font-size: 13px; - } - .section-describe { @include opacity(0.7); white-space:pre; @@ -161,14 +166,29 @@ .setting-list-item { margin-top:7px; - .has-error { - color: #a94442; + } + .has-error { + color: #a94442; + } + .no-padding--left { + padding-left: 0; + } + .padding-top { + padding-top: 7px; + &.x2 { + padding-top: 14px; } - .padding-top { - padding-top: 7px; - &.x2 { - padding-top: 14px; - } + &.x3 { + padding-top: 21px; + } + } + .padding-bottom { + padding-bottom: 7px; + &.x2 { + padding-bottom: 14px; + } + &.x3 { + padding-bottom: 21px; } .control-label { font-weight: 600; diff --git a/web/sass-files/sass/partials/_webhooks.scss b/web/sass-files/sass/partials/_webhooks.scss new file mode 100644 index 000000000..b801ccf63 --- /dev/null +++ b/web/sass-files/sass/partials/_webhooks.scss @@ -0,0 +1,31 @@ +.webhooks__container { + background: rgba(black, 0.1); + border: 1px solid; + @include border-radius(3px); + padding: 0 13px 15px; + margin-top: 10px; +} +.webhook__item { + font-size: 13px; + position: relative; + &:last-child { + .divider-light:last-child { + display: none; + } + } + .webhook__remove { + position: absolute; + right: -7px; + top: 8px; + width: 30px; + height: 30px; + font-size: 22px; + font-weight: bold; + text-align: center; + text-decoration: none; + color: #E05F5D; + } + .webhook__url { + padding-right: 20px; + } +} \ No newline at end of file -- cgit v1.2.3-1-g7c22 From fbc1f35191101d42b2dca19b63611328275ccd08 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Fri, 23 Oct 2015 20:08:46 +0500 Subject: Updating bot styling --- web/sass-files/sass/partials/_post.scss | 11 ++++++----- 1 file changed, 6 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 db58d0347..f5fc1631f 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -569,9 +569,10 @@ body.ios { } .bot-indicator { - background-color: lightgrey; - border-radius:2px; - padding-left:2px; - padding-right:2px; - font-family:"Courier New" + font-family: inherit; + font-size: 11px; + padding: 2px 4px; + border-radius: 2px; + font-weight: 600; + margin: 0 0 0 -4px; } -- cgit v1.2.3-1-g7c22 From fb05a16b0c989b1d6e3fd3bda6381036ace2753f Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Fri, 23 Oct 2015 20:34:21 +0500 Subject: Updating nav active bg and Send invitation button --- web/sass-files/sass/partials/_settings.scss | 2 +- 1 file changed, 1 insertion(+), 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 83f6cddde..c881f9073 100644 --- a/web/sass-files/sass/partials/_settings.scss +++ b/web/sass-files/sass/partials/_settings.scss @@ -43,7 +43,7 @@ } .nav { position: fixed; - top: 55px; + top: 57px; width: 180px; } .security-links { -- cgit v1.2.3-1-g7c22 From 1ab88072e1bd23107db9a7f8aec59bf5b1752d85 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Fri, 23 Oct 2015 20:44:20 +0500 Subject: Improving search popover on mobile --- web/sass-files/sass/partials/_responsive.scss | 4 ++++ 1 file changed, 4 insertions(+) (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 892d4d9df..5cac6ee6e 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -284,6 +284,10 @@ height: auto; } } + .popover.search-help-popover { + width: 262px; + margin: 34px 0 0 14px; + } .modal-direct-channels { .member-count { float: none; -- cgit v1.2.3-1-g7c22 From fde05f83f373ea6393c0e63b9b1db244033bb667 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Fri, 23 Oct 2015 21:33:04 +0500 Subject: Hiding search popover for mobile devices --- web/sass-files/sass/partials/_responsive.scss | 5 ++--- 1 file changed, 2 insertions(+), 3 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 5cac6ee6e..2cd5560ef 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -284,9 +284,8 @@ height: auto; } } - .popover.search-help-popover { - width: 262px; - margin: 34px 0 0 14px; + .search-help-popover.visible { + visibility: hidden; } .modal-direct-channels { .member-count { -- cgit v1.2.3-1-g7c22 From 4172d0286e61b4fd5459fc64e7653535751a012d Mon Sep 17 00:00:00 2001 From: hmhealey Date: Tue, 20 Oct 2015 17:31:20 -0400 Subject: Added styling to search autocomplete --- web/sass-files/sass/partials/_search.scss | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'web/sass-files/sass/partials') diff --git a/web/sass-files/sass/partials/_search.scss b/web/sass-files/sass/partials/_search.scss index 2f15a445f..d7287295b 100644 --- a/web/sass-files/sass/partials/_search.scss +++ b/web/sass-files/sass/partials/_search.scss @@ -109,3 +109,33 @@ .search-highlight { background-color: #FFF2BB; } + +.search-autocomplete { + background-color: #fff; + border: $border-gray; + line-height: 36px; + overflow-x: hidden; + overflow-y: scroll; + position: absolute; + text-align: left; + width: 100%; + z-index: 100; + @extend %popover-box-shadow; +} + +.search-autocomplete__channel { + height: 36px; + padding: 0px 6px; +} + +.search-autocomplete__user { + height: 36px; + padding: 0px; + + .profile-img { + height: 32px; + margin-right: 6px; + width: 32px; + @include border-radius(16px); + } +} -- cgit v1.2.3-1-g7c22 From a5a2826700b1fc6b19ba38698cfa703f58476bc6 Mon Sep 17 00:00:00 2001 From: hmhealey Date: Wed, 21 Oct 2015 11:03:50 -0400 Subject: Added keyboard selection to search autocomplete --- web/sass-files/sass/partials/_search.scss | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'web/sass-files/sass/partials') diff --git a/web/sass-files/sass/partials/_search.scss b/web/sass-files/sass/partials/_search.scss index d7287295b..ce3563885 100644 --- a/web/sass-files/sass/partials/_search.scss +++ b/web/sass-files/sass/partials/_search.scss @@ -124,11 +124,17 @@ } .search-autocomplete__channel { + cursor: pointer; height: 36px; padding: 0px 6px; + + &.selected { + background-color:rgba(51, 51, 51, 0.15); + } } .search-autocomplete__user { + cursor: pointer; height: 36px; padding: 0px; @@ -138,4 +144,8 @@ width: 32px; @include border-radius(16px); } + + &.selected { + background-color:rgba(51, 51, 51, 0.15); + } } -- cgit v1.2.3-1-g7c22