From 1700ce8e18ac284f60358e4e98b2c26c8dac3903 Mon Sep 17 00:00:00 2001 From: ilya Date: Wed, 28 Jul 2010 16:12:49 -0700 Subject: [PATCH] DG IZ; tweaks to album index page --- app/views/albums/_album.html.haml | 2 +- app/views/albums/index.html.haml | 3 ++- public/stylesheets/application.css | 10 ++++------ public/stylesheets/sass/application.sass | 11 +++++------ 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/app/views/albums/_album.html.haml b/app/views/albums/_album.html.haml index 3835fd377..d4a629ba0 100644 --- a/app/views/albums/_album.html.haml +++ b/app/views/albums/_album.html.haml @@ -1,4 +1,4 @@ -%li.album{:id => post.id, :class => ("mine" if mine?(post))} +.album{:id => post.id, :class => ("mine" if mine?(post))} %div.name = link_to post.name, object_path(post) diff --git a/app/views/albums/index.html.haml b/app/views/albums/index.html.haml index efdef8872..8f3816f3d 100644 --- a/app/views/albums/index.html.haml +++ b/app/views/albums/index.html.haml @@ -13,9 +13,10 @@ %li.selected= friends_albums_link %li= your_albums_link -%ul#stream +%div - for album in @albums = render "album", :post => album + #pagination = will_paginate @albums diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index cd65f03cc..4230ed57a 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -333,9 +333,7 @@ ul#publisher_content_pickers li { position: relative; height: 200px; width: 300px; - display: inline-block; - margin-right: 2em; - margin-bottom: 2em; } + display: inline-block; } .album .name { position: absolute; z-index: 600; @@ -349,9 +347,7 @@ ul#publisher_content_pickers li { .album .name .time a { font-weight: normal; } .album div.image_cycle img { - border-radius: 3px; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; } + display: none; } .field_with_submit input[type='text'] { width: 82%; @@ -402,6 +398,8 @@ h1.big_text { min-height: 100px; } .image_thumb img { display: none; } + .image_thumb img:hover { + border-bottom: 2px solid #666666; } .image_cycle img { display: none; } diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 4a815ebcc..23b4ecf25 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -405,9 +405,6 @@ ul#publisher_content_pickers li :height 200px :width 300px :display inline-block - :margin - :right 2em - :bottom 2em .name :position absolute @@ -429,9 +426,7 @@ ul#publisher_content_pickers li div.image_cycle img - :border-radius 3px - :-webkit-border-radius 3px - :-moz-border-radius 3px + :display none .field_with_submit input[type='text'] @@ -498,6 +493,10 @@ h1.big_text img :display none + &:hover + :border + :bottom 2px solid #666 + .image_cycle img :display none