diff --git a/config.json b/config.json index 47a449cd..014ef3e5 100644 --- a/config.json +++ b/config.json @@ -14,6 +14,7 @@ "mixins/sidebar", "mixins/anime-grid", "mixins/feature-card", + "mixins/comments", "reset", "base", "typography", diff --git a/mixins/Comments.pixy b/mixins/Comments.pixy index 5f4180bd..b2467572 100644 --- a/mixins/Comments.pixy +++ b/mixins/Comments.pixy @@ -8,14 +8,14 @@ component Comments(parent arn.PostParent, user *arn.User) Postable(post.ToPostable(), user, "", "") if user != nil - if parent.IsLocked() + if arn.IsLocked(parent) footer.footer.mountable p.text-center= "This " + strings.ToLower(reflect.TypeOf(parent).Elem().Name()) + " is locked." else NewPostArea(user, "Comment") .buttons - if !parent.IsLocked() + if !arn.IsLocked(parent) button.mountable.action(data-action="createPost", data-trigger="click", data-parent-type=reflect.TypeOf(parent).Elem().Name(), data-parent-id=parent.GetID()) Icon("mail-reply") span Reply \ No newline at end of file diff --git a/pages/anime/comments.scarlet b/pages/anime/comments.scarlet index 7a31f440..888b6f68 100644 --- a/pages/anime/comments.scarlet +++ b/pages/anime/comments.scarlet @@ -1,7 +1,3 @@ .anime-comments [data-standalone-page="false"] - margin-top 1rem - - .thread - max-width 600px - justify-content flex-start \ No newline at end of file + comments-left \ No newline at end of file diff --git a/pages/character/character.pixy b/pages/character/character.pixy index 0cfe63e9..ce8e58a0 100644 --- a/pages/character/character.pixy +++ b/pages/character/character.pixy @@ -60,6 +60,12 @@ component CharacterDetails(character *arn.Character, characterAnime []*arn.Anime if mainQuote == nil || quote.ID != mainQuote.ID Quote(quote, user) + .character-section + h3.character-section-name.mountable Comments + + .character-comments + Comments(character, user) + CharacterSidebar(character, friends, relevantCharacters, user) component CharacterSidebar(character *arn.Character, friends []*arn.User, relevantCharacters []*arn.Character, user *arn.User) diff --git a/pages/character/character.scarlet b/pages/character/character.scarlet index 8c5bba36..b1c90dba 100644 --- a/pages/character/character.scarlet +++ b/pages/character/character.scarlet @@ -75,6 +75,9 @@ .character-section-name font-weight bold +.character-comments + comments-left + > 1250px .character-page horizontal diff --git a/styles/mixins/comments.scarlet b/styles/mixins/comments.scarlet new file mode 100644 index 00000000..a85c5790 --- /dev/null +++ b/styles/mixins/comments.scarlet @@ -0,0 +1,6 @@ +mixin comments-left + margin-top 1rem + + .thread + max-width 600px + justify-content flex-start \ No newline at end of file