From 3f27e1f67de9d4d66a37650b38af1d8167cda557 Mon Sep 17 00:00:00 2001 From: ilya <ilya@laptop.(none)> Date: Wed, 28 Jul 2010 14:48:28 -0700 Subject: [PATCH] DG IZ photo spacing now works --- app/views/albums/show.html.haml | 3 ++- public/javascripts/view.js | 5 +++++ public/stylesheets/application.css | 9 +++++++++ public/stylesheets/sass/application.sass | 11 +++++++++++ 4 files changed, 27 insertions(+), 1 deletion(-) diff --git a/app/views/albums/show.html.haml b/app/views/albums/show.html.haml index d22f8ff567..f118cf7da6 100644 --- a/app/views/albums/show.html.haml +++ b/app/views/albums/show.html.haml @@ -18,7 +18,8 @@ %h4= "by #{@album.person.real_name}" - for photo in @album_photos - = link_to (image_tag photo.image.url(:thumb_medium)), object_path(photo) + .image_thumb + = link_to (image_tag photo.image.url(:thumb_medium)), object_path(photo) #content_bottom .back diff --git a/public/javascripts/view.js b/public/javascripts/view.js index 66a3438d89..ab54ee39bc 100644 --- a/public/javascripts/view.js +++ b/public/javascripts/view.js @@ -107,4 +107,9 @@ $(document).ready(function(){ $("input[type='submit']").addClass("button"); + $(".image_thumb img").load( function() { + $(this).fadeIn("slow"); + }); + + });//end document ready diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 1fc09cf767..253b558a0d 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -393,3 +393,12 @@ h1.big_text { #next_prev_links { text-align: center; } + +.image_thumb { + display: inline-block; + width: 100px; + min-width: 100px; + height: 100px; + min-height: 100px; } + .image_thumb img { + display: none; } diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 0053bad629..e6e0588d6c 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -486,3 +486,14 @@ h1.big_text #next_prev_links :text-align center + + +.image_thumb + :display inline-block + :width 100px + :min-width 100px + :height 100px + :min-height 100px + + img + :display none -- GitLab