From df0637b62ca65c32be1d97ca1ca5893638384571 Mon Sep 17 00:00:00 2001 From: rob Date: Fri, 22 Jul 2022 16:17:25 -0400 Subject: [PATCH] UI updates --- app/views/comment/components/composer.pug | 8 +++---- app/views/page/view.pug | 2 +- app/views/post/view.pug | 29 +++++++++++++---------- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/app/views/comment/components/composer.pug b/app/views/comment/components/composer.pug index 2513657..c034de7 100644 --- a/app/views/comment/components/composer.pug +++ b/app/views/comment/components/composer.pug @@ -4,7 +4,7 @@ mixin renderCommentComposer (actionUrl, options = { }) if options.replyTo input(type="hidden", name="replyTo", value= options.replyTo) - .uk-card.uk-card-secondary.uk-card-small + .uk-card.uk-card-default.uk-card-small .uk-card-body textarea( id="content", @@ -28,7 +28,7 @@ mixin renderCommentComposer (actionUrl, options = { }) data-target-element="content", title="Add an emoji", onclick="return dtp.app.showEmojiPicker(event);", - ).uk-button.dtp-button-default + ).uk-button.uk-button-default span i.far.fa-smile li(title="Not Safe For Work will hide your comment text by default") @@ -38,6 +38,6 @@ mixin renderCommentComposer (actionUrl, options = { }) if options.showCancel .uk-width-auto - button(type="submit").uk-button.dtp-button-secondary Cancel + button(type="submit").uk-button.uk-button-secondary Cancel .uk-width-auto - button(type="submit").uk-button.dtp-button-primary Post \ No newline at end of file + button(type="submit").uk-button.uk-button-primary Post \ No newline at end of file diff --git a/app/views/page/view.pug b/app/views/page/view.pug index 81b04f6..f0438fc 100644 --- a/app/views/page/view.pug +++ b/app/views/page/view.pug @@ -3,7 +3,7 @@ block content include ../components/page-sidebar - article(dtp-page-id= page._id) + article(dtp-page-id= page._id).content-block .uk-margin div(uk-grid) .uk-width-expand diff --git a/app/views/post/view.pug b/app/views/post/view.pug index 5595e75..c8e714f 100644 --- a/app/views/post/view.pug +++ b/app/views/post/view.pug @@ -14,7 +14,7 @@ block content include components/author-credit - article(dtp-post-id= post._id) + article(dtp-post-id= post._id).content-block .uk-margin h1.article-title= post.title @@ -52,26 +52,29 @@ block content .uk-margin .uk-article-meta This post was updated on #{moment(post.updated).format('MMMM DD, YYYY, [at] hh:mm a')}. + .content-block .uk-margin - h4 Post author - +renderPostAuthorCredit(post.author) + +renderSectionTitle('Post author') + +renderPostAuthorCredit(post.author) if user && post.flags.enableComments && user.permissions.canComment - +renderSectionTitle('Add a comment') - - .uk-margin - +renderCommentComposer(`/post/${post._id}/comment`) + .content-block + .uk-margin + +renderSectionTitle('Add a comment') + .uk-margin-small + +renderCommentComposer(`/post/${post._id}/comment`) + .uk-text-small.uk-text-muted Each site has it's own #[a(href='/policy/terms-of-service') Terms of Service]. Please read it before commenting. if featuredComment - #featured-comment.uk-margin-large - .uk-margin - +renderSectionTitle('Linked Comment') - +renderComment(featuredComment) + .content-block + #featured-comment.uk-margin-large + .uk-margin + +renderSectionTitle('Linked Comment') + +renderComment(featuredComment) - .uk-margin + .content-block +renderSectionTitle('Comments') - .uk-margin if Array.isArray(comments) && (comments.length > 0) ul#post-comment-list.uk-list.uk-list-divider.uk-list-large +renderCommentList(comments, { countPerPage, rootUrl: `/post/${post.slug}/comment` })