Commit 26fc6a49 authored by Clement Ho's avatar Clement Ho

Merge branch 'winh-dropdown-divider-color' into 'master'

Change dropdown divider color to gray-200 (#dfdfdf)

See merge request gitlab-org/gitlab-ce!23592
parents 3aae1ff6 d3188152
......@@ -261,7 +261,7 @@
height: 1px;
margin: 4px -1px;
padding: 0;
background-color: $dropdown-divider-color;
background-color: $dropdown-divider-bg;
}
> .active {
......
......@@ -294,10 +294,10 @@
height: 1px;
margin: #{$grid-size / 2} 0;
padding: 0;
background-color: $dropdown-divider-color;
background-color: $dropdown-divider-bg;
&:hover {
background-color: $dropdown-divider-color;
background-color: $dropdown-divider-bg;
}
}
......@@ -306,7 +306,7 @@
height: 1px;
margin-top: 8px;
margin-bottom: 8px;
background-color: $dropdown-divider-color;
background-color: $dropdown-divider-bg;
}
.dropdown-menu-empty-item a {
......@@ -542,7 +542,7 @@
text-align: center;
text-overflow: ellipsis;
white-space: nowrap;
border-bottom: 1px solid $dropdown-divider-color;
border-bottom: 1px solid $dropdown-divider-bg;
overflow: hidden;
}
......@@ -621,7 +621,7 @@
padding: 0 7px;
color: $gl-gray-700;
line-height: 30px;
border: 1px solid $dropdown-divider-color;
border: 1px solid $dropdown-divider-bg;
border-radius: 2px;
outline: 0;
......@@ -656,7 +656,7 @@
padding-top: 10px;
margin-top: 10px;
font-size: 13px;
border-top: 1px solid $dropdown-divider-color;
border-top: 1px solid $dropdown-divider-bg;
}
.dropdown-footer-content {
......
......@@ -332,7 +332,6 @@ $dropdown-max-height: 312px;
$dropdown-vertical-offset: 4px;
$dropdown-empty-row-bg: rgba(#000, 0.04);
$dropdown-shadow-color: rgba(#000, 0.1);
$dropdown-divider-color: rgba(#000, 0.1);
$dropdown-title-btn-color: #bfbfbf;
$dropdown-input-fa-color: #c7c7c7;
$dropdown-input-focus-shadow: rgba($blue-300, 0.4);
......
......@@ -20,3 +20,4 @@ $warning: $orange-500;
$danger: $red-500;
$zindex-modal-backdrop: 1040;
$nav-divider-margin-y: ($grid-size / 2);
$dropdown-divider-bg: $theme-gray-200;
......@@ -41,7 +41,7 @@
.issue-board-dropdown-content {
margin: 0 8px 10px;
padding-bottom: 10px;
border-bottom: 1px solid $dropdown-divider-color;
border-bottom: 1px solid $dropdown-divider-bg;
> p {
margin: 0;
......
---
title: Change dropdown divider color to gray-200 (#dfdfdf)
merge_request: 23592
author:
type: changed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment