summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2018-10-02 20:01:11 +0000
committerClement Ho <clemmakesapps@gmail.com>2018-10-02 20:01:11 +0000
commit9087964c8c6a5d068832334b4377188fdd88d578 (patch)
tree05f1c93808f5d11421abc576811ece0cec516ae5
parentb609c8f650ca9854d12edbf623f2419c216e73a7 (diff)
parentd8b885dcde4260d4726395ef060e06fae4589255 (diff)
downloadgitlab-ce-9087964c8c6a5d068832334b4377188fdd88d578.tar.gz
Merge branch 'align-collapsed-sidebar-avatar-container' into 'master'48004-qa-db-migration-and-initialization-for-auto-devops
Align collapsed sidebar avatar container See merge request gitlab-org/gitlab-ce!22044
-rw-r--r--app/assets/stylesheets/framework/contextual_sidebar.scss2
-rw-r--r--changelogs/unreleased/align-collapsed-sidebar-avatar-container.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/contextual_sidebar.scss b/app/assets/stylesheets/framework/contextual_sidebar.scss
index e2bbcc67a67..2193e8e8de3 100644
--- a/app/assets/stylesheets/framework/contextual_sidebar.scss
+++ b/app/assets/stylesheets/framework/contextual_sidebar.scss
@@ -113,7 +113,7 @@
}
.avatar-container {
- margin-right: 0;
+ margin: 0 auto;
}
}
diff --git a/changelogs/unreleased/align-collapsed-sidebar-avatar-container.yml b/changelogs/unreleased/align-collapsed-sidebar-avatar-container.yml
new file mode 100644
index 00000000000..db68ed10a7e
--- /dev/null
+++ b/changelogs/unreleased/align-collapsed-sidebar-avatar-container.yml
@@ -0,0 +1,5 @@
+---
+title: Align collapsed sidebar avatar container
+merge_request: 22044
+author: George Tsiolis
+type: other