Commit d020969b authored by Olena Horal-Koretska's avatar Olena Horal-Koretska

Merge branch '225189-replace-fa-times-circle-icon-with-gitlab-svg-clear-icon' into 'master'

Replace fa-times-circle icon with GitLab SVG clear icon

Closes #225189

See merge request gitlab-org/gitlab!38409
parents fbdc8921 fd2462bd
...@@ -311,10 +311,6 @@ ...@@ -311,10 +311,6 @@
content: '\f1b3'; content: '\f1b3';
} }
.fa-times-circle::before {
content: '\f057';
}
.fa-skype::before { .fa-skype::before {
content: '\f17e'; content: '\f17e';
} }
......
...@@ -249,7 +249,7 @@ input[type='checkbox']:hover { ...@@ -249,7 +249,7 @@ input[type='checkbox']:hover {
.search-clear { .search-clear {
position: absolute; position: absolute;
right: 10px; right: 10px;
top: 10px; top: 9px;
padding: 0; padding: 0;
color: $gray-darkest; color: $gray-darkest;
line-height: 0; line-height: 0;
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
= search_field_tag :search, params[:search], placeholder: _("Search for projects, issues, etc."), class: "form-control search-text-input js-search-input", id: "dashboard_search", autofocus: true, spellcheck: false = search_field_tag :search, params[:search], placeholder: _("Search for projects, issues, etc."), class: "form-control search-text-input js-search-input", id: "dashboard_search", autofocus: true, spellcheck: false
= icon("search", class: "search-icon") = icon("search", class: "search-icon")
%button.search-clear.js-search-clear{ class: ("hidden" if !params[:search].present?), type: "button", tabindex: "-1" } %button.search-clear.js-search-clear{ class: ("hidden" if !params[:search].present?), type: "button", tabindex: "-1" }
= icon("times-circle") = sprite_icon('clear', size: 16)
%span.sr-only %span.sr-only
= _("Clear search") = _("Clear search")
- unless params[:snippets].eql? 'true' - unless params[:snippets].eql? 'true'
......
---
title: Replace times-circle with GitLab SVG clear icon
merge_request: 38409
author:
type: other
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