]> cat aescling's git repositories - mastodon.git/commitdiff
Change default avatar, redirect to home after sign up
authorEugen Rochko <eugen@zeonfederated.com>
Mon, 21 Mar 2016 16:18:30 +0000 (17:18 +0100)
committerEugen Rochko <eugen@zeonfederated.com>
Mon, 21 Mar 2016 16:18:30 +0000 (17:18 +0100)
app/assets/images/avatars/missing.png
app/assets/stylesheets/accounts.scss
app/controllers/auth/registrations_controller.rb
app/views/accounts/show.html.haml

index 223b4ed2ce532f2110a2e8338b75076d0fac4aee..f22c6c04902be1820e6eb0a17e810970828c9d02 100644 (file)
Binary files a/app/assets/images/avatars/missing.png and b/app/assets/images/avatars/missing.png differ
index ab39c8be02862bffae512210e01dce6b120f34f3..571cee5c9b4dc64bc467efdde0a07266c22a317c 100644 (file)
   font-weight: 500;
   text-align: center;
   padding: 15px 0;
+  padding-bottom: 25px;
   cursor: default;
 }
index 3114ae60a83c8ca81df1a22c8f0f1a0ecfe15353..5e1f5214bc32d48bb81986f7d316750eb16b7f0a 100644 (file)
@@ -17,6 +17,6 @@ class Auth::RegistrationsController < Devise::RegistrationsController
   end
 
   def after_sign_up_path_for(resource)
-    account_path(resource.account)
+    root_path
   end
 end
index f994600835d1997fbfd4e6ef9f87d2290ceb3f19..815d05f0c2940bee8060926eee82bbffc9159bcd 100644 (file)
@@ -7,8 +7,12 @@
 
 = render partial: 'header'
 
-.activity-stream
-  - @statuses.each do |status|
-    = render partial: 'stream_entries/status', locals: { status: status, include_threads: false, is_successor: false, is_predecessor: false }
+- if @statuses.empty?
+  .accounts-grid
+    = render partial: 'nothing_here'
+- else
+  .activity-stream
+    - @statuses.each do |status|
+      = render partial: 'stream_entries/status', locals: { status: status }
 
 = will_paginate @statuses, pagination_options