Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UX: PM title glyph alignment and consistency improvement (#11314) 

* UX: PM title glyph alignment should match public topic-status style

* minor fixes
This commit is contained in:
Kris 2020-11-22 20:16:41 -05:00 committed by GitHub
parent 28db835c4c
commit 855026eea1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/app/templates/components/private-message-glyph.hbs
View File

@ -5,9 +5,9 @@
{{d-icon "envelope" class="private-message-glyph"}} {{d-icon "envelope" class="private-message-glyph"}}
</span> </span>
</a> </a>
{{else}} {{~else}}
<span class="private-message-glyph-wrapper"> <span class="private-message-glyph-wrapper">
{{d-icon "envelope" class="private-message-glyph"}} {{d-icon "envelope" class="private-message-glyph"}}
</span> </span>
{{/if}} {{~/if}}
{{/if}} {{/if}}

5
app/assets/javascripts/discourse/app/templates/topic.hbs
View File

@ -17,7 +17,7 @@
{{#topic-title cancelled=(action "cancelEditingTopic") save=(action "finishedEditingTopic") model=model}} {{#topic-title cancelled=(action "cancelEditingTopic") save=(action "finishedEditingTopic") model=model}}
{{#if editingTopic}} {{#if editingTopic}}
<div class="edit-topic-title"> <div class="edit-topic-title">
{{private-message-glyph shouldShow=model.isPrivateMessage}} {{private-message-glyph shouldShow=model.isPrivateMessage tagName=""}}
{{text-field id="edit-title" value=buffered.title maxlength=siteSettings.max_topic_title_length autofocus="true"}} {{text-field id="edit-title" value=buffered.title maxlength=siteSettings.max_topic_title_length autofocus="true"}}
@ -65,9 +65,10 @@
href=pmPath href=pmPath
title="topic_statuses.personal_message.title" title="topic_statuses.personal_message.title"
ariaLabel="user.messages.inbox" ariaLabel="user.messages.inbox"
tagName=""
}} }}
{{else}} {{else}}
{{private-message-glyph shouldShow=model.isPrivateMessage}} {{private-message-glyph shouldShow=model.isPrivateMessage tagName=""}}
{{/if}} {{/if}}
{{/unless}} {{/unless}}

2
app/assets/stylesheets/common/base/discourse.scss
View File

@ -748,7 +748,7 @@ table {
display: inline-flex; display: inline-flex;
color: var(--primary-medium); color: var(--primary-medium);
.d-icon { .d-icon {
height: 0.76em; height: 0.74em;
width: 0.75em; width: 0.75em;
} }
&:not(:last-child) { &:not(:last-child) {

11
app/assets/stylesheets/common/base/topic.scss
View File

@ -114,7 +114,7 @@
display: inline-block; display: inline-block;
} }
.topic-statuses { .topic-statuses {
line-height: 1.2em; line-height: 1.2;
margin-right: 0.15em; margin-right: 0.15em;
&:empty { &:empty {
margin-right: 0; margin-right: 0;
@ -181,16 +181,13 @@ a.badge-category {
} }
.private-message-glyph { .private-message-glyph {
color: var(--primary-low-mid-or-secondary-high); color: var(--primary-medium);
height: 0.95em;
} }
.private-message-glyph-wrapper { .private-message-glyph-wrapper {
float: left; float: left;
margin-right: 0.25em;
.private-message-glyph {
margin: 0 5px 0 0;
display: inline-block;
}
} }
.private_message { .private_message {

4
app/assets/stylesheets/mobile/topic.scss
View File

@ -184,10 +184,6 @@ sub sub {
width: 100%; width: 100%;
margin-top: 0; margin-top: 0;
} }
.topic-statuses {
line-height: $line-height-small;
}
} }
// make mobile timeline top and bottom dates easier to select // make mobile timeline top and bottom dates easier to select