IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-25 10:20:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

UX: use solid envelope icon for consistency (#19157)

Browse Source
This commit is contained in:
Kris 2022-11-22 19:46:35 -05:00 committed by GitHub
parent b0f380c4c7
commit d6ddb337c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/admin/addon/templates/user-index.hbs
View File

@ -38,7 +38,7 @@
{{#if this.model.email}} {{#if this.model.email}}
<a href="mailto:{{this.model.email}}">{{this.model.email}}</a> <a href="mailto:{{this.model.email}}">{{this.model.email}}</a>
{{else}} {{else}}
<DButton @class="btn-default" @action={{route-action "checkEmail"}} @actionParam={{this.model}} @icon="far-envelope" @label="admin.users.check_email.text" @title="admin.users.check_email.title" /> <DButton @class="btn-default" @action={{route-action "checkEmail"}} @actionParam={{this.model}} @icon="envelope" @label="admin.users.check_email.text" @title="admin.users.check_email.title" />
{{/if}} {{/if}}
</div> </div>
<div class="controls"> <div class="controls">
@ -65,7 +65,7 @@
{{i18n "user.email.no_secondary"}} {{i18n "user.email.no_secondary"}}
{{/if}} {{/if}}
{{else}} {{else}}
<DButton @action={{route-action "checkEmail"}} @class="btn-default" @actionParam={{this.model}} @icon="far-envelope" @label="admin.users.check_email.text" @title="admin.users.check_email.title" /> <DButton @action={{route-action "checkEmail"}} @class="btn-default" @actionParam={{this.model}} @icon="envelope" @label="admin.users.check_email.text" @title="admin.users.check_email.title" />
{{/if}} {{/if}}
</div> </div>
@ -99,7 +99,7 @@
{{#if this.associatedAccountsLoaded}} {{#if this.associatedAccountsLoaded}}
{{this.associatedAccounts}} {{this.associatedAccounts}}
{{else}} {{else}}
<DButton @class="btn-default" @action={{route-action "checkEmail"}} @actionParam={{this.model}} @icon="far-envelope" @label="admin.users.check_email.text" @title="admin.users.check_email.title" /> <DButton @class="btn-default" @action={{route-action "checkEmail"}} @actionParam={{this.model}} @icon="envelope" @label="admin.users.check_email.text" @title="admin.users.check_email.title" />
{{/if}} {{/if}}
</div> </div>
</div> </div>
@ -561,7 +561,7 @@
{{#if this.ssoExternalEmail}} {{#if this.ssoExternalEmail}}
<div class="value">{{this.ssoExternalEmail}}</div> <div class="value">{{this.ssoExternalEmail}}</div>
{{else}} {{else}}
<DButton @class="btn-default" @action={{action "checkSsoEmail"}} @actionParam={{this.model}} @icon="far-envelope" @label="admin.users.check_email.text" @title="admin.users.check_email.title" /> <DButton @class="btn-default" @action={{action "checkSsoEmail"}} @actionParam={{this.model}} @icon="envelope" @label="admin.users.check_email.text" @title="admin.users.check_email.title" />
{{/if}} {{/if}}
</div> </div>
{{/if}} {{/if}}

4
app/assets/javascripts/discourse-common/addon/lib/icon-library.js
View File

@ -34,8 +34,8 @@ const REPLACEMENTS = {
"notification.liked_2": "heart", "notification.liked_2": "heart",
"notification.liked_many": "heart", "notification.liked_many": "heart",
"notification.liked_consolidated": "heart", "notification.liked_consolidated": "heart",
"notification.private_message": "far-envelope", "notification.private_message": "envelope",
"notification.invited_to_private_message": "far-envelope", "notification.invited_to_private_message": "envelope",
"notification.invited_to_topic": "hand-point-right", "notification.invited_to_topic": "hand-point-right",
"notification.invitee_accepted": "user", "notification.invitee_accepted": "user",
"notification.moved_post": "sign-out-alt", "notification.moved_post": "sign-out-alt",

2
app/assets/javascripts/discourse/app/components/user-nav.hbs
View File

@ -28,7 +28,7 @@
{{#if @showPrivateMessages}} {{#if @showPrivateMessages}}
<li class="private-messages"> <li class="private-messages">
<LinkTo @route="userPrivateMessages"> <LinkTo @route="userPrivateMessages">
{{d-icon "far-envelope"}} {{d-icon "envelope"}}
<span>{{i18n "user.private_messages"}}</span> <span>{{i18n "user.private_messages"}}</span>
</LinkTo> </LinkTo>
</li> </li>

2
app/assets/javascripts/discourse/app/templates/about.hbs
View File

@ -120,7 +120,7 @@
{{#if this.contactInfo}} {{#if this.contactInfo}}
<section class="about contact"> <section class="about contact">
<h3>{{d-icon "far-envelope"}} {{i18n "about.contact"}}</h3> <h3>{{d-icon "envelope"}} {{i18n "about.contact"}}</h3>
<p>{{html-safe this.contactInfo}}</p> <p>{{html-safe this.contactInfo}}</p>
</section> </section>
{{/if}} {{/if}}

2
app/assets/javascripts/discourse/app/templates/components/edit-category-settings.hbs
View File

@ -229,7 +229,7 @@
{{#if this.emailInEnabled}} {{#if this.emailInEnabled}}
<section class="field category-email-in"> <section class="field category-email-in">
<label for="category-email-in"> <label for="category-email-in">
{{d-icon "far-envelope"}} {{d-icon "envelope"}}
{{i18n "category.email_in"}} {{i18n "category.email_in"}}
</label> </label>
<TextField @id="category-email-in" @class="email-in" @value={{this.category.email_in}} /> <TextField @id="category-email-in" @class="email-in" @value={{this.category.email_in}} />

2
app/assets/javascripts/discourse/app/templates/components/reviewable-queued-post.hbs
View File

@ -7,7 +7,7 @@
<ReviewableTags @tags={{this.reviewable.payload.tags}} @tagName="" /> <ReviewableTags @tags={{this.reviewable.payload.tags}} @tagName="" />
{{#if this.reviewable.payload.via_email}} {{#if this.reviewable.payload.via_email}}
<a href {{on "click" this.showRawEmail}} class="show-raw-email"> <a href {{on "click" this.showRawEmail}} class="show-raw-email">
{{d-icon "far-envelope" title="post.via_email"}} {{d-icon "envelope" title="post.via_email"}}
</a> </a>
{{/if}} {{/if}}
</ReviewableTopicLink> </ReviewableTopicLink>

2
app/assets/javascripts/discourse/app/templates/components/tag-list.hbs
View File

@ -9,7 +9,7 @@
{{/if}} {{/if}}
{{#each this.sortedTags as |tag|}} {{#each this.sortedTags as |tag|}}
<div class="tag-box"> <div class="tag-box">
{{discourse-tag tag.id description=tag.description isPrivateMessage=this.isPrivateMessage pmOnly=tag.pmOnly tagsForUser=this.tagsForUser}} {{#if tag.pmOnly}}{{d-icon "far-envelope"}}{{/if}}{{#if tag.totalCount}} <span class="tag-count">x {{tag.totalCount}}</span>{{/if}} {{discourse-tag tag.id description=tag.description isPrivateMessage=this.isPrivateMessage pmOnly=tag.pmOnly tagsForUser=this.tagsForUser}} {{#if tag.pmOnly}}{{d-icon "envelope"}}{{/if}}{{#if tag.totalCount}} <span class="tag-count">x {{tag.totalCount}}</span>{{/if}}
</div> </div>
{{/each}} {{/each}}
<div class="clearfix"></div> <div class="clearfix"></div>

4
app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs
View File

@ -196,11 +196,11 @@
{{/if}} {{/if}}
{{#if this.showCheckEmail}} {{#if this.showCheckEmail}}
<h3 class="email"> <h3 class="email">
{{d-icon "far-envelope" title="user.email.title"}} {{d-icon "envelope" title="user.email.title"}}
{{#if this.user.email}} {{#if this.user.email}}
{{this.user.email}} {{this.user.email}}
{{else}} {{else}}
<DButton @action={{action "checkEmail"}} @actionParam={{this.user}} @icon="far-envelope" @label="admin.users.check_email.text" @class="btn-primary" /> <DButton @action={{action "checkEmail"}} @actionParam={{this.user}} @icon="envelope" @label="admin.users.check_email.text" @class="btn-primary" />
{{/if}} {{/if}}
</h3> </h3>
{{/if}} {{/if}}

4
app/assets/javascripts/discourse/app/templates/preferences/account.hbs
View File

@ -83,7 +83,7 @@
</div> </div>
{{else}} {{else}}
<div class="controls"> <div class="controls">
<DButton @action={{route-action "checkEmail"}} @class="btn-default" @actionParam={{this.model}} @title="admin.users.check_email.title" @icon="far-envelope" @label="admin.users.check_email.text" /> <DButton @action={{route-action "checkEmail"}} @class="btn-default" @actionParam={{this.model}} @title="admin.users.check_email.title" @icon="envelope" @label="admin.users.check_email.text" />
</div> </div>
{{/if}} {{/if}}
</div> </div>
@ -123,7 +123,7 @@
</table> </table>
{{else}} {{else}}
<div class="controls"> <div class="controls">
<DButton @action={{route-action "checkEmail"}} @actionParam={{this.model}} @title="admin.users.check_email.title" @icon="far-envelope" @label="admin.users.check_email.text" /> <DButton @action={{route-action "checkEmail"}} @actionParam={{this.model}} @title="admin.users.check_email.title" @icon="envelope" @label="admin.users.check_email.text" />
</div> </div>
{{/if}} {{/if}}
</div> </div>

4
app/assets/javascripts/discourse/app/templates/user.hbs
View File

@ -199,7 +199,7 @@
{{#if this.model.email}} {{#if this.model.email}}
{{this.model.email}} {{this.model.email}}
{{else}} {{else}}
<DButton @action={{route-action "checkEmail"}} @actionParam={{this.model}} @icon="far-envelope" @label="admin.users.check_email.text" @class="btn-primary" /> <DButton @action={{route-action "checkEmail"}} @actionParam={{this.model}} @icon="envelope" @label="admin.users.check_email.text" @class="btn-primary" />
{{/if}} {{/if}}
</dd> </dd>
</div> </div>
@ -263,7 +263,7 @@
{{/if}} {{/if}}
{{#if this.showPrivateMessages}} {{#if this.showPrivateMessages}}
<li class="private-messages"><LinkTo @route="userPrivateMessages">{{d-icon "far-envelope"}}{{i18n 'user.private_messages'}}</LinkTo></li> <li class="private-messages"><LinkTo @route="userPrivateMessages">{{d-icon "envelope"}}{{i18n 'user.private_messages'}}</LinkTo></li>
{{/if}} {{/if}}
{{#if this.canInviteToForum}} {{#if this.canInviteToForum}}

2
app/assets/stylesheets/common/base/menu-panel.scss
View File

@ -504,7 +504,7 @@
} }
} }
.is-warning { .is-warning {
.d-icon-far-envelope { .d-icon-envelope {
color: var(--danger); color: var(--danger);
} }
} }

4
plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/user-about.hbs
View File

@ -142,7 +142,7 @@
<dt class="trust-level">{{i18n "user.trust_level"}}</dt><dd class="trust-level">{{this.dummy.user.trustLevel.name}}</dd> <dt class="trust-level">{{i18n "user.trust_level"}}</dt><dd class="trust-level">{{this.dummy.user.trustLevel.name}}</dd>
<dt>{{i18n "user.email.title"}}</dt> <dt>{{i18n "user.email.title"}}</dt>
<dd title={{this.dummy.user.email}}> <dd title={{this.dummy.user.email}}>
<DButton @icon="far-envelope" @label="admin.users.check_email.text" @class="btn-primary" /> <DButton @icon="envelope" @label="admin.users.check_email.text" @class="btn-primary" />
</dd> </dd>
<dt class="groups">{{i18n "groups.title" count=this.dummy.user.displayGroups.length}}</dt> <dt class="groups">{{i18n "groups.title" count=this.dummy.user.displayGroups.length}}</dt>
<dd class="groups"> <dd class="groups">
@ -237,7 +237,7 @@
<dt class="trust-level">{{i18n "user.trust_level"}}</dt><dd class="trust-level">{{this.dummy.user.trustLevel.name}}</dd> <dt class="trust-level">{{i18n "user.trust_level"}}</dt><dd class="trust-level">{{this.dummy.user.trustLevel.name}}</dd>
<dt>{{i18n "user.email.title"}}</dt> <dt>{{i18n "user.email.title"}}</dt>
<dd title={{this.dummy.user.email}}> <dd title={{this.dummy.user.email}}>
<DButton @icon="far-envelope" @label="admin.users.check_email.text" @class="btn-primary" /> <DButton @icon="envelope" @label="admin.users.check_email.text" @class="btn-primary" />
</dd> </dd>
<dt class="groups">{{i18n "groups.title" count=this.dummy.user.displayGroups.length}}</dt> <dt class="groups">{{i18n "groups.title" count=this.dummy.user.displayGroups.length}}</dt>
<dd class="groups"> <dd class="groups">