summaryrefslogtreecommitdiff
path: root/web-ui
diff options
context:
space:
mode:
authorAnike Arni <aarni@thoughtworks.com>2016-12-14 11:28:47 -0200
committerAnike Arni <aarni@thoughtworks.com>2016-12-14 15:46:26 -0200
commitf6ee8978e6195fa3f25fe2dedd20e5ed9ebf598e (patch)
tree268300c09672d4c91ff363b4ae56ed17faa2f656 /web-ui
parentb60c54f2b46e8b219963c2c0730e2095d7a69cb7 (diff)
[#845] Move add tag button to tag icon.
With @thaissiqueira.
Diffstat (limited to 'web-ui')
-rw-r--r--web-ui/app/templates/mails/full_view.hbs6
-rw-r--r--web-ui/test/spec/mail_view/ui/mail_view.spec.js2
2 files changed, 2 insertions, 6 deletions
diff --git a/web-ui/app/templates/mails/full_view.hbs b/web-ui/app/templates/mails/full_view.hbs
index 40bfd4a2..736bc854 100644
--- a/web-ui/app/templates/mails/full_view.hbs
+++ b/web-ui/app/templates/mails/full_view.hbs
@@ -45,7 +45,7 @@
<ul class="mail-read-view__header-tags">
<li class="mail-read-view__header-tags-label">
- <i class="fa fa-tags"></i>
+ <button id="new-tag-button" class="no-style"><i class="fa fa-tags"></i></button>
</li>
{{#each tags }}
@@ -56,10 +56,6 @@
<input type="text" id="new-tag-input" placeholder="{{t 'add-tag-placeholder'}}"
/>
</li>
-
- <li class="mail-read-view__header-tags-new-button">
- <button id="new-tag-button" class="no-style"><i class="fa fa-plus"></i></button>
- </li>
</ul>
</header>
diff --git a/web-ui/test/spec/mail_view/ui/mail_view.spec.js b/web-ui/test/spec/mail_view/ui/mail_view.spec.js
index 438df57f..0e05ddef 100644
--- a/web-ui/test/spec/mail_view/ui/mail_view.spec.js
+++ b/web-ui/test/spec/mail_view/ui/mail_view.spec.js
@@ -95,7 +95,7 @@ describeComponent('mail_view/ui/mail_view', function () {
expect(newTagInputComponent.attr('style').trim()).not.toEqual('display: none;');
});
- it('hides new tag button when pressing esc key', function(){
+ it('hides new tag input when pressing esc key', function(){
this.component.displayMail({}, testData);
this.component.select('newTagButton').click();