From 7e939d11f0e786bf7869b6a44fedd393420a6d03 Mon Sep 17 00:00:00 2001 From: Nico Date: Fri, 8 Feb 2013 02:09:03 +0100 Subject: [PATCH] firefox max-height --- app/assets/javascripts/application.js | 14 ++++++++++++++ app/assets/stylesheets/application.css.scss | 3 ++- app/views/portfolios/show.js.erb | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index b857b42..b821e17 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -13,6 +13,12 @@ //= require jquery //= require jquery_ujs +function size_image_blocks(){ + height = $(window).height(); + + + $('.image_block').css("height", height+"px"); +}; @@ -30,6 +36,14 @@ function preload(arrayOfImages) { $(document).ready(function(){ + size_image_blocks(); + + $(window).bind('resize',function(){ + size_image_blocks(); + + }); + + $('.miniatures').click(function (){ $("#small_index").toggleClass("active"); diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 2590957..321e48c 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -11,7 +11,7 @@ $headerFontWeight : bold; @import "general"; -html { height: 100%; } +html { height: 100%;width: 100%; } body{ @@ -182,6 +182,7 @@ width:100px; font-family:courier; .image_block{ + display:inline-block; max-width:90%; margin:auto; diff --git a/app/views/portfolios/show.js.erb b/app/views/portfolios/show.js.erb index b9aa3c4..7eef0e9 100644 --- a/app/views/portfolios/show.js.erb +++ b/app/views/portfolios/show.js.erb @@ -2,7 +2,7 @@ $(".images").fadeOut(300,function(){ $(".images").html("<%= escape_javascript(render(:collection => @images, :partial => "portfolio_images/portfolio_image", :as => :image)) %>"); - +size_image_blocks(); $(".images").fadeIn(300, function(){ $("html, body").animate({ scrollTop: 0 }, 1);