Download as
Browse Code »

Commit 500ca7e31ef8ea361dbad3822db490bbb008c5a8

Authored by Arthur Sturzbecher
Committed by Thiago Ribeiro
1 parent 862b12f8
Exists in master and in 79 other branches add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev_env_minimal, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, prezento, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, update_software_api, update_softwares_boxes

Fixing catalog animation 

    Signed-off-by: ArthurJahn <stutrzbecher@gmail.com>
    Signed-off-by: Alvaro Fernando <alvarofernandoms@gmail.com>
    Signed-off-by: Luiz Oliveira <ziuloliveiria@gmail.com>
Showing 2 changed files with 17 additions and 11 deletions   Show diff stats
css/software-catalog-page.css
  Diff comments   View file @500ca7e
... ... @@ -117,13 +117,15 @@
117 117  
118 118 .action-search-software_infos #filter-catalog-software #filter-categories-option {
119 119 border: none;
  120 + height: 0;
  121 + max-height: 620px;
120 122 position: relative;
121   - display: none;
122 123 overflow: hidden;
  124 + padding: 0 15px;
123 125 }
124 126  
125 127 .action-search-software_infos #filter-catalog-software #filter-categories-catalog h4 {
126   - margin: 5px 0 10px 5px;
  128 + margin: 20px 0 10px 5px;
127 129 background: transparent;
128 130 color: black;
129 131 }
... ...
theme.js
  Diff comments   View file @500ca7e
... ... @@ -133,16 +133,22 @@ $(&#39;#link-buscar&#39;).click(function(e) {
133 133 var filterOptions = $("#filter-categories-option");
134 134 var showOptions = $("#filter-option-catalog-software");
135 135 var hideOptions = $("#filter-option-catalog-close");
136   - if(filterOptions.is(":visible")){
137   - filterOptions.slideUp(function() {
138   - showOptions.show();
139   - hideOptions.hide();
140   - });
  136 + if(hideOptions.is(":visible")){
  137 + //filterOptions.slideUp(function() {
  138 + showOptions.show();
  139 + hideOptions.hide();
  140 + //});
  141 + filterOptions.animate({
  142 + height: 0
  143 + },500);
141 144 }
142 145 else {
143   - filterOptions.slideDown();
144 146 showOptions.hide();
145 147 hideOptions.show();
  148 + filterOptions.animate({
  149 + height: 565
  150 + },500);
  151 +
146 152 }
147 153 }
148 154  
... ... @@ -245,7 +251,6 @@ $(&#39;#link-buscar&#39;).click(function(e) {
245 251 $(document).ready(function(){
246 252  
247 253 add_top_tooltips();
248   - set_events();
249 254 move_article_buttons();
250 255 add_link_to_article_div();
251 256 insert_notice_div();
... ... @@ -253,8 +258,7 @@ $(&#39;#link-buscar&#39;).click(function(e) {
253 258 set_tooltip_content();
254 259 set_arrow_direction();
255 260 set_use_report_content();
256   -
257   - setEvents(); //FIX-ME
  261 + setEvents();
258 262 move_article_buttons();
259 263 add_link_to_article_div();
260 264 insert_notice_div();
... ...