diff --git a/app/models/user.rb b/app/models/user.rb index bbbbd772f..79c77f05e 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -196,6 +196,9 @@ class User person.save elsif object.is_a?(Comment) + object.person = Diaspora::Parser.parse_or_find_person_from_xml( xml ).save if object.person.nil? + object.person.save + Rails.logger.debug("From: #{object.person.inspect}") if object.person raise "In receive for #{self.real_name}, signature was not valid on: #{object.inspect}" unless object.post.person == self.person || object.verify_post_creator_signature object.save dispatch_comment object unless owns?(object) diff --git a/app/uploaders/image_uploader.rb b/app/uploaders/image_uploader.rb index 732367ffa..0ae5ce446 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 3b9b768f5..f1b9f7945 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 9ac21c096..552049c8e 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