Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improves small screen support for profile page #1249

Merged
merged 1 commit into from
Mar 22, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/assets/stylesheets/components/_space-misc.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@
.mb-40p { margin-bottom: 40px; }

.mtn1 { margin-top: -$space-1; }
.mtn2 { margin-top: -$space-2; }
.mtn3 { margin-top: -$space-3; }

@media #{$breakpoint-sm} {
.sm-mr-20p { margin-right: 20px; }
.sm-mtn2 { margin-top: -$space-2; }
.sm-mtn3 { margin-top: -$space-3; }
}
2 changes: 1 addition & 1 deletion app/views/profile/_basic_account_badge.html.slim
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.h6.right.border.rounded.p1.regular
.h6.border.rounded.p1.regular
= t('headings.profile.basic_account')
= tooltip(t('tooltips.verified_account'))
2 changes: 1 addition & 1 deletion app/views/profile/_verified_account_badge.html.slim
Original file line number Diff line number Diff line change
@@ -1 +1 @@
.h6.regular.right.border.rounded.p1.regular = t('headings.profile.verified_account')
.h6.regular.border.rounded.p1 = t('headings.profile.verified_account')
23 changes: 14 additions & 9 deletions app/views/profile/index.html.slim
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,15 @@
h1.hide = t('titles.profile')

- if @decrypted_pii
h2.h3.my0.mr1.inline-block = t('headings.profile.profile_info')
= content_tag(:span, t('tooltips.profile_info'),
class: 'h5 blue sans-serif underline hint--top hint--no-animate',
tabindex: 0,
'aria-label': t('tooltips.profile_idv'))
= render partial: current_user.decorate.verified_account_partial
.clearfix
h2.h3.my0.mr1.sm-mr0.col.sm-col-8.lg-col-5 = t('headings.profile.profile_info')
.sm-col.sm-m0.sm-col-8.lg-col-5
= content_tag(:span, t('tooltips.profile_info'),
class: 'h5 blue sans-serif underline hint--top hint--no-animate',
tabindex: 0,
'aria-label': t('tooltips.profile_idv'))
.sm-col-right.left.mt2.sm-mtn3
= render partial: current_user.decorate.verified_account_partial
.mt2.mb4
.py-12p.border-top
.clearfix.mxn1
Expand All @@ -45,10 +48,12 @@ h1.hide = t('titles.profile')
.clearfix.mxn1
.sm-col.sm-col-5.px1 = t('.phone')
.sm-col.sm-col-7.px1 = @decrypted_pii.phone
.clearfix
h2.h3.my0.sm-col
= t('headings.profile.login_info')
.sm-col-right.left.sm-m0.mt1
= render partial: current_user.decorate.basic_account_partial

h2.h3.my0
= t('headings.profile.login_info')
= render partial: current_user.decorate.basic_account_partial
.mt2.mb4
.py-12p.border-top
.clearfix.mxn1
Expand Down