Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
fd2462bd
Commit
fd2462bd
authored
Jul 31, 2020
by
Nicolas Dular
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace times-circle with GitLab SVG clear icon
parent
99afaa62
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
6 deletions
+7
-6
app/assets/stylesheets/fontawesome_custom.scss
app/assets/stylesheets/fontawesome_custom.scss
+0
-4
app/assets/stylesheets/pages/search.scss
app/assets/stylesheets/pages/search.scss
+1
-1
app/views/search/_form.html.haml
app/views/search/_form.html.haml
+1
-1
changelogs/unreleased/nicolasdular-replace-fa-times.yml
changelogs/unreleased/nicolasdular-replace-fa-times.yml
+5
-0
No files found.
app/assets/stylesheets/fontawesome_custom.scss
View file @
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'
;
}
}
...
...
app/assets/stylesheets/pages/search.scss
View file @
fd2462bd
...
@@ -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
:
10
px
;
top
:
9
px
;
padding
:
0
;
padding
:
0
;
color
:
$gray-darkest
;
color
:
$gray-darkest
;
line-height
:
0
;
line-height
:
0
;
...
...
app/views/search/_form.html.haml
View file @
fd2462bd
...
@@ -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'
...
...
changelogs/unreleased/nicolasdular-replace-fa-times.yml
0 → 100644
View file @
fd2462bd
---
title
:
Replace times-circle with GitLab SVG clear icon
merge_request
:
38409
author
:
type
:
other
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment