summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorPatrick Bajao <ebajao@gitlab.com>2019-04-01 09:38:31 -0800
committerPatrick Bajao <ebajao@gitlab.com>2019-04-02 22:07:16 +0800
commitc0eb5cd7a24544b9dea8ace77e15d79995475b85 (patch)
tree382b23506c0869ecda4a7ccaac3867f4a8467c2a /app/assets
parent6766a0a144bd07441b4593d25235924a14df0a91 (diff)
downloadgitlab-ce-c0eb5cd7a24544b9dea8ace77e15d79995475b85.tar.gz
Make the dropdown match the design
Regenerate locale.pot as well
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/framework/dropdowns.scss12
1 files changed, 11 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index b90db135b4a..22ee12362fa 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -287,7 +287,7 @@
list-style: none;
padding: 0 1px;
- a,
+ a:not(.btn),
button,
.menu-item {
@include dropdown-link;
@@ -351,6 +351,16 @@
// Expects up to 3 digits on the badge
margin-right: 40px;
}
+
+ .dropdown-menu-content {
+ padding: $dropdown-item-padding-y $dropdown-item-padding-x;
+ }
+
+ .inline-content {
+ display: inline-block;
+ margin: 0;
+ padding: 0;
+ }
}
.droplab-dropdown {