cincodenada
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix #86 - resolve layout breaking on zoom-out on accounts grid

This commit is contained in:
Eugen Rochko 2016-12-26 18:48:33 +01:00
parent c3e9ba6a66
commit 3282448878
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/stylesheets/accounts.scss
View File

@ -283,8 +283,6 @@
} }
.name { .name {
width: 333-20-60-15px;
float: left;
padding-top: 10px; padding-top: 10px;
a { a {

4
app/controllers/application_controller.rb
View File

@ -49,13 +49,13 @@ class ApplicationController < ActionController::Base
def not_found def not_found
respond_to do |format| respond_to do |format|
format.any { head 404 } format.any { head 404 }
end end
end end
def gone def gone
respond_to do |format| respond_to do |format|
format.any { head 410 } format.any { head 410 }
end end
end end

6
app/views/accounts/_header.html.haml
View File

@ -20,12 +20,12 @@
.counter{ class: active_nav_class(account_url(@account)) } .counter{ class: active_nav_class(account_url(@account)) }
= link_to account_url(@account) do = link_to account_url(@account) do
%span.counter-label= t('accounts.posts') %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)) } .counter{ class: active_nav_class(following_account_url(@account)) }
= link_to following_account_url(@account) do = link_to following_account_url(@account) do
%span.counter-label= t('accounts.following') %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)) } .counter{ class: active_nav_class(followers_account_url(@account)) }
= link_to followers_account_url(@account) do = link_to followers_account_url(@account) do
%span.counter-label= t('accounts.followers') %span.counter-label= t('accounts.followers')
%span.counter-number= @account.followers.count %span.counter-number= number_with_delimiter @account.followers.count