From 25b2e75dc664bfb80470713331c33c88e726dcf5 Mon Sep 17 00:00:00 2001 From: hmhealey Date: Thu, 16 Jul 2015 15:25:28 -0400 Subject: Added function to reply to earlier messages by prefixing a message with carets --- web/sass-files/sass/partials/_post.scss | 6 +++++- 1 file changed, 5 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 481ed63a5..87c7a427c 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -322,6 +322,10 @@ body.ios { max-width: 100%; @include legacy-pie-clearfix; } + &.active-thread__content { + // HARRISON remove me + color: blue; + } } .post-image__columns { @include legacy-pie-clearfix; @@ -437,4 +441,4 @@ body.ios { width: 40px; } } -} \ No newline at end of file +} -- cgit v1.2.3-1-g7c22 From 141d928d3c74621c277cc118c49e5b0f845e4691 Mon Sep 17 00:00:00 2001 From: hmhealey Date: Fri, 17 Jul 2015 09:34:35 -0400 Subject: Changed the placeholder highlight for active thread to be more subtle --- web/sass-files/sass/partials/_post.scss | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'web/sass-files') diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index 87c7a427c..c8f259c11 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -323,8 +323,10 @@ body.ios { @include legacy-pie-clearfix; } &.active-thread__content { - // HARRISON remove me - color: blue; + // this still needs a final style applied to it + & .post-body { + font-weight: bold; + } } } .post-image__columns { -- cgit v1.2.3-1-g7c22 From bd4fd876a89fea4d220dd237f65d21ecb6b0a0fc Mon Sep 17 00:00:00 2001 From: hmhealey Date: Tue, 21 Jul 2015 17:35:14 -0400 Subject: Changed post menu label to just be [...] regardless of whether or not the user is hovering over it --- web/sass-files/sass/partials/_post.scss | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'web/sass-files') diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index 481ed63a5..98b17120d 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -215,9 +215,6 @@ body.ios { @include opacity(1); } .dropdown-toggle:after { - content: '...'; - } - .dropdown-toggle:hover:after { content: '[...]'; } } @@ -437,4 +434,4 @@ body.ios { width: 40px; } } -} \ No newline at end of file +} -- cgit v1.2.3-1-g7c22 From b7d523f97d08465f3103c673ffd30306018f13f8 Mon Sep 17 00:00:00 2001 From: hmhealey Date: Tue, 21 Jul 2015 17:38:51 -0400 Subject: Changed post menu label to be ... and to make it visible at all times on small screens (ie mobile devices) --- web/sass-files/sass/partials/_responsive.scss | 10 ++++++++++ 1 file changed, 10 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 a33d69378..b3d3cd7ea 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -239,6 +239,11 @@ } &:hover { background: none; + .post-header .post-header-col.post-header__reply { + .dropdown-toggle:after { + content: '...'; + } + } } &.post--comment { &.other--root { @@ -247,6 +252,11 @@ } } } + .post-header .post-header-col.post-header__reply { + .dropdown-toggle:after { + content: '...'; + } + } } .signup-team__container { padding: 30px 0; -- cgit v1.2.3-1-g7c22 From b3b01339306a93d227c4f29337750c4730dd25f1 Mon Sep 17 00:00:00 2001 From: Reed Garmsen Date: Wed, 1 Jul 2015 18:40:20 -0700 Subject: Adding back Access History and Active Devices --- web/sass-files/sass/partials/_access-history.scss | 29 +++++++++++++++ web/sass-files/sass/partials/_activity-log.scss | 31 ++++++++++++++++ web/sass-files/sass/partials/_responsive.scss | 43 ++++++++++++++++++++--- web/sass-files/sass/partials/_settings.scss | 11 +++++- 4 files changed, 108 insertions(+), 6 deletions(-) create mode 100644 web/sass-files/sass/partials/_access-history.scss create mode 100644 web/sass-files/sass/partials/_activity-log.scss (limited to 'web/sass-files') diff --git a/web/sass-files/sass/partials/_access-history.scss b/web/sass-files/sass/partials/_access-history.scss new file mode 100644 index 000000000..f54c9a122 --- /dev/null +++ b/web/sass-files/sass/partials/_access-history.scss @@ -0,0 +1,29 @@ +.access-history__table { + display: table; + width: 100%; + padding-top: 15px; + line-height: 1.6; + &:first-child { + padding: 0; + } + > div { + display: table-cell; + vertical-align: top; + } + .access__date { + font-weight: 600; + font-size: 16px; + width: 190px; + } + .access__report { + border-bottom: 1px solid #ddd; + padding-bottom: 15px; + } + .report__time { + font-weight: 600; + font-size: 16px; + } + .report__info { + color: #999; + } +} \ No newline at end of file diff --git a/web/sass-files/sass/partials/_activity-log.scss b/web/sass-files/sass/partials/_activity-log.scss new file mode 100644 index 000000000..36eb48750 --- /dev/null +++ b/web/sass-files/sass/partials/_activity-log.scss @@ -0,0 +1,31 @@ +.activity-log__table { + display: table; + width: 100%; + line-height: 1.8; + border-top: 1px solid #DDD; + padding: 15px 0; + &:first-child { + padding-top: 0; + border: none; + } + > div { + display: table-cell; + vertical-align: top; + } + .activity-log__report { + width: 80%; + } + .activity-log__action { + text-align: right; + } + .report__platform { + font-size: 16px; + font-weight: 600; + .fa { + margin-right: 6px; + } + } + .report__info { + color: #999; + } +} \ No newline at end of file diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index b3d3cd7ea..10e1d6c0f 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -214,6 +214,12 @@ } } +@media (min-width: 992px){ + .modal-lg { + width: 700px; + } +} + @media screen and (min-width: 768px) { .second-bar { display: none; @@ -252,11 +258,11 @@ } } } - .post-header .post-header-col.post-header__reply { - .dropdown-toggle:after { - content: '...'; - } - } + .post-header .post-header-col.post-header__reply { + .dropdown-toggle:after { + content: '...'; + } + } } .signup-team__container { padding: 30px 0; @@ -640,6 +646,33 @@ padding: 9px 21px 10px 10px !important; } } +@media screen and (max-width: 640px) { + .access-history__table { + > div { + display: block; + } + .access__report { + margin: 0 0 15px 15px; + } + .access__date { + div { + margin-bottom: 15px; + } + } + } + .activity-log__table { + > div { + display: block; + } + .activity-log__report { + width: 100%; + } + .activity-log__action { + text-align: left; + margin-top: 10px; + } + } +} @media screen and (max-width: 480px) { .modal { .modal-body { diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss index e60bc290e..b8dc9e997 100644 --- a/web/sass-files/sass/partials/_settings.scss +++ b/web/sass-files/sass/partials/_settings.scss @@ -1,3 +1,6 @@ +@import "access-history"; +@import "activity-log"; + .user-settings { background: #fff; min-height:300px; @@ -32,6 +35,12 @@ display: table-cell; vertical-align: top; } + .security-links { + margin-right: 20px; + .fa { + margin-right: 6px; + } + } .settings-links { width: 180px; background: #FAFAFA; @@ -223,4 +232,4 @@ .color-btn { margin:4px; -} +} \ No newline at end of file -- cgit v1.2.3-1-g7c22 From fe0291a025eb8abf0b77e21d60cc3eaa9115de00 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Wed, 22 Jul 2015 20:38:40 +0500 Subject: Profile pic changes in LHS Header Removing profile pic in the LHS Header if the user hasn't uploaded a custom profile pic. --- 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 adeaa70d7..c45ffb6bf 100644 --- a/web/sass-files/sass/partials/_headers.scss +++ b/web/sass-files/sass/partials/_headers.scss @@ -106,9 +106,9 @@ height: 36px; float: left; @include border-radius(36px); + margin-right: 6px; } .header__info { - padding-left: 42px; color: #fff; } .team__name, .user__name { -- cgit v1.2.3-1-g7c22 From 06c278328afdb9b8c7bcc5590ebdeb330b93f431 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Wed, 22 Jul 2015 22:25:27 +0500 Subject: Improving formatting for Channel Intro --- web/sass-files/sass/partials/_headers.scss | 13 +++++++++++-- web/sass-files/sass/partials/_responsive.scss | 3 +++ 2 files changed, 14 insertions(+), 2 deletions(-) (limited to 'web/sass-files') diff --git a/web/sass-files/sass/partials/_headers.scss b/web/sass-files/sass/partials/_headers.scss index c45ffb6bf..eab4becac 100644 --- a/web/sass-files/sass/partials/_headers.scss +++ b/web/sass-files/sass/partials/_headers.scss @@ -44,14 +44,16 @@ white-space: normal; } } + } .channel-intro { padding-bottom:5px; margin: 0 1em 35px; + max-width: 850px; border-bottom: 1px solid lightgrey; .intro-links { - margin: 0.5em 1.5em 0 0; + margin: 0 1.5em 10px 0; display: inline-block; .fa { margin-right: 5px; @@ -64,8 +66,15 @@ .channel-intro-img { float:left; } - .channel-intro-title { + .channel-intro__title { font-weight:600; + font-size: 20px; + margin-bottom: 15px; + } + .channel-intro__content { + background: #f7f7f7; + padding: 10px 15px; + @include border-radius(3px); } .channel-intro-text { margin-top:35px; diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index b3d3cd7ea..d978886f9 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -89,6 +89,9 @@ max-width: 810px; } } + .channel-intro { + max-width: 810px; + } .date-separator, .new-separator { &.hovered--comment { &:before, &:after { -- cgit v1.2.3-1-g7c22