Download as
Browse Code »

Commit 7fd8b02b89806ed8ee04847b1f81ff6a1897ba31

Authored by Victor Costa
2 parents 4babb0b1 9a44d833
Exists in theme-brasil-digital-from-staging and in 9 other branches angular_poc, api-article-archived, backup-7-jan-2016, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email, staging, staging_rails3

Merge branch 'AI3220_proposals' into stable

Showing 2 changed files with 21 additions and 4 deletions   Show diff stats
plugins/comment_paragraph/public/style.css
  Diff comments   View file @7fd8b02
... ... @@ -94,6 +94,8 @@ div.article-comments-list-more{
94 94 width: 150px;
95 95 right: 0;
96 96 top: 0;
  97 + zoom: 0.8;
  98 + -moz-transform: scale(0.8);
97 99 }
98 100  
99 101 .side-comment .comment-created-at{display: none;}
... ... @@ -169,7 +171,7 @@ div[class^='comment-paragraph-loading-'] {
169 171 bottom: -9px;
170 172 left: 5px;
171 173 border-style: solid;
172   - border-width: 12px 5px 0;
  174 + border-width: 10px 5px 0;
173 175 border-color: #bdbdbd transparent;
174 176 display: block;
175 177 width: 0;
... ... @@ -195,6 +197,7 @@ div[class^='comment-paragraph-loading-'] {
195 197 overflow-y: auto;
196 198 overflow-x: hidden;
197 199 max-height: 400px;
  200 + border-bottom: 1px solid rgb(240, 240, 240);
198 201 }
199 202 #article .side-comment .article-comments-list .article-comment {
200 203 margin: 0;
... ... @@ -302,3 +305,18 @@ div[class^='comment-paragraph-loading-'] {
302 305 width: 100%;
303 306 transition: width 0.3s ease-in-out;
304 307 }
  308 +
  309 +.comment-paragraph-plugin .post_comment_box {
  310 + text-align: center;
  311 + padding: 5px 5px 0 5px;
  312 +}
  313 +.comment-paragraph-plugin .comment-details .menu-submenu {
  314 + right: 21px;
  315 + top: -1px;
  316 +}
  317 +
  318 +.comment-paragraph-plugin .comment_reply.post_comment_box form {
  319 + padding-left: 0;
  320 + padding-right: 10px;
  321 + margin-left: -36px;
  322 +}
... ...
plugins/proposals_discussion/public/style.css
  Diff comments   View file @7fd8b02
... ... @@ -234,13 +234,12 @@ form .proposals-discussion-plugin .body textarea {
234 234 }
235 235  
236 236 #content .article-body.article-body-proposals-discussion-plugin_proposal .body {
237   - clear: both;
238 237 padding-top: 10px;
239 238 }
240 239 #content .article-body.article-body-proposals-discussion-plugin_proposal .abstract {
241   - width: 50%;
242   - float: right;
243 240 text-align: right;
  241 + width: 50%;
  242 + padding-left: 50%;
244 243 }
245 244 #content .article-body.article-body-proposals-discussion-plugin_proposal .abstract .content {
246 245 font-style: italic;
... ...