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
e91b6e44
Commit
e91b6e44
authored
Oct 19, 2020
by
Martin Wortschack
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace fa-google with GitLab SVG
- This MR replaces the fa-google icon with the GitLab SVG
parent
fa79e06f
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
16 additions
and
11 deletions
+16
-11
app/assets/stylesheets/fontawesome_custom.scss
app/assets/stylesheets/fontawesome_custom.scss
+0
-4
app/views/import/google_code/new.html.haml
app/views/import/google_code/new.html.haml
+3
-2
app/views/import/google_code/new_user_map.html.haml
app/views/import/google_code/new_user_map.html.haml
+3
-2
app/views/import/google_code/status.html.haml
app/views/import/google_code/status.html.haml
+3
-2
app/views/projects/_import_project_pane.html.haml
app/views/projects/_import_project_pane.html.haml
+2
-1
changelogs/unreleased/mw-replace-fa-google-icons.yml
changelogs/unreleased/mw-replace-fa-google-icons.yml
+5
-0
No files found.
app/assets/stylesheets/fontawesome_custom.scss
View file @
e91b6e44
...
...
@@ -141,10 +141,6 @@
content
:
'\f188'
;
}
.
fa-google
:
:
before
{
content
:
'\f1a0'
;
}
.
fa-exclamation-circle
:
:
before
{
content
:
'\f06a'
;
}
...
...
app/views/import/google_code/new.html.haml
View file @
e91b6e44
-
page_title
_
(
"Google Code import"
)
-
header_title
_
(
"Projects"
),
root_path
%h3
.page-title
%i
.fa.fa-google
%h3
.page-title.gl-display-flex
.gl-display-flex.gl-align-items-center.gl-justify-content-center
=
sprite_icon
(
'google'
,
css_class:
'gl-mr-2'
)
=
_
(
'Import projects from Google Code'
)
%hr
...
...
app/views/import/google_code/new_user_map.html.haml
View file @
e91b6e44
-
page_title
_
(
"User map"
),
_
(
"Google Code import"
)
-
header_title
_
(
"Projects"
),
root_path
%h3
.page-title
%i
.fa.fa-google
%h3
.page-title.gl-display-flex
.gl-display-flex.gl-align-items-center.gl-justify-content-center
=
sprite_icon
(
'google'
,
css_class:
'gl-mr-2'
)
=
_
(
'Import projects from Google Code'
)
%hr
...
...
app/views/import/google_code/status.html.haml
View file @
e91b6e44
-
page_title
_
(
"Google Code import"
)
-
header_title
_
(
"Projects"
),
root_path
%h3
.page-title
%i
.fa.fa-google
%h3
.page-title.gl-display-flex
.gl-display-flex.gl-align-items-center.gl-justify-content-center
=
sprite_icon
(
'google'
,
css_class:
'gl-mr-2'
)
=
_
(
'Import projects from Google Code'
)
-
if
@repos
.
any?
...
...
app/views/projects/_import_project_pane.html.haml
View file @
e91b6e44
...
...
@@ -41,7 +41,8 @@
-
if
google_code_import_enabled?
%div
=
link_to
new_import_google_code_path
,
class:
'btn import_google_code'
,
**
tracking_attrs
(
track_label
,
'click_button'
,
'google_code'
)
do
=
icon
(
'google'
,
text:
'Google Code'
)
=
sprite_icon
(
'google'
)
Google Code
-
if
fogbugz_import_enabled?
%div
...
...
changelogs/unreleased/mw-replace-fa-google-icons.yml
0 → 100644
View file @
e91b6e44
---
title
:
Replace fa-google with GitLab SVG
merge_request
:
45506
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