From a604c6393d237fc2cd3c7fac20f6a53ebb65cea9 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Fri, 15 Jul 2016 12:01:30 +0800
Subject: [PATCH] UX: Add icon to dismiss notifications button.

---
 .../discourse/templates/user/notifications.hbs            | 8 +++++---
 app/assets/stylesheets/common/base/user.scss              | 4 ----
 app/assets/stylesheets/mobile/user.scss                   | 4 ----
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/user/notifications.hbs b/app/assets/javascripts/discourse/templates/user/notifications.hbs
index e85294ea617..766c7f7eadb 100644
--- a/app/assets/javascripts/discourse/templates/user/notifications.hbs
+++ b/app/assets/javascripts/discourse/templates/user/notifications.hbs
@@ -19,9 +19,11 @@
   {{/mobile-nav}}
 
   {{#if model}}
-    <div class='notification-buttons'>
-      <button title="{{i18n 'user.dismiss_notifications_tooltip'}}" id='dismiss-notifications-top' class='btn notifications-read' {{action "resetNew"}}>{{i18n 'user.dismiss_notifications'}}</button>
-    </div>
+    {{d-button title='user.dismiss_notifications_tooltip'
+               class='btn dismiss-notifications'
+               action="resetNew"
+               label='user.dismiss_notifications'
+               icon='times'}}
   {{/if}}
 </section>
 
diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss
index c1870eb958e..91316490cae 100644
--- a/app/assets/stylesheets/common/base/user.scss
+++ b/app/assets/stylesheets/common/base/user.scss
@@ -57,10 +57,6 @@
   display: none;
 }
 
-.notification-buttons {
-  margin: 10px 0;
-}
-
 .user-navigation {
 
   .map {
diff --git a/app/assets/stylesheets/mobile/user.scss b/app/assets/stylesheets/mobile/user.scss
index 304a8bffdc3..6a559260b52 100644
--- a/app/assets/stylesheets/mobile/user.scss
+++ b/app/assets/stylesheets/mobile/user.scss
@@ -590,10 +590,6 @@
   display: inline-block;
 }
 
-.notification-buttons {
-  display: inline-block;
-}
-
 // mobile fixups for badges
 
 .badge-card.medium {