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

UX: puts more emphasis on the shared url on share panel (#7055)

This commit is contained in:
Joffrey JAFFEUX 2019-02-22 23:22:11 +01:00 committed by GitHub
parent 260398d706
commit 87f4ee13ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/components/share-panel.js.es6
View File

@ -27,12 +27,12 @@ export default Ember.Component.extend({
topicTitle = escapeExpression(topicTitle); topicTitle = escapeExpression(topicTitle);
if (type === "topic") { if (type === "topic") {
return I18n.t("share.topic", { topicTitle }); return I18n.t("share.topic_html", { topicTitle });
} }
if (postNumber) { if (postNumber) {
return I18n.t("share.post", { postNumber, postDate }); return I18n.t("share.post_html", { postNumber, postDate });
} }
return I18n.t("share.topic", { topicTitle }); return I18n.t("share.topic_html", { topicTitle });
}, },
@computed("panel.model.shareUrl", "topic.shareUrl") @computed("panel.model.shareUrl", "topic.shareUrl")

2
app/assets/javascripts/discourse/templates/components/share-panel.hbs
View File

@ -3,7 +3,7 @@
</div> </div>
<div class="body"> <div class="body">
{{input value=shareUrl class="topic-share-url"}} {{textarea value=shareUrl class="topic-share-url"}}
<div class="topic-share-url-for-touch"><a></a></div> <div class="topic-share-url-for-touch"><a></a></div>
<div class="sources"> <div class="sources">

6
app/assets/stylesheets/common/base/modal.scss
View File

@ -646,11 +646,7 @@
background: $danger; background: $danger;
&.single-tab { &.single-tab {
color: $primary; display: none;
background: none;
padding: s(1 0);
font-weight: 700;
font-size: $font-up-3;
} }
} }
} }

16
app/assets/stylesheets/common/components/share-and-invite-modal.scss
View File

@ -14,6 +14,11 @@
font-size: $font-0; font-size: $font-0;
font-weight: normal; font-weight: normal;
margin-bottom: s(2); margin-bottom: s(2);
.post-date {
color: $primary-medium;
font-size: $font-down-1;
}
} }
} }
@ -23,12 +28,15 @@
.topic-share-url { .topic-share-url {
width: 100%; width: 100%;
height: auto;
box-sizing: border-box;
} }
.topic-share-url-for-touch { .topic-share-url-for-touch {
width: 290px; a {
word-break: break-all;
@extend .overflow-ellipsis; font-size: $font-up-1;
}
} }
.topic-share-url-for-touch, .topic-share-url-for-touch,
@ -43,7 +51,7 @@
flex-direction: row; flex-direction: row;
.social-link { .social-link {
font-size: $font-up-4; font-size: $font-up-6;
margin-right: s(2); margin-right: s(2);
} }
} }

4
config/locales/client.en.yml
View File

@ -135,8 +135,8 @@ en:
next_month: "Next Month" next_month: "Next Month"
placeholder: date placeholder: date
share: share:
topic: "<b>Topic</b>: %{topicTitle}" topic_html: 'Topic: <span class="topic-title">%{topicTitle}</span>'
post: "<b>Post #%{postNumber}</b>, %{postDate}" post_html: '<span class="post-number">Post #%{postNumber}</span>, <span class="post-date">%{postDate}</span>'
close: "close" close: "close"
twitter: "Share this link on Twitter" twitter: "Share this link on Twitter"
facebook: "Share this link on Facebook" facebook: "Share this link on Facebook"