diff --git a/app/uploaders/image_uploader.rb b/app/uploaders/image_uploader.rb index 732367ffadf2f2b3933936bbed30dd13ff3a2a1d..0ae5ce446a3bb0d7199e1600681926775a2dd4a1 100644 --- a/app/uploaders/image_uploader.rb +++ b/app/uploaders/image_uploader.rb @@ -16,7 +16,7 @@ class ImageUploader < CarrierWave::Uploader::Base end version :thumb_small do - process :resize_to_fill => [30,30] + process :resize_to_fill => [50,50] end version :thumb_medium do @@ -24,7 +24,7 @@ class ImageUploader < CarrierWave::Uploader::Base end version :thumb_large do - process :resize_to_fill => [300,300] + process :resize_to_fill => [200,200] end version :scaled_full do diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 3b9b768f501d8806de54ece97b7957f0930718aa..f1b9f794588ea6ff0619966f0d35fb665deedf62 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -379,9 +379,12 @@ label { /* cycle it! */ .album { position: relative; - height: 300px; - width: 300px; + height: 200px; + width: 200px; display: inline-block; } + .album img { + width: 200px; + height: 200px; } .album .name { position: absolute; z-index: 6; diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 9ac21c0966df70c1547b8ac70e5e6dcb5c3f2b11..552049c8ec05a77e66d8be17b68d669f9bfd57fe 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -478,10 +478,14 @@ label /* cycle it! */ .album :position relative - :height 300px - :width 300px + :height 200px + :width 200px :display inline-block + img + :width 200px + :height 200px + .name :position absolute :z-index 6