Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-09-05 11:21:36 +0300
committerPhil Hughes <me@iamphill.com>2017-09-05 11:21:36 +0300
commit365adcf6a3bd684abfa9aac3b47e53c1eb41bac6 (patch)
tree7787c1190dc1393a5b91c5e882e77a6df26f2b2d /app/assets/stylesheets/framework/dropdowns.scss
parent78b0c35ce71b2e6083d655c47977766bf56fbe72 (diff)
parentd4ec63186b106bbee4bde890b7c30b14a7748339 (diff)
Merge branch 'master' into breadcrumbs-improvements
Diffstat (limited to 'app/assets/stylesheets/framework/dropdowns.scss')
-rw-r--r--app/assets/stylesheets/framework/dropdowns.scss9
1 files changed, 8 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index 12fc3867c32..b0d6c2d9d22 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -737,6 +737,8 @@
@mixin new-style-dropdown($selector: '') {
#{$selector}.dropdown-menu,
#{$selector}.dropdown-menu-nav {
+ margin-bottom: 24px;
+
li {
display: block;
padding: 0 1px;
@@ -768,7 +770,7 @@
// make sure the text color is not overriden
&.text-danger {
- // @extend .text-danger;
+ color: $brand-danger;
}
&.is-focused,
@@ -777,6 +779,11 @@
&:focus {
background-color: $dropdown-item-hover-bg;
color: $gl-text-color;
+
+ // make sure the text color is not overriden
+ &.text-danger {
+ color: $brand-danger;
+ }
}
&.is-active {