Download as
Browse Code »

Commit 75fa6f753b3cab9d1c2872a9552485f989c61bdd

Authored by Victor Costa
2 parents a926668c 6223d2b9
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 rails3_stable

Showing 2 changed files with 8 additions and 7 deletions   Show diff stats
plugins/proposals_discussion/public/proposals_list.js
  Diff comments   View file @75fa6f7
... ... @@ -13,13 +13,8 @@ jQuery(document).ready(function($) {
13 13 });
14 14  
15 15 function proposalsScroll() {
16   - $('.topic-content').data('jscroll', null);
17   - $('.topic-content').jscroll({
18   - loadingHtml: '<img src="/images/loading.gif" alt="Loading" />Loading...',
19   - nextSelector: 'div.more a'
20   - });
21   - $('.proposals').data('jscroll', null);
22   - $('.proposals').jscroll({
  16 + $('.article-body-proposals-discussion-plugin_topic .topic-content').data('jscroll', null);
  17 + $('.article-body-proposals-discussion-plugin_topic .topic-content').jscroll({
23 18 loadingHtml: '<img src="/images/loading.gif" alt="Loading" />Loading...',
24 19 nextSelector: 'div.more a'
25 20 });
... ...
plugins/proposals_discussion/public/style.css
  Diff comments   View file @75fa6f7
... ... @@ -115,6 +115,12 @@ form .proposals-discussion-plugin .body textarea {
115 115 box-shadow: 5px 5px 5px -2px #ddd;
116 116 }
117 117  
  118 +.topics .proposals .more {
  119 + display: none;
  120 +}
  121 +#content .topics .actions.topic-item {
  122 + background-color: #EEE;
  123 +}
118 124 #content .topics .actions.topic-item a {
119 125 width: 93%;
120 126 display: inline-block;
... ...