From 7792b7da48493879e167c259f62f40655676a3af Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Wed, 10 Jul 2013 17:05:55 -0400
Subject: [PATCH] Use the solid envelope icon. Font-awesome swapped
icon-envelope and icon-envelope-alt.
---
app/assets/javascripts/admin/templates/dashboard.js.handlebars | 2 +-
app/assets/javascripts/admin/templates/user.js.handlebars | 2 +-
app/assets/javascripts/discourse/models/share_link.js | 2 +-
app/assets/javascripts/discourse/models/user_action.js | 2 +-
.../templates/topic_summary/private_message.js.handlebars | 2 +-
.../javascripts/discourse/templates/user/activity.js.handlebars | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/app/assets/javascripts/admin/templates/dashboard.js.handlebars b/app/assets/javascripts/admin/templates/dashboard.js.handlebars
index d58362cc6..e955c16c9 100644
--- a/app/assets/javascripts/admin/templates/dashboard.js.handlebars
+++ b/app/assets/javascripts/admin/templates/dashboard.js.handlebars
@@ -163,7 +163,7 @@
<table class="table table-condensed table-hover">
<thead>
<tr>
- <th class="title" title="{{i18n admin.dashboard.private_messages_title}}"><i class="icon icon-envelope-alt"></i> {{i18n admin.dashboard.private_messages_short}}</th>
+ <th class="title" title="{{i18n admin.dashboard.private_messages_title}}"><i class="icon icon-envelope"></i> {{i18n admin.dashboard.private_messages_short}}</th>
<th>{{i18n admin.dashboard.reports.today}}</th>
<th>{{i18n admin.dashboard.reports.yesterday}}</th>
<th>{{i18n admin.dashboard.reports.last_7_days}}</th>
diff --git a/app/assets/javascripts/admin/templates/user.js.handlebars b/app/assets/javascripts/admin/templates/user.js.handlebars
index 60db63a60..e01e64020 100644
--- a/app/assets/javascripts/admin/templates/user.js.handlebars
+++ b/app/assets/javascripts/admin/templates/user.js.handlebars
@@ -109,7 +109,7 @@
{{else}}
{{#if can_send_activation_email}}
<button class='btn' {{action sendActivationEmail target="content"}}>
- <i class='icon icon-envelope-alt'></i>
+ <i class='icon icon-envelope'></i>
{{i18n admin.user.send_activation_email}}
</button>
{{/if}}
diff --git a/app/assets/javascripts/discourse/models/share_link.js b/app/assets/javascripts/discourse/models/share_link.js
index 95dcbaf62..f47e1df63 100644
--- a/app/assets/javascripts/discourse/models/share_link.js
+++ b/app/assets/javascripts/discourse/models/share_link.js
@@ -64,7 +64,7 @@ Discourse.ShareLink.reopenClass({
twitter: 'icon-twitter',
facebook: 'icon-facebook-sign',
'google+': 'icon-google-plus',
- email: 'icon-envelope-alt'
+ email: 'icon-envelope'
},
popupHeights: {
diff --git a/app/assets/javascripts/discourse/models/user_action.js b/app/assets/javascripts/discourse/models/user_action.js
index 66b206c23..246a278b0 100644
--- a/app/assets/javascripts/discourse/models/user_action.js
+++ b/app/assets/javascripts/discourse/models/user_action.js
@@ -18,7 +18,7 @@ Discourse.UserAction = Discourse.Model.extend({
if (action === null || actions.indexOf(action) >= 0) {
if (this.get('isPM')) {
- icon = '<i class="icon icon-envelope-alt" title="{{i18n user.stream.private_message}}"></i>';
+ icon = '<i class="icon icon-envelope" title="{{i18n user.stream.private_message}}"></i>';
if (sameUser) {
sentence = I18n.t('user_action.sent_by_you', { userUrl: this.get('userUrl') });
} else {
diff --git a/app/assets/javascripts/discourse/templates/topic_summary/private_message.js.handlebars b/app/assets/javascripts/discourse/templates/topic_summary/private_message.js.handlebars
index 8de464e3d..3faa96caf 100644
--- a/app/assets/javascripts/discourse/templates/topic_summary/private_message.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/topic_summary/private_message.js.handlebars
@@ -1,4 +1,4 @@
-<h3><i class='icon icon-envelope-alt'></i> {{i18n private_message_info.title}}</h3>
+<h3><i class='icon icon-envelope'></i> {{i18n private_message_info.title}}</h3>
<div class='participants clearfix'>
{{#each details.allowed_groups}}
<div class='user group'>
diff --git a/app/assets/javascripts/discourse/templates/user/activity.js.handlebars b/app/assets/javascripts/discourse/templates/user/activity.js.handlebars
index 4eb42acce..6daa7894f 100644
--- a/app/assets/javascripts/discourse/templates/user/activity.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/user/activity.js.handlebars
@@ -7,7 +7,7 @@
<br/>
{{#if can_send_private_message_to_user}}
<button class='btn create' {{action composePrivateMessage}}>
- <i class='icon icon-envelope-alt'></i>
+ <i class='icon icon-envelope'></i>
{{i18n user.private_message}}
</button>
{{/if}}