diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-07 12:10:24 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-07 12:10:24 +0000 |
commit | e227f482346aa39655cdebb5a59eeef78e1e12b4 (patch) | |
tree | 1b33c8d71e3f3aeae5d7cdcdbf18643512d632b4 /app/assets/stylesheets/framework | |
parent | d51d5adf94ad965af8433ce6f74a81cfef5669e1 (diff) | |
download | gitlab-ce-e227f482346aa39655cdebb5a59eeef78e1e12b4.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/stylesheets/framework')
-rw-r--r-- | app/assets/stylesheets/framework/dropdowns.scss | 3 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index c5ffcb48814..00230d61a46 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -567,14 +567,13 @@ margin-bottom: 10px; padding: 0 10px; - .fa, .input-icon, .dropdown-input-clear, .dropdown-input-search { position: absolute; top: $gl-padding-8; right: 20px; - color: $dropdown-input-fa-color; + color: $gray-500; font-size: 12px; pointer-events: none; } diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 5f0ba8ca9ce..d5a0371e386 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -546,7 +546,6 @@ $dropdown-vertical-offset: 4px; $dropdown-empty-row-bg: rgba(#000, 0.04); $dropdown-shadow-color: rgba(#000, 0.1); $dropdown-title-btn-color: #bfbfbf; -$dropdown-input-fa-color: #c7c7c7; $dropdown-input-focus-shadow: rgba($blue-300, 0.4); $dropdown-loading-bg: rgba($white, 0.6); $dropdown-chevron-size: 10px; |