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
This commit is contained in:
commit
771f2af5fa
2 changed files with 9 additions and 20 deletions
|
@ -94,7 +94,7 @@
|
||||||
.profile-user-bio {
|
.profile-user-bio {
|
||||||
// Limits the width of the user bio for readability.
|
// Limits the width of the user bio for readability.
|
||||||
max-width: 600px;
|
max-width: 600px;
|
||||||
margin: 15px auto 0;
|
margin: 10px auto;
|
||||||
padding: 0 16px;
|
padding: 0 16px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -213,29 +213,22 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.user-profile {
|
.user-profile {
|
||||||
|
|
||||||
.cover-controls a {
|
.cover-controls a {
|
||||||
margin-left: 5px;
|
margin-left: 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.profile-header {
|
.profile-header {
|
||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
|
|
||||||
.avatar-holder {
|
.avatar-holder {
|
||||||
width: 90px;
|
width: 90px;
|
||||||
display: inline-block;
|
margin: 0 auto 10px;
|
||||||
}
|
|
||||||
.user-info {
|
|
||||||
display: inline-block;
|
|
||||||
text-align: left;
|
|
||||||
vertical-align: middle;
|
|
||||||
margin-left: 15px;
|
|
||||||
.handle {
|
|
||||||
color: $gl-gray-light;
|
|
||||||
}
|
|
||||||
.member-date {
|
|
||||||
margin-bottom: 4px;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (max-width: $screen-xs-max) {
|
@media (max-width: $screen-xs-max) {
|
||||||
|
|
||||||
.cover-block {
|
.cover-block {
|
||||||
padding-top: 20px;
|
padding-top: 20px;
|
||||||
}
|
}
|
||||||
|
@ -258,10 +251,6 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.user-profile-nav {
|
|
||||||
margin-top: 15px;
|
|
||||||
}
|
|
||||||
|
|
||||||
table.u2f-registrations {
|
table.u2f-registrations {
|
||||||
th:not(:last-child), td:not(:last-child) {
|
th:not(:last-child), td:not(:last-child) {
|
||||||
border-right: solid 1px transparent;
|
border-right: solid 1px transparent;
|
||||||
|
|
|
@ -40,10 +40,10 @@
|
||||||
.user-info
|
.user-info
|
||||||
.cover-title
|
.cover-title
|
||||||
= @user.name
|
= @user.name
|
||||||
%span.handle
|
|
||||||
@#{@user.username}
|
|
||||||
|
|
||||||
.cover-desc.member-date
|
.cover-desc.member-date
|
||||||
|
%span.middle-dot-divider
|
||||||
|
@#{@user.username}
|
||||||
%span.middle-dot-divider
|
%span.middle-dot-divider
|
||||||
Member since #{@user.created_at.to_s(:medium)}
|
Member since #{@user.created_at.to_s(:medium)}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue