archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Don't show "Join the conversation" to demo users

Browse Source 
And minor style tweaks
This commit is contained in:
Pablo Vazquez 2016-11-09 18:15:34 +01:00
parent ab375b2126
commit dc70705b1e
2 changed files with 17 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/styles/_comments.sass
View File

@ -18,11 +18,8 @@ $comments-width-max: 710px
#comments-list-header #comments-list-header
#comments-list-title #comments-list-title
padding: 15px 0 10px 0 padding: 15px 0 10px 0
margin: 0 font-size: 1.3em
font: font-weight: 300
size: 1.5em
weight: 300
family: $font-body
color: $color-text-dark-primary color: $color-text-dark-primary
#comments-list-items-loading #comments-list-items-loading
@ -416,22 +413,16 @@ $comments-width-max: 710px
border-color: $color-danger border-color: $color-danger
&.sign-in &.sign-in
textarea display: block
margin: 0 padding: 10px
border-radius: 3px
border: thin solid $color-background
background-color: rgba(white, .5)
color: $color-text-dark-primary
cursor: default
.sign-in a
position: absolute margin-right: 4px
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
.comment-reply-preview .comment-reply-preview

18
src/templates/nodes/custom/comment/list_embed.jade
View File

@ -44,18 +44,12 @@
| {# * User is authenticated, but has no subscription or 'POST' permission #} | {# * User is authenticated, but has no subscription or 'POST' permission #}
.comment-reply-form .comment-reply-form
.comment-reply-field.sign-in .comment-reply-field.sign-in
textarea( | {% if current_user.has_role('subscriber') or current_user.has_role('demo') %}
disabled, i.pi-lock
id="comment_field", | Only project members can comment.
data-parent-id="{{ node_id }}", | {% else %}
placeholder="") | Join the conversation!&nbsp;<a href="https://store.blender.org/product/membership/">Subscribe to Blender Cloud</a> now.
.sign-in | {% endif %}
| {% if current_user.has_role('subscriber') %}
i.pi-lock
| Only project members can comment.
| {% else %}
| Join the conversation!&nbsp;<a href="https://store.blender.org/product/membership/">Subscribe to Blender Cloud</a> now.
| {% endif %}
| {% else %} | {% else %}
| {# * User is not autenticated #} | {# * User is not autenticated #}