diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2016-12-26 18:48:33 +0100 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-12-26 18:48:33 +0100 |
commit | 3282448878dd2640ea47dc1a77a4ae958ba8923e (patch) | |
tree | 35aefcd9afb5f6f5dc1a812bac587804c4fa6274 /app | |
parent | c3e9ba6a66bfcb9e33edebc73adea0a17d7f02a6 (diff) |
Fix #86 - resolve layout breaking on zoom-out on accounts grid
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/stylesheets/accounts.scss | 2 | ||||
-rw-r--r-- | app/controllers/application_controller.rb | 4 | ||||
-rw-r--r-- | app/views/accounts/_header.html.haml | 6 |
3 files changed, 5 insertions, 7 deletions
diff --git a/app/assets/stylesheets/accounts.scss b/app/assets/stylesheets/accounts.scss index e1d5043db..7f33f178d 100644 --- a/app/assets/stylesheets/accounts.scss +++ b/app/assets/stylesheets/accounts.scss @@ -283,8 +283,6 @@ } .name { - width: 333-20-60-15px; - float: left; padding-top: 10px; a { diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index e2d879d58..0a6b50a29 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -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 diff --git a/app/views/accounts/_header.html.haml b/app/views/accounts/_header.html.haml index 12c9b069d..01e639205 100644 --- a/app/views/accounts/_header.html.haml +++ b/app/views/accounts/_header.html.haml @@ -20,12 +20,12 @@ .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 |