diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-10-06 23:50:04 +0300 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-10-06 23:50:04 +0300 |
commit | 771f2af5fa2f1bc61155868aea0150f7b36a2074 (patch) | |
tree | d930e49653ff1910098e2e915b4fe602d7cb3277 /app/views/users | |
parent | 49d6ca6267034149a63b8648215ed0a73126de3f (diff) | |
parent | 1845c33d711ca50bd7ef8d85b8aae5c0f016611c (diff) |
Merge branch 'update-profile-view' into 'master'
Update profile view
## What does this MR do?
Centers entire profile information section
## Screenshots (if relevant)
Before:
![Screen_Shot_2016-10-03_at_4.23.03_PM](/uploads/bc2017e88cb52ec0e817c4c59e70a186/Screen_Shot_2016-10-03_at_4.23.03_PM.png)
After:
![Screen_Shot_2016-10-03_at_4.21.57_PM](/uploads/86ce1339d21cc39a64c22f27868a2986/Screen_Shot_2016-10-03_at_4.21.57_PM.png)
## Does this MR meet the acceptance criteria?
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22829
cc @dzaporozhets
See merge request !6662
Diffstat (limited to 'app/views/users')
-rw-r--r-- | app/views/users/show.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 19759a33add..1e0752bd3c3 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -40,11 +40,11 @@ .user-info .cover-title = @user.name - %span.handle - @#{@user.username} .cover-desc.member-date %span.middle-dot-divider + @#{@user.username} + %span.middle-dot-divider Member since #{@user.created_at.to_s(:medium)} .cover-desc |