summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2018-01-03 01:31:29 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2018-01-03 01:31:29 +0000
commit7da3d3a3ed223384d68ba196d74e10d1f727d354 (patch)
treed71f3a6298b54853ab346cdf2f3969abadbc668c
parent7bc6ae3a69a1bc870c522ad250da12ae7f9da84a (diff)
parent96bddb0909d562412d3a3de08b9a24983cb06ec1 (diff)
downloadgitlab-ce-7da3d3a3ed223384d68ba196d74e10d1f727d354.tar.gz
Merge branch 'fix/remove-unnecessary-sidebar-element-alignment' into 'master'
Remove unnecessary sidebar element realignment See merge request gitlab-org/gitlab-ce!16159
-rw-r--r--app/assets/stylesheets/framework/contextual-sidebar.scss4
-rw-r--r--changelogs/unreleased/fix-remove-unnecessary-sidebar-element-alignment.yml5
2 files changed, 5 insertions, 4 deletions
diff --git a/app/assets/stylesheets/framework/contextual-sidebar.scss b/app/assets/stylesheets/framework/contextual-sidebar.scss
index 5da06b90113..d087bee9ebe 100644
--- a/app/assets/stylesheets/framework/contextual-sidebar.scss
+++ b/app/assets/stylesheets/framework/contextual-sidebar.scss
@@ -358,10 +358,6 @@
}
.sidebar-top-level-items > li {
- &.active a {
- padding-left: 12px;
- }
-
.sidebar-sub-level-items {
&:not(.flyout-list) {
display: none;
diff --git a/changelogs/unreleased/fix-remove-unnecessary-sidebar-element-alignment.yml b/changelogs/unreleased/fix-remove-unnecessary-sidebar-element-alignment.yml
new file mode 100644
index 00000000000..24f6f62b934
--- /dev/null
+++ b/changelogs/unreleased/fix-remove-unnecessary-sidebar-element-alignment.yml
@@ -0,0 +1,5 @@
+---
+title: Remove unnecessary sidebar element realignment
+merge_request: 16159
+author: George Tsiolis
+type: fixed