diff --git a/mixins/Comments.pixy b/mixins/Comments.pixy index efab4454..c2142a19 100644 --- a/mixins/Comments.pixy +++ b/mixins/Comments.pixy @@ -1,15 +1,14 @@ component Comments(parent arn.PostParent, user *arn.User) - .thread - .posts - if user != nil - if arn.IsLocked(parent) - footer.footer.mountable - p.text-center= "This " + strings.ToLower(reflect.TypeOf(parent).Elem().Name()) + " is locked." - else if parent.TypeName() != "Group" || parent.(*arn.Group).FindMember(user.ID) != nil - NewPostArea(parent, user, "Comment") - - //- if parent.CountPosts() == 0 - //- p.no-data.mountable No comments have been written yet. - //- else - each post in parent.PostsRelevantFirst(5) - Postable(post, user, true, "", "") \ No newline at end of file + .posts + if user != nil + if arn.IsLocked(parent) + footer.footer.mountable + p.text-center= "This " + strings.ToLower(reflect.TypeOf(parent).Elem().Name()) + " is locked." + else if parent.TypeName() != "Group" || parent.(*arn.Group).FindMember(user.ID) != nil + NewPostArea(parent, user, "Comment") + + //- if parent.CountPosts() == 0 + //- p.no-data.mountable No comments have been written yet. + //- else + each post in parent.PostsRelevantFirst(5) + Postable(post, user, true, "", "") \ No newline at end of file diff --git a/pages/activity/activity.scarlet b/pages/activity/activity.scarlet index 194d72b6..6c2ebdbe 100644 --- a/pages/activity/activity.scarlet +++ b/pages/activity/activity.scarlet @@ -1,7 +1,7 @@ .activities vertical width 100% - max-width forum-width + max-width activity-width margin 0 auto .activity diff --git a/pages/anime/comments.scarlet b/pages/anime/comments.scarlet index 888b6f68..5e18a207 100644 --- a/pages/anime/comments.scarlet +++ b/pages/anime/comments.scarlet @@ -1,3 +1,5 @@ .anime-comments - [data-standalone-page="false"] - comments-left \ No newline at end of file + comments-left + + [data-standalone-page="true"] + margin 0 auto \ No newline at end of file diff --git a/pages/forum/forum.scarlet b/pages/forum/forum.scarlet index a91ec9c9..eb5fa36f 100644 --- a/pages/forum/forum.scarlet +++ b/pages/forum/forum.scarlet @@ -6,6 +6,9 @@ width 100% max-width forum-width + .posts + max-width forum-post-width + > 1250px .page-main-action position fixed diff --git a/pages/group/group.scarlet b/pages/group/group.scarlet index eb5b17f1..a215a96f 100644 --- a/pages/group/group.scarlet +++ b/pages/group/group.scarlet @@ -1,11 +1,11 @@ .group-view vertical width 100% - max-width 540px + max-width group-post-width margin 0 auto .group-feed - flex 1 + // ... .group-avatar-container display flex diff --git a/pages/thread/thread.scarlet b/pages/thread/thread.scarlet index b0759dba..0e836b6b 100644 --- a/pages/thread/thread.scarlet +++ b/pages/thread/thread.scarlet @@ -1,11 +1,10 @@ .thread - horizontal - justify-content center + max-width forum-thread-width + margin 0 auto .posts vertical width 100% - max-width forum-width .post vertical diff --git a/styles/forum.scarlet b/styles/forum.scarlet index 0d800e6a..ef7f6fbe 100644 --- a/styles/forum.scarlet +++ b/styles/forum.scarlet @@ -41,6 +41,9 @@ post-content-padding-y = 0.75rem img max-width 100% + max-height 450px + width 100% + object-fit cover :hover .post-toolbar @@ -78,7 +81,7 @@ post-content-padding-y = 0.75rem horizontal justify-content center align-items flex-start - margin-right 0.5rem + margin-right post-avatar-text-margin .new-post-actions justify-content flex-end @@ -87,12 +90,18 @@ post-content-padding-y = 0.75rem transform translateY(-50%) transition all transition-speed ease + button + pointer-events none + .new-post-actions-enabled opacity 1 height auto margin-bottom 0.75rem transform translateY(0) + button + pointer-events all + // Toolbar .post-toolbar diff --git a/styles/include/config.scarlet b/styles/include/config.scarlet index 3d8720ee..a7545709 100644 --- a/styles/include/config.scarlet +++ b/styles/include/config.scarlet @@ -64,8 +64,13 @@ sidebar-background = rgba(0, 0, 0, 0.03) sidebar-opaque-background = ui-background // Forum -forum-width = 830px post-highlight-color = rgba(248, 165, 130, 0.7) +const forum-width = 830px +const forum-thread-width = forum-width +const comment-width = 560px +const activity-width = comment-width +const group-post-width = comment-width +const post-avatar-text-margin = 0.5rem // Avatar avatar-size = 50px diff --git a/styles/mixins/comments.scarlet b/styles/mixins/comments.scarlet index a85c5790..4ed10a3a 100644 --- a/styles/mixins/comments.scarlet +++ b/styles/mixins/comments.scarlet @@ -1,6 +1,4 @@ mixin comments-left margin-top 1rem - - .thread - max-width 600px - justify-content flex-start \ No newline at end of file + max-width comment-width + justify-content flex-start \ No newline at end of file