Skip to content

Commit c01192d

Browse files
committed
Fix badge alignment in footer navigation
1 parent a056f71 commit c01192d

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

app/assets/stylesheets/badges.sass

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@
9191
.mini-badges-section
9292
position: relative
9393
margin: 27px 4px 0 0
94+
float: right
9495
.account-badge
9596
margin: 0 20px 31px 0
9697
height: 48px
@@ -102,6 +103,7 @@
102103
.mini-badges-section
103104
margin: 0 0 15px
104105
display: flex
106+
float: none
105107
.account-badge
106108
margin: 0 20px 20px 0
107109

app/views/accounts/_mini_header.html.haml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
- lang = @account.most_experienced_language
22
.account_header{ style: 'margin-top: 5px' }
3-
.col-xs-4.col-sm-2.col-md-2#account_icon
3+
.col-xs-4.col-sm-3.col-md-2#account_icon
44
= link_to account_path(@account) do
55
= image_tag avatar_img_path(@account, 62), size: '128x128', itemprop: 'image'
66
- if lang
77
- bg_color = language_color(lang.name)
88
- text_color = language_text_color(lang.name)
99
= link_to '', '#', style: "background-color: ##{bg_color}; color: ##{text_color};",
1010
title: t('accounts.mini_header.title'), class: 'center primary_language_bg'
11-
.col-xs-8.col-sm-10.col-md-10#account_header
11+
.col-xs-7.col-sm-4.col-md-7#account_header
1212
.info.pull-left
1313
%h1{ itemprop: 'name' }
1414
= link_to h(@account.name), account_path(@account)
@@ -28,7 +28,8 @@
2828
= truncate(@account.url, length: 60)
2929
.clearfix
3030
%meta{ itemprop: 'interactionCount', content: @account.kudo_rank }
31-
.mini-badges-section.pull-right
31+
.col-xs-12.col-sm-5.col-md-3
32+
.mini-badges-section
3233
- badges = @account.badges.map { |badge| BadgeDecorator.new(badge) }
3334
= render partial: 'accounts/badges_row', locals: { badges: badges }
3435

app/views/accounts/show/_header.html.haml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,10 @@
3838
rel: 'popup', title: "Follow @#{@account.twitter_account}" do
3939
%i.icon-twitter
4040
= render partial: 'accounts/show/header/kudo_button', locals: { css: 'btn-mini btn-info' }
41-
.col-xs-12.col-sm-5.col-md-3.mini-badges-section
42-
- badges = @account.badges.map { |badge| BadgeDecorator.new(badge) }
43-
= render partial: 'badges_row', locals: { badges: badges }
41+
.col-xs-12.col-sm-5.col-md-3
42+
.mini-badges-section
43+
- badges = @account.badges.map { |badge| BadgeDecorator.new(badge) }
44+
= render partial: 'badges_row', locals: { badges: badges }
4445

4546
.clearfix  
4647
.col-xs-12.col-sm-12.col-md-12

0 commit comments

Comments
 (0)