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
2637f567
Commit
2637f567
authored
Aug 13, 2020
by
Paul Gascou-Vaillancourt
Committed by
Ezekiel Kigbo
Aug 13, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace fa-info-circle icons with GitLab SVG information icon
parent
ac5ed9ff
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
15 deletions
+11
-15
app/assets/stylesheets/fontawesome_custom.scss
app/assets/stylesheets/fontawesome_custom.scss
+0
-4
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+0
-5
app/views/instance_statistics/dev_ops_score/_card.html.haml
app/views/instance_statistics/dev_ops_score/_card.html.haml
+4
-4
app/views/projects/blob/viewers/_readme.html.haml
app/views/projects/blob/viewers/_readme.html.haml
+1
-1
app/views/projects/commit/_commit_box.html.haml
app/views/projects/commit/_commit_box.html.haml
+1
-1
changelogs/unreleased/225948-replace-fa-info-circle-w-information-icon.yml
...ased/225948-replace-fa-info-circle-w-information-icon.yml
+5
-0
No files found.
app/assets/stylesheets/fontawesome_custom.scss
View file @
2637f567
...
...
@@ -151,10 +151,6 @@
content
:
'\f0da'
;
}
.
fa-info-circle
:
:
before
{
content
:
'\f05a'
;
}
.
fa-refresh
:
:
before
{
content
:
'\f021'
;
}
...
...
app/assets/stylesheets/pages/merge_requests.scss
View file @
2637f567
...
...
@@ -760,11 +760,6 @@ $mr-widget-min-height: 69px;
color
:
$gl-text-color
;
}
.fa-info-circle
{
color
:
$orange-500
;
padding-right
:
5px
;
}
// Shortening button height by 1px to make compare-versions
// header 56px and fit into our 8px design grid
button
{
...
...
app/views/instance_statistics/dev_ops_score/_card.html.haml
View file @
2637f567
...
...
@@ -18,8 +18,8 @@
=
number_to_percentage
(
card
.
percentage_score
,
precision:
1
)
.board-card-buttons
-
if
card
.
blog
%a
{
href:
card
.
blog
}
=
icon
(
'info-circle'
,
'aria-hidden'
=>
'true
'
)
%a
.btn-svg
{
href:
card
.
blog
}
=
sprite_icon
(
'information-o
'
)
-
if
card
.
docs
%a
{
href:
card
.
docs
}
=
icon
(
'question-circle'
,
'aria-hidden'
=>
'true
'
)
%a
.btn-svg
{
href:
card
.
docs
}
=
sprite_icon
(
'question-o
'
)
app/views/projects/blob/viewers/_readme.html.haml
View file @
2637f567
=
icon
(
'info-circle fw
'
)
=
sprite_icon
(
'information-o'
,
css_class:
'gl-vertical-align-middle! gl-mr-2
'
)
=
succeed
'.'
do
To learn more about this project, read
=
link_to
"the wiki"
,
wiki_path
(
viewer
.
project
.
wiki
)
app/views/projects/commit/_commit_box.html.haml
View file @
2637f567
...
...
@@ -93,7 +93,7 @@
-
if
@merge_request
.well-segment
=
icon
(
'info-circle fw
'
)
=
sprite_icon
(
'information-o'
,
css_class:
'gl-vertical-align-middle! gl-mr-2
'
)
-
link_to_merge_request
=
link_to
(
@merge_request
.
to_reference
,
diffs_project_merge_request_path
(
@project
,
@merge_request
,
commit_id:
@commit
.
id
))
=
_
(
'This commit is part of merge request %{link_to_merge_request}. Comments created here will be created in the context of that merge request.'
).
html_safe
%
{
link_to_merge_request:
link_to_merge_request
}
changelogs/unreleased/225948-replace-fa-info-circle-w-information-icon.yml
0 → 100644
View file @
2637f567
---
title
:
Replace fa-info-circle icons with GitLab SVG information icon
merge_request
:
38505
author
:
type
:
changed
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