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

Revert "FIX: uses more semantically correct spans in post map (#6555)" 

This reverts commit 5cd055fd30.
This commit is contained in:
Joffrey JAFFEUX 2018-11-02 15:07:22 +01:00
parent 8067f8a32c
commit 4417faa7e5
3 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/assets/javascripts/discourse/widgets/topic-map.js.es6
View File

@ -86,7 +86,7 @@ createWidget("topic-map-summary", {
const contents = []; const contents = [];
contents.push( contents.push(
h("li", [ h("li", [
h("span.topic-map-post-heading", I18n.t("created_lowercase")), h("h4", I18n.t("created_lowercase")),
h("div.topic-map-post.created-at", [ h("div.topic-map-post.created-at", [
avatarFor("tiny", { avatarFor("tiny", {
username: attrs.createdByUsername, username: attrs.createdByUsername,
@ -101,7 +101,7 @@ createWidget("topic-map-summary", {
h( h(
"li", "li",
h("a", { attributes: { href: attrs.lastPostUrl } }, [ h("a", { attributes: { href: attrs.lastPostUrl } }, [
h("span.topic-map-post-heading", I18n.t("last_reply_lowercase")), h("h4", I18n.t("last_reply_lowercase")),
h("div.topic-map-post.last-reply", [ h("div.topic-map-post.last-reply", [
avatarFor("tiny", { avatarFor("tiny", {
username: attrs.lastPostUsername, username: attrs.lastPostUsername,
@ -116,19 +116,13 @@ createWidget("topic-map-summary", {
contents.push( contents.push(
h("li", [ h("li", [
numberNode(attrs.topicReplyCount), numberNode(attrs.topicReplyCount),
h( h("h4", I18n.t("replies_lowercase", { count: attrs.topicReplyCount }))
"span.topic-map-post-heading",
I18n.t("replies_lowercase", { count: attrs.topicReplyCount })
)
]) ])
); );
contents.push( contents.push(
h("li.secondary", [ h("li.secondary", [
numberNode(attrs.topicViews, { className: attrs.topicViewsHeat }), numberNode(attrs.topicViews, { className: attrs.topicViewsHeat }),
h( h("h4", I18n.t("views_lowercase", { count: attrs.topicViews }))
"span.topic-map-post-heading",
I18n.t("views_lowercase", { count: attrs.topicViews })
)
]) ])
); );
@ -136,10 +130,7 @@ createWidget("topic-map-summary", {
contents.push( contents.push(
h("li.secondary", [ h("li.secondary", [
numberNode(attrs.participantCount), numberNode(attrs.participantCount),
h( h("h4", I18n.t("users_lowercase", { count: attrs.participantCount }))
"span.topic-map-post-heading",
I18n.t("users_lowercase", { count: attrs.participantCount })
)
]) ])
); );
} }
@ -148,10 +139,7 @@ createWidget("topic-map-summary", {
contents.push( contents.push(
h("li.secondary", [ h("li.secondary", [
numberNode(attrs.topicLikeCount), numberNode(attrs.topicLikeCount),
h( h("h4", I18n.t("likes_lowercase", { count: attrs.topicLikeCount }))
"span.topic-map-post-heading",
I18n.t("likes_lowercase", { count: attrs.topicLikeCount })
)
]) ])
); );
} }
@ -160,10 +148,7 @@ createWidget("topic-map-summary", {
contents.push( contents.push(
h("li.secondary", [ h("li.secondary", [
numberNode(attrs.topicLinkLength), numberNode(attrs.topicLinkLength),
h( h("h4", I18n.t("links_lowercase", { count: attrs.topicLinkLength }))
"span.topic-map-post-heading",
I18n.t("links_lowercase", { count: attrs.topicLinkLength })
)
]) ])
); );
} }

3
app/assets/stylesheets/common/base/topic-post.scss
View File

@ -302,8 +302,7 @@ aside.quote {
font-size: $font-0; font-size: $font-0;
} }
.topic-map-post-heading { h4 {
display: block;
margin: 1px 0 2px 0; margin: 1px 0 2px 0;
color: dark-light-choose($primary-medium, $secondary-medium); color: dark-light-choose($primary-medium, $secondary-medium);
font-weight: normal; font-weight: normal;

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

@ -164,10 +164,10 @@ a.reply-to-tab {
} }
.topic-map { .topic-map {
.topic-map-post-heading { margin: 10px 0;
h4 {
line-height: $line-height-medium; line-height: $line-height-medium;
} }
.user { .user {
float: left; float: left;
margin-right: 10px; margin-right: 10px;