]> cat aescling's git repositories - mastodon.git/commitdiff
Fix #86 - resolve layout breaking on zoom-out on accounts grid
authorEugen Rochko <eugen@zeonfederated.com>
Mon, 26 Dec 2016 17:48:33 +0000 (18:48 +0100)
committerEugen Rochko <eugen@zeonfederated.com>
Mon, 26 Dec 2016 17:48:33 +0000 (18:48 +0100)
app/assets/stylesheets/accounts.scss
app/controllers/application_controller.rb
app/views/accounts/_header.html.haml

index e1d5043db9dbf33034aaffd78acf92d2b1ba9603..7f33f178dc17be0b318fceed15a1cb4816f04967 100644 (file)
     }
 
     .name {
-      width: 333-20-60-15px;
-      float: left;
       padding-top: 10px;
 
       a {
index e2d879d58876ad55c5a8aaf3da836b13585dc0f5..0a6b50a297f7c4525a557664dc3e6341e7d23de6 100644 (file)
@@ -49,13 +49,13 @@ class ApplicationController < ActionController::Base
 
   def not_found
     respond_to do |format|
-      format.any { head 404 }
+      format.any  { head 404 }
     end
   end
 
   def gone
     respond_to do |format|
-      format.any { head 410 }
+      format.any  { head 410 }
     end
   end
 
index 12c9b069d4f1f4c006d014269ce44f749997e284..01e639205898f2af4db7e4d4c70610b853e884bf 100644 (file)
       .counter{ class: active_nav_class(account_url(@account)) }
         = link_to account_url(@account) do
           %span.counter-label= t('accounts.posts')
-          %span.counter-number= @account.statuses.count
+          %span.counter-number= number_with_delimiter @account.statuses.count
       .counter{ class: active_nav_class(following_account_url(@account)) }
         = link_to following_account_url(@account) do
           %span.counter-label= t('accounts.following')
-          %span.counter-number= @account.following.count
+          %span.counter-number= number_with_delimiter @account.following.count
       .counter{ class: active_nav_class(followers_account_url(@account)) }
         = link_to followers_account_url(@account) do
           %span.counter-label= t('accounts.followers')
-          %span.counter-number= @account.followers.count
+          %span.counter-number= number_with_delimiter @account.followers.count