From dc70705b1e9d444cf7cd55fbeb29f723672c2e67 Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Wed, 9 Nov 2016 18:15:34 +0100 Subject: [PATCH] Don't show "Join the conversation" to demo users And minor style tweaks --- src/styles/_comments.sass | 31 +++++++------------ .../nodes/custom/comment/list_embed.jade | 18 ++++------- 2 files changed, 17 insertions(+), 32 deletions(-) diff --git a/src/styles/_comments.sass b/src/styles/_comments.sass index cc29723e..8dfd06c8 100644 --- a/src/styles/_comments.sass +++ b/src/styles/_comments.sass @@ -18,11 +18,8 @@ $comments-width-max: 710px #comments-list-header #comments-list-title padding: 15px 0 10px 0 - margin: 0 - font: - size: 1.5em - weight: 300 - family: $font-body + font-size: 1.3em + font-weight: 300 color: $color-text-dark-primary #comments-list-items-loading @@ -416,22 +413,16 @@ $comments-width-max: 710px border-color: $color-danger &.sign-in - textarea - margin: 0 + display: block + padding: 10px + border-radius: 3px + border: thin solid $color-background + background-color: rgba(white, .5) + color: $color-text-dark-primary + cursor: default - .sign-in - position: absolute - top: 0 - left: 0 - right: 0 - bottom: 0 - background-color: rgba(white, .5) - display: flex - align-items: center - padding-left: 15px - - a - margin-right: 4px + a + margin-right: 4px .comment-reply-preview diff --git a/src/templates/nodes/custom/comment/list_embed.jade b/src/templates/nodes/custom/comment/list_embed.jade index 2a58eaf5..96e1bfac 100644 --- a/src/templates/nodes/custom/comment/list_embed.jade +++ b/src/templates/nodes/custom/comment/list_embed.jade @@ -44,18 +44,12 @@ | {# * User is authenticated, but has no subscription or 'POST' permission #} .comment-reply-form .comment-reply-field.sign-in - textarea( - disabled, - id="comment_field", - data-parent-id="{{ node_id }}", - placeholder="") - .sign-in - | {% if current_user.has_role('subscriber') %} - i.pi-lock - | Only project members can comment. - | {% else %} - | Join the conversation! Subscribe to Blender Cloud now. - | {% endif %} + | {% if current_user.has_role('subscriber') or current_user.has_role('demo') %} + i.pi-lock + | Only project members can comment. + | {% else %} + | Join the conversation! Subscribe to Blender Cloud now. + | {% endif %} | {% else %} | {# * User is not autenticated #}