From 546a6cbf6baf4e2aa3657f21e22965732676cf92 Mon Sep 17 00:00:00 2001 From: Gabriel Albo Date: Mon, 28 Dec 2015 12:38:10 -0200 Subject: #563 - Adding hide/show logic and link. Hiding cc and bcc by default --- web-ui/app/scss/_mixins.scss | 17 ++++++++++++++++- web-ui/app/templates/compose/recipients.hbs | 8 +++++--- 2 files changed, 21 insertions(+), 4 deletions(-) (limited to 'web-ui') diff --git a/web-ui/app/scss/_mixins.scss b/web-ui/app/scss/_mixins.scss index 1f3e618e..f3d99499 100644 --- a/web-ui/app/scss/_mixins.scss +++ b/web-ui/app/scss/_mixins.scss @@ -284,8 +284,23 @@ border-color: #999999; outline: none; } + } -} + .collapse { + display:block; + position: absolute; + right: 0; + cursor: pointer; + } + + .collapse + input, .collapse + input + *{ + display:none; + } + + .collapse+ input:checked + *{ + display:block; + } +} @include tt-hint; diff --git a/web-ui/app/templates/compose/recipients.hbs b/web-ui/app/templates/compose/recipients.hbs index 6dbed714..87319730 100644 --- a/web-ui/app/templates/compose/recipients.hbs +++ b/web-ui/app/templates/compose/recipients.hbs @@ -5,10 +5,11 @@
- -
+ - + + +
@@ -28,4 +29,5 @@
+
-- cgit v1.2.3 From db01a5357e46faf9c0d68b29592e13d13d79273f Mon Sep 17 00:00:00 2001 From: Gabriel Albo Date: Mon, 28 Dec 2015 14:01:47 -0200 Subject: #563 - Removing recipients fields border and leaving only one at the top of the subject field --- web-ui/app/scss/_compose.scss | 2 +- web-ui/app/templates/compose/recipients.hbs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'web-ui') diff --git a/web-ui/app/scss/_compose.scss b/web-ui/app/scss/_compose.scss index 3368cda1..bd064015 100644 --- a/web-ui/app/scss/_compose.scss +++ b/web-ui/app/scss/_compose.scss @@ -30,7 +30,6 @@ margin: 5px 0 50px 30px; padding: 0; .input-container { - border-bottom: 1px solid #DDD; padding: 1px; } label, span { @@ -71,6 +70,7 @@ input#subject, #feedback-subject { font-size: 1.6875rem; line-height: 1.4; + border-top: 1px solid #DDD; } #feedback-subject { color: #333; diff --git a/web-ui/app/templates/compose/recipients.hbs b/web-ui/app/templates/compose/recipients.hbs index 87319730..00de3663 100644 --- a/web-ui/app/templates/compose/recipients.hbs +++ b/web-ui/app/templates/compose/recipients.hbs @@ -7,7 +7,7 @@
- +
-- cgit v1.2.3 From a08a1c55aa4a28ae8c82c825631e1f3ca32c0092 Mon Sep 17 00:00:00 2001 From: Gabriel Albo Date: Mon, 28 Dec 2015 16:33:09 -0200 Subject: #563 - Adding arrows up and down to indicate the state of the cc and bcc fields --- web-ui/app/js/mail_view/ui/compose_box.js | 12 ++++++++++++ web-ui/app/scss/_mixins.scss | 14 +++++++++----- web-ui/app/templates/compose/recipients.hbs | 2 +- 3 files changed, 22 insertions(+), 6 deletions(-) (limited to 'web-ui') diff --git a/web-ui/app/js/mail_view/ui/compose_box.js b/web-ui/app/js/mail_view/ui/compose_box.js index 48a7c23f..993cf880 100644 --- a/web-ui/app/js/mail_view/ui/compose_box.js +++ b/web-ui/app/js/mail_view/ui/compose_box.js @@ -73,12 +73,24 @@ define( this.trigger(events.dispatchers.rightPane.openNoMessageSelected); }; + this.toggleRecipientsArrows = function () { + if ($('#cc-bcc-collapse').hasClass('fa-angle-down')) { + $('#cc-bcc-collapse').removeClass('fa-angle-down'); + $('#cc-bcc-collapse').addClass('fa-angle-up'); + } else { + $('#cc-bcc-collapse').removeClass('fa-angle-up'); + $('#cc-bcc-collapse').addClass('fa-angle-down'); + } + }; + + this.after('initialize', function () { this.renderComposeBox(); this.select('toBox').focus(); this.on(document, events.mail.deleted, this.mailDeleted); this.on(document, events.mail.sent, this.showNoMessageSelected); + this.on($('#cc-bcc-collapse'), 'click', this.toggleRecipientsArrows); }); } } diff --git a/web-ui/app/scss/_mixins.scss b/web-ui/app/scss/_mixins.scss index f3d99499..ffd1a02a 100644 --- a/web-ui/app/scss/_mixins.scss +++ b/web-ui/app/scss/_mixins.scss @@ -284,21 +284,25 @@ border-color: #999999; outline: none; } - - } +} .collapse { display:block; position: absolute; - right: 0; + right: 10px; + padding-right: 15px; + padding-left: 15px; + font-family: 'FontAwesome'; + font-weight: bolder; + font-size: larger; cursor: pointer; } - .collapse + input, .collapse + input + *{ + .collapse + input, .collapse + input + * { display:none; } - .collapse+ input:checked + *{ + .collapse + input:checked + * { display:block; } } diff --git a/web-ui/app/templates/compose/recipients.hbs b/web-ui/app/templates/compose/recipients.hbs index 00de3663..31b51144 100644 --- a/web-ui/app/templates/compose/recipients.hbs +++ b/web-ui/app/templates/compose/recipients.hbs @@ -7,7 +7,7 @@
- +
-- cgit v1.2.3