summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2018-03-21 14:16:45 +0000
committerClement Ho <clemmakesapps@gmail.com>2018-03-21 14:16:45 +0000
commit30c480c2b3f4709f592d8b095f8653df940f6845 (patch)
tree5d689cae30a1f53964e800349968d40bc630f3d3
parent22fc4863d33ad68ab65cd74182741e9a7e6d316f (diff)
parent8bde23742c710f70f22f22bc8e39ff36cfe25a6c (diff)
downloadgitlab-ce-30c480c2b3f4709f592d8b095f8653df940f6845.tar.gz
Merge branch '39584-nesting-depth-5-framework-dropdowns' into 'master'
NestingDepth (level 5) in framework/dropdowns.scss See merge request gitlab-org/gitlab-ce!17820
-rw-r--r--app/assets/stylesheets/framework/dropdowns.scss6
-rw-r--r--changelogs/unreleased/39584-nesting-depth-5-framework-dropdowns.yml5
2 files changed, 7 insertions, 4 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index 127583626cf..6397757bf88 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -501,10 +501,8 @@
-moz-osx-font-smoothing: grayscale;
}
- &.dropdown-menu-user-link {
- &::before {
- top: 50%;
- }
+ &.dropdown-menu-user-link::before {
+ top: 50%;
}
}
diff --git a/changelogs/unreleased/39584-nesting-depth-5-framework-dropdowns.yml b/changelogs/unreleased/39584-nesting-depth-5-framework-dropdowns.yml
new file mode 100644
index 00000000000..30a8dc63983
--- /dev/null
+++ b/changelogs/unreleased/39584-nesting-depth-5-framework-dropdowns.yml
@@ -0,0 +1,5 @@
+---
+title: Apply NestingDepth (level 5) (framework/dropdowns.scss)
+merge_request: 17820
+author: Takuya Noguchi
+type: other