Download as
Browse Code »

Commit 38044fa2b98ba09ce1675372fe6418aca4101007

Authored by Álvaro Fernando Matos de Souza
1 parent 637d4ad7
Exists in master and in 9 other branches bootstrap_modal, bug_fix_40, code_block, design_41_backup, event_block, master_with_pkg_fixes, pkg_fixes, r4, r5_design

Fixing buttun-bar and JS of use-report page 

Signed-off-by: Álvaro Fernando <alvarofernandoms@gmail.com>
Signed-off-by: ArthurJahn <stutrzbecher@gmail.com>
Showing 3 changed files with 27 additions and 18 deletions   Show diff stats
css/use-report.css
  Diff comments   View file @38044fa
... ... @@ -128,6 +128,7 @@
128 128 color: #172738;
129 129 margin-top: 16px;
130 130 padding: 29px 0px 21px 0px;
  131 + overflow: visible;
131 132 }
132 133  
133 134 #content .main-content .star-rate-data .star-rate-form .star-rate-text,
... ... @@ -207,11 +208,12 @@
207 208 #content .main-content .star-rate-data .star-rate-form .star-comment-container .button-bar input {
208 209 background-color: #3E67B1;
209 210 font-weight: 700;
210   - height: 31px;
211   - margin-top: 10px;
212 211 text-transform: uppercase;
213 212 color: #FFF;
214   - padding-top: 0;
  213 + padding: 5px;
  214 + height: 31px;
  215 + line-height: 20px;
  216 + font-family: Arial;
215 217 }
216 218  
217 219 #content .main-content .star-rate-data .star-rate-form .star-comment-container .button-bar a {
... ... @@ -219,9 +221,7 @@
219 221 }
220 222  
221 223 #content .main-content .star-rate-data .star-rate-form .star-comment-container .button-bar {
222   - margin-top: 0px;
223 224 padding-bottom: 50px;
224   - padding-top: 10px;
225 225 }
226 226  
227 227 #content .main-content .star-rate-data .star-rate-form .star-notice {
... ... @@ -232,12 +232,14 @@
232 232 }
233 233  
234 234 #content .star-rate-form .star-comment-container .comments-software-extra-fields {
235   - overflow: auto;
  235 + height: 0;
  236 + overflow: hidden;
236 237 }
237 238  
238 239 #content .star-rate-form .star-comment-container .comments-software-extra-fields #input_institution_comments {
239 240 margin-bottom: 19px;
240 241 margin-top: 16px;
  242 + height: 50px;
241 243 }
242 244  
243 245 #content .star-rate-form .star-comment-container .comments-software-extra-fields #input_institution_comments label {
... ... @@ -267,10 +269,12 @@
267 269 font-size: 12px;
268 270 float: left;
269 271 padding-right: 10px;
  272 + height: 50px;
270 273 }
271 274  
272 275 #content .star-rate-form .star-comment-container .comments-software-extra-fields .comments-software-saved-values{
273 276 padding-right: 0px;
  277 + height: 70px;
274 278 }
275 279  
276 280 #content .star-rate-form .star-comment-container form .formfieldline {
... ... @@ -522,3 +526,9 @@
522 526 padding-right: 5px;
523 527 text-align: center;
524 528 }
  529 +
  530 +/*** Tooltip ***/
  531 +
  532 +.comments-software-extra-fields .tooltip-inner {
  533 + display: block;
  534 +}
... ...
footer.html.erb
  Diff comments   View file @38044fa
... ... @@ -120,4 +120,4 @@
120 120  
121 121 <!-- Script do portal Brasil deve ficar preferencialmente no rodape para nao atrasar o carregamento da pagina principal -->
122 122 <script src="http://barra.brasil.gov.br/barra.js?cor=verde" type="text/javascript"></script><noscript>&nbsp;<!-- item para fins de acessibilidade --></noscript>
123   - <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
  123 + <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
... ...
theme.js
  Diff comments   View file @38044fa
... ... @@ -198,30 +198,29 @@ $(&#39;#link-buscar&#39;).click(function(e) {
198 198 // TODO: fix calls for this function below
199 199 // TODO: comments-additional-information --> comments-display-fields
200 200 function set_arrow_direction() {
201   - var additional_data_bar = $('#comments-additional-information');
  201 + var additional_data_bar = $('.comments-display-fields');
202 202 var arrow = $('.comments-arrow-down');
203 203 var state = 0;
204   -
205 204 additional_data_bar.on('click', function() {
206   - if(state === 0) {
207   - arrow.attr('class', "comments-arrow-up")
208   - state = 1;
209   - } else {
210   - state = 0;
211   - arrow.attr('class', "comments-arrow-down");
212   - }
213 205 animateExtraFields();
214 206 });
215 207 }
216 208  
217 209 function animateExtraFields() {
  210 + var additional_data_bar = $('.comments-display-fields');
  211 + var arrow = ($('.comments-arrow-down')[0])? $('.comments-arrow-down') : $('.comments-arrow-up');
  212 + console.log(arrow);
218 213 var fields = $('.comments-software-extra-fields');
219 214 if(fields) {
220 215 var innerHeight = fields[0].offsetHeight;
221   - if(fields.height()!==0)
  216 + if(fields.height()!==0) {
  217 + arrow.attr('class', "comments-arrow-down");
222 218 fields.animate({height: 0});
223   - else
  219 + }
  220 + else {
  221 + arrow.attr('class', "comments-arrow-up");
224 222 fields.animate({height: 140});
  223 + }
225 224 }
226 225 }
227 226  
... ...