diff options
Diffstat (limited to 'web-ui/app')
-rw-r--r-- | web-ui/app/index.html | 7 | ||||
-rw-r--r-- | web-ui/app/js/mail_list/ui/mail_items/mail_item.js | 1 | ||||
-rw-r--r-- | web-ui/app/js/mail_list/ui/mail_list.js | 10 | ||||
-rw-r--r-- | web-ui/app/js/services/mail_service.js | 6 | ||||
-rw-r--r-- | web-ui/app/scss/styles.scss | 18 |
5 files changed, 22 insertions, 20 deletions
diff --git a/web-ui/app/index.html b/web-ui/app/index.html index 64b8f510..e4e0f07d 100644 --- a/web-ui/app/index.html +++ b/web-ui/app/index.html @@ -25,9 +25,12 @@ <div class="inner-wrap"> <div id="menu" class="column collapsed-nav no-padding"> + <a class="left-off-canvas-logo" href="#"> + <img id="pixelated-logo" src="images/pixelated-logo_symbol_orange.svg" alt="Pixelated"> + </a> <a class="left-off-canvas-toggle" href="#"> - <img src="images/pixelated-logo_symbol_orange.svg" alt="Pixelated"> - <i class=" toggle fa fa-navicon"></i></a> + <i class=" toggle fa fa-navicon"></i> + </a> <ul id="tags-shortcuts" class="shortcuts"> </ul> <ul id="custom-tags-shortcuts" class="shortcuts"> diff --git a/web-ui/app/js/mail_list/ui/mail_items/mail_item.js b/web-ui/app/js/mail_list/ui/mail_items/mail_item.js index 94f08a9f..f7ae2f0c 100644 --- a/web-ui/app/js/mail_list/ui/mail_items/mail_item.js +++ b/web-ui/app/js/mail_list/ui/mail_items/mail_item.js @@ -36,7 +36,6 @@ define( this.doSelect = function () { this.$node.addClass('selected'); - this.checkCheckbox(); }; this.doUnselect = function () { diff --git a/web-ui/app/js/mail_list/ui/mail_list.js b/web-ui/app/js/mail_list/ui/mail_list.js index c2746c88..69327a57 100644 --- a/web-ui/app/js/mail_list/ui/mail_list.js +++ b/web-ui/app/js/mail_list/ui/mail_list.js @@ -121,15 +121,15 @@ define( }; this.updateCheckAllCheckbox = function () { - this.trigger(document, events.ui.mails.hasMailsChecked, {hasMailsChecked: _.keys(this.attr.checkedMails).length > 0}); + this.trigger(document, events.ui.mails.hasMailsChecked, _.keys(this.attr.checkedMails).length > 0); }; - this.addToSelectedMails = function (ev, data) { + this.addToCheckedMails = function (ev, data) { this.attr.checkedMails[data.mail.ident] = data.mail; this.updateCheckAllCheckbox(); }; - this.removeFromSelectedMails = function (ev, data) { + this.removeFromCheckedMails = function (ev, data) { if (data.mails) { _.each(data.mails, function (mail) { delete this.attr.checkedMails[mail.ident]; @@ -169,8 +169,8 @@ define( this.on(document, events.ui.mail.updateSelected, this.updateSelected); this.on(document, events.ui.mail.wantChecked, this.respondWithCheckedMails); - this.on(document, events.ui.mail.checked, this.addToSelectedMails); - this.on(document, events.ui.mail.unchecked, this.removeFromSelectedMails); + this.on(document, events.ui.mail.checked, this.addToCheckedMails); + this.on(document, events.ui.mail.unchecked, this.removeFromCheckedMails); this.openMailFromUrl = utils.once(function () { if (this.shouldSelectEmailFromUrlMailIdent()) { diff --git a/web-ui/app/js/services/mail_service.js b/web-ui/app/js/services/mail_service.js index ca8b1da1..1fa41619 100644 --- a/web-ui/app/js/services/mail_service.js +++ b/web-ui/app/js/services/mail_service.js @@ -108,8 +108,7 @@ define( this.triggerMailsRead = function (mails) { return _.bind(function () { this.refreshMails(); - this.trigger(document, events.ui.mail.unchecked, { mails: mails }); - this.trigger(document, events.ui.mails.hasMailsChecked, false); + this.trigger(document, events.ui.mails.uncheckAll); }, this); }; @@ -119,8 +118,7 @@ define( this.refreshMails(); this.trigger(document, events.ui.userAlerts.displayMessage, { message: dataToDelete.successMessage}); - this.trigger(document, events.ui.mail.unchecked, { mails: mails }); - this.trigger(document, events.ui.mails.hasMailsChecked, false); + this.trigger(document, events.ui.mails.uncheckAll); this.trigger(document, events.mail.deleted, { mails: mails }); }, this); }; diff --git a/web-ui/app/scss/styles.scss b/web-ui/app/scss/styles.scss index c146b875..d3912da3 100644 --- a/web-ui/app/scss/styles.scss +++ b/web-ui/app/scss/styles.scss @@ -450,6 +450,16 @@ button { z-index: 2; height: 100vh; background: $secondary; + + .left-off-canvas-logo { + text-align: center; + padding: 10px; + display: block; + img { + padding-top: 1px; + } + } + .left-off-canvas-toggle { color: white; text-align: center; @@ -460,14 +470,6 @@ button { top: 0; z-index: 10000; position: relative; - - img { - padding-top: 1px; - } - - .toggle { - padding-top: 20px; - } } ul.shortcuts { li { |