IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

UX: Use the full word "cancel" on desktop composer, "X" on mobile.

Browse Source
This commit is contained in:
Kris 2018-03-12 22:31:02 -04:00
parent 2ad2ed2eb2
commit 64e30d799e
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,8 +104,11 @@
icon=model.saveIcon icon=model.saveIcon
label=model.saveLabel label=model.saveLabel
disableSubmit=disableSubmit}} disableSubmit=disableSubmit}}
{{#if site.mobileView}}
<a href {{action "cancel"}} class='cancel' tabindex="6" title="{{i18n 'cancel'}}">{{d-icon "times"}}</a> <a href {{action "cancel"}} class='cancel' tabindex="6" title="{{i18n 'cancel'}}">{{d-icon "times"}}</a>
{{else}}
<a href {{action "cancel"}} class='cancel' tabindex="6" >{{i18n 'cancel'}}</a>
{{/if}}
{{#if site.mobileView}} {{#if site.mobileView}}
{{#if whisperOrUnlistTopic}} {{#if whisperOrUnlistTopic}}

5
app/assets/stylesheets/common/base/compose.scss
View File

@ -260,10 +260,9 @@
flex: 0 0 auto; flex: 0 0 auto;
} }
.cancel { .cancel {
margin-left: .65em; margin-left: 1.25em;
font-size: 1.75em;
line-height: normal; line-height: normal;
color: $primary-low-mid; color: $primary-high;
transition: color 250ms; transition: color 250ms;
&:hover { &:hover {
color: $danger; color: $danger;

5
app/assets/stylesheets/mobile/compose.scss
View File

@ -67,6 +67,11 @@
#file-uploading { #file-uploading {
margin-left: 15px; margin-left: 15px;
} }
.cancel {
font-size: 1.75em;
color: $primary-low-mid;
margin-left: .65em;
}
} }
.composer-bottom-right { .composer-bottom-right {
margin-left: auto; margin-left: auto;