Merge b7000e5 into 3b7a344

refinery · Oct 14, 2014 · e243c35 · e243c35
2 parents 3b7a344 + b7000e5
commit e243c35
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 16 deletions.
diff --git a/core/app/assets/javascripts/refinery/admin.js.erb b/core/app/assets/javascripts/refinery/admin.js.erb
@@ -124,7 +124,7 @@ refinery_dialog_success = function(e) {
       $('#flash_container > #flash').remove();
       $('#flash_container').append($('.pagination_container').find('#flash'));
 
-      $('#flash').css({'width': 'auto', 'visibility': ''}).fadeIn(550);
+      $('#flash').css({'width': 'auto', 'visibility': ''}).show();
       init_refinery_admin();
     }
   });
@@ -168,7 +168,7 @@ submit_and_continue = function(e, redirect_to) {
   visual_editor_update();
 
   $('#continue_editing').val(true);
-  $('#flash').fadeOut(250);
+  $('#flash').hide();
 
   $('.fieldWithErrors').removeClass('fieldWithErrors').addClass('field');
   $('#flash_container .errorExplanation').remove();
@@ -180,7 +180,7 @@ submit_and_continue = function(e, redirect_to) {
       if (($flash_container = $('#flash_container')).length > 0) {
         $flash_container.html(data);
 
-        $('#flash').css({'width': 'auto', 'visibility': null}).fadeIn(550);
+        $('#flash').css({'width': 'auto', 'visibility': null}).show();
 
         $('.errorExplanation').not($('#flash_container .errorExplanation')).remove();
 

diff --git a/core/app/assets/javascripts/refinery/ajaxy_pagination.js.coffee b/core/app/assets/javascripts/refinery/ajaxy_pagination.js.coffee
@@ -9,5 +9,3 @@
       window.history.pushState path: current_state_location, "", navigate_to
       $(document).paginateTo navigate_to
       e.preventDefault()
-  $(".pagination_container").applyMinimumHeightFromChildren()
-  $(".pagination_frame").css "top", "0px"  if $(".pagination_container").find(".pagination").length == 0
diff --git a/core/app/assets/javascripts/refinery/core.js b/core/app/assets/javascripts/refinery/core.js
@@ -9,7 +9,7 @@ init_flash_messages = function(){
   $('#flash').css({
     'opacity': 0
     , 'visibility':'visible'
-  }).animate({'opacity': '1'}, 550);
+  }).animate({'opacity': '1'}, 0);
   $('#flash_close').on('click', function(e) {
     try {
       $('#flash').animate({

diff --git a/core/app/assets/javascripts/refinery/modal_dialogs.js.erb b/core/app/assets/javascripts/refinery/modal_dialogs.js.erb
@@ -97,7 +97,7 @@ submit_and_continue = function(e, redirect_to) {
   visual_editor_update();
 
   $('#continue_editing').val(true);
-  $('#flash').fadeOut(250);
+  $('#flash').hide();
 
   $('.fieldWithErrors').removeClass('fieldWithErrors').addClass('field');
   $('#flash_container .errorExplanation').remove();
@@ -106,7 +106,7 @@ submit_and_continue = function(e, redirect_to) {
     if (($flash_container = $('#flash_container')).length > 0) {
       $flash_container.html(data);
 
-      $('#flash').css({'width': 'auto', 'visibility': null}).fadeIn(550);
+      $('#flash').css({'width': 'auto', 'visibility': null}).show();
 
       $('.errorExplanation').not($('#flash_container .errorExplanation')).remove();
 

diff --git a/core/app/assets/stylesheets/refinery/layout.css.scss b/core/app/assets/stylesheets/refinery/layout.css.scss
@@ -1217,9 +1217,6 @@ ul#image_grid, .pagination_container > ul#image_grid {
   padding: 0px;
   margin: 10px 0px 15px 0px;
 }
-.pagination_container > ul#image_grid.pagination_frame {
-  top: 38px;
-}
 ul#image_grid li, .pagination_container > ul#image_grid li {
   position: relative;
   float: left;
@@ -1485,15 +1482,10 @@ input.button.close_dialog:active, a.button.close_dialog:active, #content a.butto
 /* AJAX pagination */
 .pagination_container {
   position: relative;
-  overflow: hidden;
-  min-height: 600px;
 }
 .pagination_frame {
   padding: 0;
   width: 100%;
-  height: auto;
-  position: absolute;
-  top: 28px;
   right: auto;
   -moz-transition: all 0.3s ease-in-out;
   -o-transition: all 0.3s ease-in-out;