Comments: When editing, resize the textarea

Minor tweaks:
* Remove the 'editing' class after cancel/save
* Style <code>, <pre>, etc tags
This commit is contained in:
Pablo Vazquez 2017-11-08 22:49:56 +01:00
parent cb0272fe60
commit ac9aa59924
4 changed files with 24 additions and 42 deletions

View File

@ -235,7 +235,10 @@ function commentEditCancel(clicked_item, reload_comment) {
return loadComment(comment_id, {'properties.content': 1}) return loadComment(comment_id, {'properties.content': 1})
.done(function(data) { .done(function(data) {
var comment_html = data['properties']['content_html']; var comment_html = data['properties']['content_html'];
comment_container.find('.comment-body span').html(comment_html); comment_container
.find('.comment-body span')
.removeClass('editing')
.html(comment_html);
}) })
.fail(function(xhr) { .fail(function(xhr) {
if (console) console.log('Error fetching comment: ', xhr); if (console) console.log('Error fetching comment: ', xhr);

View File

@ -99,13 +99,13 @@ $comments-width-max: 710px
+media-lg +media-lg
max-width: $comments-width-max max-width: $comments-width-max
border: thin solid transparent
color: darken($color-text, 10%) color: darken($color-text, 10%)
font: font:
size: 1em size: 1em
weight: normal weight: normal
transition: background-color 200ms ease-in-out, margin 200ms ease-in-out
margin: 0 margin: 0
border: thin solid transparent transition: background-color 200ms ease-in-out, margin 200ms ease-in-out
+media-xs +media-xs
padding-left: 0 padding-left: 0
@ -126,24 +126,28 @@ $comments-width-max: 710px
&.comment-author &.comment-author
margin-bottom: 0 margin-bottom: 0
strong, b
font-weight: bold
color: $color-text
img.emoji img.emoji
display: inline-block
padding-top: inherit padding-top: inherit
padding-bottom: inherit padding-bottom: inherit
.editing .editing
background-color: $color-background-light background-color: $color-background-light
margin-bottom: 10px display: flex
border-color: $color-background-dark margin: 30px 0 10px
border-radius: 3px
textarea textarea
box-shadow: none background-color: $color-background
border-radius: 3px
border: none
box-shadow: inset 0 0 2px 0 rgba(darken($color-background-dark, 30%), .5)
display: block
padding: 10px
width: 100% width: 100%
&:focus
box-shadow: inset 0 0 2px 0 darken($color-background-dark, 30%)
.comment-content .comment-content
display: flex display: flex
flex-direction: column flex-direction: column

View File

@ -351,6 +351,7 @@
=node-details-description =node-details-description
+clearfix
color: darken($color-text-dark, 5%) color: darken($color-text-dark, 5%)
font: font:
family: $font-body family: $font-body
@ -358,15 +359,10 @@
size: 1.2em size: 1.2em
word-break: break-word word-break: break-word
clear: both
+clearfix
+media-xs +media-xs
font-size: 1.1em font-size: 1.1em
strong, b
font-weight: 400
a:not([class]) a:not([class])
color: $color-text-dark-primary color: $color-text-dark-primary
text-decoration: underline text-decoration: underline
@ -453,31 +449,9 @@
padding-left: 20px padding-left: 20px
code, kbd, pre, samp code, kbd, pre, samp
font-size: 1.3rem background-color: rgba($color-primary, .05)
color: darken($color-primary, 10%)
pre font-size: inherit
background-color: lighten($color-background, 5%)
border-color: $color-background
border-radius: 3px
color: $color-text
/* when <pre> is outside <p> */
margin:
left: 20px
right: 20px
pre+p
margin-top: 30px
p+pre
/* a <pre> right after a <p> usually are related, remove some spacing */
margin-top: -10px
p
pre
/* We already have spacing on the sides inside <p> */
margin:
left: 0
right: 0
=markdown-preview-container =markdown-preview-container

View File

@ -165,7 +165,7 @@ script.
comment_content comment_content
.addClass('editing') .addClass('editing')
.find('textarea') .find('textarea')
.height(Math.max(150, height + 30)) .autoResize()
.focus() .focus()
.trigger('keyup'); .trigger('keyup');
}) })
@ -209,6 +209,7 @@ script.
$container.find('.comment-body span') $container.find('.comment-body span')
.html(comment_html) .html(comment_html)
.removeClass('editing')
.flashOnce(); .flashOnce();
$button $button