Commit 862b12f8641a44a98da2940e3e3e0efcb5678fe6
Committed by
Thiago Ribeiro
1 parent
35b88c9b
Exists in
master
and in
9 other branches
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
| @@ -0,0 +1,68 @@ | @@ -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
| @@ -98,6 +98,10 @@ | @@ -98,6 +98,10 @@ | ||
| 98 | text-align: right; | 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 | .action-search-software_infos #filter-option-catalog-software:hover { | 105 | .action-search-software_infos #filter-option-catalog-software:hover { |
| 102 | background-color: #c7c7c7; | 106 | background-color: #c7c7c7; |
| 103 | } | 107 | } |
| @@ -112,7 +116,10 @@ | @@ -112,7 +116,10 @@ | ||
| 112 | } | 116 | } |
| 113 | 117 | ||
| 114 | .action-search-software_infos #filter-catalog-software #filter-categories-option { | 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 | .action-search-software_infos #filter-catalog-software #filter-categories-catalog h4 { | 125 | .action-search-software_infos #filter-catalog-software #filter-categories-catalog h4 { |
style.css
| @@ -21,7 +21,7 @@ | @@ -21,7 +21,7 @@ | ||
| 21 | @import url(css/use-report.css); | 21 | @import url(css/use-report.css); |
| 22 | @import url(css/tooltips.css); | 22 | @import url(css/tooltips.css); |
| 23 | */ | 23 | */ |
| 24 | - | 24 | +@import url(css/animate.css); |
| 25 | @import url(font-awesome.min.css); | 25 | @import url(font-awesome.min.css); |
| 26 | /*@import url(http://fonts.googleapis.com/css?family=Open+Sans);*/ | 26 | /*@import url(http://fonts.googleapis.com/css?family=Open+Sans);*/ |
| 27 | 27 | ||
| @@ -207,3 +207,5 @@ img { | @@ -207,3 +207,5 @@ img { | ||
| 207 | iframe { | 207 | iframe { |
| 208 | border-width: 0; border-style:none; | 208 | border-width: 0; border-style:none; |
| 209 | } | 209 | } |
| 210 | + | ||
| 211 | + |
theme.js
| @@ -83,16 +83,6 @@ $('#link-buscar').click(function(e) { | @@ -83,16 +83,6 @@ $('#link-buscar').click(function(e) { | ||
| 83 | //finality.stop().animate({"top" : "100%"}, TRANSITION_TIME); | 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 | function move_article_buttons(){ | 86 | function move_article_buttons(){ |
| 97 | var article_actions = $('#article-actions').clone(); | 87 | var article_actions = $('#article-actions').clone(); |
| 98 | var report = $('.report-abuse-action').remove(); | 88 | var report = $('.report-abuse-action').remove(); |
| @@ -131,7 +121,43 @@ $('#link-buscar').click(function(e) { | @@ -131,7 +121,43 @@ $('#link-buscar').click(function(e) { | ||
| 131 | //$('<div class="notice-item"></div>').wrap($(this).find( '.image', '.title', '.lead', '.read_more')); | 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 | /* Finds all uploaded files from manuals page and sets its names on the right format */ | 163 | /* Finds all uploaded files from manuals page and sets its names on the right format */ |
| @@ -217,6 +243,7 @@ $('#link-buscar').click(function(e) { | @@ -217,6 +243,7 @@ $('#link-buscar').click(function(e) { | ||
| 217 | } | 243 | } |
| 218 | 244 | ||
| 219 | $(document).ready(function(){ | 245 | $(document).ready(function(){ |
| 246 | + | ||
| 220 | add_top_tooltips(); | 247 | add_top_tooltips(); |
| 221 | set_events(); | 248 | set_events(); |
| 222 | move_article_buttons(); | 249 | move_article_buttons(); |
| @@ -226,5 +253,11 @@ $('#link-buscar').click(function(e) { | @@ -226,5 +253,11 @@ $('#link-buscar').click(function(e) { | ||
| 226 | set_tooltip_content(); | 253 | set_tooltip_content(); |
| 227 | set_arrow_direction(); | 254 | set_arrow_direction(); |
| 228 | set_use_report_content(); | 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 | })(jQuery); | 263 | })(jQuery); |