Commit bc795feb58b9987b458b61f5bd405de6bb7cd05b
Exists in
master
Merge branch 'AI3205-comment-paragraph' of gitlab.com:participa/noosfero into AI…
…3205-comment-paragraph Conflicts: plugins/comment_paragraph/public/comment_paragraph_macro.js plugins/comment_paragraph/public/style.css
Showing
2 changed files
with
45 additions
and
35 deletions
Show diff stats
public/comment_paragraph_macro.js
| @@ -83,7 +83,7 @@ jQuery(document).ready(function($) { | @@ -83,7 +83,7 @@ jQuery(document).ready(function($) { | ||
| 83 | $('label[for|=comment_title]').hide(); | 83 | $('label[for|=comment_title]').hide(); |
| 84 | $('label[for|=comment_body]').css({top: -30, left: +20, position:'relative'}); | 84 | $('label[for|=comment_body]').css({top: -30, left: +20, position:'relative'}); |
| 85 | $('.comment_form p').hide(); | 85 | $('.comment_form p').hide(); |
| 86 | - $('.comments_list_toggle_paragraph_' + paragraphId).width('350px'); | 86 | + $('.comments_list_toggle_paragraph_' + paragraphId).width('250px'); |
| 87 | $('.required-field').removeClass("required-field"); | 87 | $('.required-field').removeClass("required-field"); |
| 88 | } | 88 | } |
| 89 | 89 | ||
| @@ -246,4 +246,5 @@ jQuery(document).ready(function($) { | @@ -246,4 +246,5 @@ jQuery(document).ready(function($) { | ||
| 246 | // jQuery.scrollTo(jQuery(comment_paragraph_anchor)); | 246 | // jQuery.scrollTo(jQuery(comment_paragraph_anchor)); |
| 247 | // comment_paragraph_anchor = null; | 247 | // comment_paragraph_anchor = null; |
| 248 | // } | 248 | // } |
| 249 | -//} | ||
| 250 | \ No newline at end of file | 249 | \ No newline at end of file |
| 250 | +//} | ||
| 251 | + |
public/style.css
| 1 | + | ||
| 2 | +#article .article-comments-list, | ||
| 3 | +#article .article-comments-list ul, | ||
| 4 | +#article .article-comments-list li { | ||
| 5 | + margin: 10px 0 10px 0; | ||
| 6 | +} | ||
| 7 | + | ||
| 1 | div.article-comments-list-more{ | 8 | div.article-comments-list-more{ |
| 2 | width: 100%; | 9 | width: 100%; |
| 3 | height: 30px; | 10 | height: 30px; |
| @@ -76,33 +83,15 @@ div.article-comments-list-more{ | @@ -76,33 +83,15 @@ div.article-comments-list-more{ | ||
| 76 | border-radius: 10px; | 83 | border-radius: 10px; |
| 77 | } | 84 | } |
| 78 | 85 | ||
| 79 | - | ||
| 80 | -/*.side-comments-counter{ | ||
| 81 | - top: 10px; | ||
| 82 | - border-style: solid; | ||
| 83 | - border-width: 1px; | ||
| 84 | - position: absolute; | ||
| 85 | - left: -5px; | ||
| 86 | - background: #075698; | ||
| 87 | - z-index: 199; | ||
| 88 | - color: #FFFFFF; | ||
| 89 | - display: none; | ||
| 90 | - padding: 5px; | ||
| 91 | -}*/ | ||
| 92 | - | ||
| 93 | -/*.side-comments-counter:before { | ||
| 94 | -content: ""; | ||
| 95 | -position: absolute; | ||
| 96 | -bottom: -20px; | ||
| 97 | -left: 40px; | ||
| 98 | -border-width: 20px 20px 0; | ||
| 99 | -border-style: solid; | ||
| 100 | -border-color: #5a8f00 transparent; | ||
| 101 | -display: block; | ||
| 102 | -width: 0; | ||
| 103 | -}*/ | ||
| 104 | - | ||
| 105 | - | 86 | +.comment-picture {width: 50px;} |
| 87 | +.comment-text {display: inline-block;} | ||
| 88 | +.comment-replies .comment-text {display: inline-block;} | ||
| 89 | +.comment-from-owner .comment-created-at { | ||
| 90 | + display: block; | ||
| 91 | + width: 100%;} | ||
| 92 | +.comment-replies .comment-text {display: block;} | ||
| 93 | +#article .article-comment .comment-details h4 {display: none;} | ||
| 94 | +#article .article-comments-list .comment-replies {padding-left: 20px;} | ||
| 106 | #comment_title{ | 95 | #comment_title{ |
| 107 | display: none; | 96 | display: none; |
| 108 | } | 97 | } |
| @@ -110,18 +99,20 @@ width: 0; | @@ -110,18 +99,20 @@ width: 0; | ||
| 110 | div[class^='comments_list_toggle_paragraph_'] { | 99 | div[class^='comments_list_toggle_paragraph_'] { |
| 111 | border-style: solid; | 100 | border-style: solid; |
| 112 | border-width: 1px; | 101 | border-width: 1px; |
| 113 | - border-color: black; | 102 | + border-color: #ccc; |
| 114 | padding: 5px; | 103 | padding: 5px; |
| 115 | background-color: whitesmoke; | 104 | background-color: whitesmoke; |
| 105 | + width: 250px; | ||
| 116 | } | 106 | } |
| 117 | 107 | ||
| 118 | div[class^='comment-paragraph-loading-'] { | 108 | div[class^='comment-paragraph-loading-'] { |
| 119 | -/* border-style: solid; | ||
| 120 | - border-width: 1px; | ||
| 121 | - border-color: black; | ||
| 122 | - padding: 5px;*/ | ||
| 123 | background-color: whitesmoke; | 109 | background-color: whitesmoke; |
| 124 | z-index: 99; | 110 | z-index: 99; |
| 111 | + right: -230px; | ||
| 112 | +} | ||
| 113 | + | ||
| 114 | +#content .comment-balloon div[class^='comment-wrapper-']{ | ||
| 115 | + background: none; | ||
| 125 | } | 116 | } |
| 126 | 117 | ||
| 127 | .side-comment{ | 118 | .side-comment{ |
| @@ -130,4 +121,22 @@ div[class^='comment-paragraph-loading-'] { | @@ -130,4 +121,22 @@ div[class^='comment-paragraph-loading-'] { | ||
| 130 | 121 | ||
| 131 | #comments_list{ | 122 | #comments_list{ |
| 132 | display: none; | 123 | display: none; |
| 133 | -} | ||
| 134 | \ No newline at end of file | 124 | \ No newline at end of file |
| 125 | +} | ||
| 126 | + | ||
| 127 | +.article-comment-inner {border-bottom: 1px solid #ddd;} | ||
| 128 | + | ||
| 129 | +/*label[for="comment_title"]{ | ||
| 130 | + display: none; | ||
| 131 | +}*/ | ||
| 132 | + | ||
| 133 | +#article .comment-replies .article-comment{background: white; border: 0px; border-top: 1px solid #ddd;} | ||
| 134 | + | ||
| 135 | +.comment-replies .comment-from-owner.comment-content {background: none;} | ||
| 136 | + | ||
| 137 | +.article-comment .comment-details {margin-bottom: 10px;} | ||
| 138 | + | ||
| 139 | +#content .comment-actions .menu-submenu ul { | ||
| 140 | + right: 100%; | ||
| 141 | + position: absolute; | ||
| 142 | +} | ||
| 143 | + |