Download as
Browse Code »

Commit 862b12f8641a44a98da2940e3e3e0efcb5678fe6

Authored by Arthur Sturzbecher
Committed by Thiago Ribeiro
1 parent 35b88c9b
Exists in master and in 56 other branches add_you_are_here_breadcrumbs_label, api_for_colab, backup_not_prod, button_suspension_points_remove, create_institution_bootstrap_modal, design_validation, dev_env_minimal, disable_email_dev, fix_edit_institution, fix_edit_software_with_another_license, fix_list_style_inside_article, fix_members_pagination, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_validations_and_tests, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc, mailinglist_page_title, margin_fix, mezuro_cookbook, organization_rating_style_changes, prezento, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_secondary_email_from_user, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_catalog_style_fixes, spb_minimal_env, spec_refactor, stable-4.x, temp_soft_comm_refactoring, thread_dropdown, thread_page, update_software_api, update_softwares_boxes

Moving catalog animations to theme 

    Signed-off-by: ArthurJahn <stutrzbecher@gmail.com>
    Signed-off-by: Alvaro Fernando <alvarofernandoms@gmail.com>
Showing 4 changed files with 122 additions and 12 deletions   Show diff stats
css/animate.css 0 → 100644
  Diff comments   View file @862b12f
... ... @@ -0,0 +1,68 @@
  1 +.animated {
  2 + -webkit-animation-duration: .7s;
  3 + animation-duration: .7s;
  4 + -webkit-animation-fill-mode: both;
  5 + animation-fill-mode: both;
  6 +}
  7 +
  8 +@-webkit-keyframes slideInDown {
  9 + from {
  10 + -webkit-transform: translate3d(0, -100%, 0);
  11 + transform: translate3d(0, -100%, 0);
  12 + visibility: visible;
  13 + }
  14 +
  15 + 100% {
  16 + -webkit-transform: translate3d(0, 0, 0);
  17 + transform: translate3d(0, 0, 0);
  18 + }
  19 +}
  20 +
  21 +@keyframes slideInDown {
  22 + from {
  23 + -webkit-transform: translate3d(0, -100%, 0);
  24 + transform: translate3d(0, -100%, 0);
  25 + visibility: visible;
  26 + }
  27 +
  28 + 100% {
  29 + -webkit-transform: translate3d(0, 0, 0);
  30 + transform: translate3d(0, 0, 0);
  31 + }
  32 +}
  33 +
  34 +.slideInDown {
  35 + -webkit-animation-name: slideInDown;
  36 + animation-name: slideInDown;
  37 +}
  38 +
  39 +@-webkit-keyframes slideOutUp {
  40 + from {
  41 + -webkit-transform: translate3d(0, 0, 0);
  42 + transform: translate3d(0, 0, 0);
  43 + }
  44 +
  45 + 100% {
  46 + visibility: hidden;
  47 + -webkit-transform: translate3d(0, -100%, 0);
  48 + transform: translate3d(0, -100%, 0);
  49 + }
  50 +}
  51 +
  52 +@keyframes slideOutUp {
  53 + from {
  54 + -webkit-transform: translate3d(0, 0, 0);
  55 + transform: translate3d(0, 0, 0);
  56 + }
  57 +
  58 + 100% {
  59 + visibility: hidden;
  60 + -webkit-transform: translate3d(0, -100%, 0);
  61 + transform: translate3d(0, -100%, 0);
  62 + }
  63 +}
  64 +
  65 +.slideOutUp {
  66 + -webkit-animation-name: slideOutUp;
  67 + animation-name: slideOutUp;
  68 +}
... ...
css/software-catalog-page.css
  Diff comments   View file @862b12f
... ... @@ -98,6 +98,10 @@
98 98 text-align: right;
99 99 }
100 100  
  101 +.action-search-software_infos #filter-option-catalog-close {
  102 + padding: 7px 7px 17px 10px;
  103 + display: none;
  104 +}
101 105 .action-search-software_infos #filter-option-catalog-software:hover {
102 106 background-color: #c7c7c7;
103 107 }
... ... @@ -112,7 +116,10 @@
112 116 }
113 117  
114 118 .action-search-software_infos #filter-catalog-software #filter-categories-option {
115   - border:none;
  119 + border: none;
  120 + position: relative;
  121 + display: none;
  122 + overflow: hidden;
116 123 }
117 124  
118 125 .action-search-software_infos #filter-catalog-software #filter-categories-catalog h4 {
... ...
style.css
  Diff comments   View file @862b12f
... ... @@ -21,7 +21,7 @@
21 21 @import url(css/use-report.css);
22 22 @import url(css/tooltips.css);
23 23 */
24   -
  24 +@import url(css/animate.css);
25 25 @import url(font-awesome.min.css);
26 26 /*@import url(http://fonts.googleapis.com/css?family=Open+Sans);*/
27 27  
... ... @@ -207,3 +207,5 @@ img {
207 207 iframe {
208 208 border-width: 0; border-style:none;
209 209 }
  210 +
  211 +
... ...
theme.js
  Diff comments   View file @862b12f
... ... @@ -83,16 +83,6 @@ $(&#39;#link-buscar&#39;).click(function(e) {
83 83 //finality.stop().animate({"top" : "100%"}, TRANSITION_TIME);
84 84 }
85 85  
86   - function set_events() {
87   - // Fade css
88   - $('.software-block-finality').css('opacity', 0);
89   - $('.software-block-finality').css('top', 0);
90   - // End Fade CSS
91   -
92   - $(".software-block").mouseover(show_finality);
93   - $(".software-block").mouseout(hide_finality);
94   - }
95   -
96 86 function move_article_buttons(){
97 87 var article_actions = $('#article-actions').clone();
98 88 var report = $('.report-abuse-action').remove();
... ... @@ -131,7 +121,43 @@ $(&#39;#link-buscar&#39;).click(function(e) {
131 121 //$('<div class="notice-item"></div>').wrap($(this).find( '.image', '.title', '.lead', '.read_more'));
132 122 });
133 123  
  124 + }
134 125  
  126 + //toggle filter options in catalog page
  127 + function setFilterCategoriesOptionClass() {
  128 + var filterOptions = $("#filter-categories-option");
  129 + filterOptions.addClass("animated slideInDown");
  130 + }
  131 +
  132 + function toggleFilterOptions(){
  133 + var filterOptions = $("#filter-categories-option");
  134 + var showOptions = $("#filter-option-catalog-software");
  135 + var hideOptions = $("#filter-option-catalog-close");
  136 + if(filterOptions.is(":visible")){
  137 + filterOptions.slideUp(function() {
  138 + showOptions.show();
  139 + hideOptions.hide();
  140 + });
  141 + }
  142 + else {
  143 + filterOptions.slideDown();
  144 + showOptions.hide();
  145 + hideOptions.show();
  146 + }
  147 + }
  148 +
  149 + function setEvents(){
  150 + // Fade css
  151 + $('.software-block-finality').css('opacity', 0);
  152 + $('.software-block-finality').css('top', 0);
  153 + // End Fade CSS
  154 + $(".software-block").mouseover(show_finality);
  155 + $(".software-block").mouseout(hide_finality);
  156 +
  157 + var showOptions = $("#filter-option-catalog-software");
  158 + var hideOptions = $("#filter-option-catalog-close");
  159 + showOptions.click(toggleFilterOptions);
  160 + hideOptions.click(toggleFilterOptions);
135 161 }
136 162  
137 163 /* Finds all uploaded files from manuals page and sets its names on the right format */
... ... @@ -217,6 +243,7 @@ $(&#39;#link-buscar&#39;).click(function(e) {
217 243 }
218 244  
219 245 $(document).ready(function(){
  246 +
220 247 add_top_tooltips();
221 248 set_events();
222 249 move_article_buttons();
... ... @@ -226,5 +253,11 @@ $(&#39;#link-buscar&#39;).click(function(e) {
226 253 set_tooltip_content();
227 254 set_arrow_direction();
228 255 set_use_report_content();
  256 +
  257 + setEvents(); //FIX-ME
  258 + move_article_buttons();
  259 + add_link_to_article_div();
  260 + insert_notice_div();
  261 +
229 262 });
230 263 })(jQuery);
... ...