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
61fb6cd7
Commit
61fb6cd7
authored
Jul 22, 2020
by
Jiaan Louw
Committed by
Martin Wortschack
Jul 22, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply reviewer suggested changes
This updates the buttons to .gl-button as suggested by Taurie Davis.
parent
874e714c
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
25 additions
and
15 deletions
+25
-15
app/views/admin/broadcast_messages/index.html.haml
app/views/admin/broadcast_messages/index.html.haml
+3
-3
app/views/admin/groups/show.html.haml
app/views/admin/groups/show.html.haml
+5
-3
app/views/admin/projects/show.html.haml
app/views/admin/projects/show.html.haml
+8
-5
app/views/admin/users/_head.html.haml
app/views/admin/users/_head.html.haml
+4
-4
changelogs/unreleased/225944-replace-fa-pencil-square-o-icons-with-gitlab-svg-pencil-square-ico.yml
...ncil-square-o-icons-with-gitlab-svg-pencil-square-ico.yml
+5
-0
No files found.
app/views/admin/broadcast_messages/index.html.haml
View file @
61fb6cd7
...
...
@@ -37,8 +37,8 @@
=
message
.
target_path
%td
=
message
.
broadcast_type
.
capitalize
%td
.gl-white-space-nowrap
=
link_to
sprite_icon
(
'pencil-square'
),
edit_admin_broadcast_message_path
(
message
),
title:
'Edit'
,
class:
'bt
n'
=
link_to
sprite_icon
(
'remove'
),
admin_broadcast_message_path
(
message
),
method: :delete
,
remote:
true
,
title:
'Remove'
,
class:
'js-remove-tr btn btn-danger
'
%td
.gl-white-space-nowrap
.gl-display-flex
=
link_to
sprite_icon
(
'pencil-square'
,
css_class:
'gl-icon'
),
edit_admin_broadcast_message_path
(
message
),
title:
'Edit'
,
class:
'btn btn-icon gl-butto
n'
=
link_to
sprite_icon
(
'remove'
,
css_class:
'gl-icon'
),
admin_broadcast_message_path
(
message
),
method: :delete
,
remote:
true
,
title:
'Remove'
,
class:
'js-remove-tr btn btn-icon gl-button btn-danger ml-2
'
=
paginate
@broadcast_messages
,
theme:
'gitlab'
app/views/admin/groups/show.html.haml
View file @
61fb6cd7
...
...
@@ -6,8 +6,8 @@
%h3
.page-title
=
_
(
'Group: %{group_name}'
)
%
{
group_name:
@group
.
full_name
}
=
link_to
admin_group_edit_path
(
@group
),
class:
"btn float-right"
,
data:
{
qa_selector:
'edit_group_link'
}
do
%i
.fa.fa-pencil-square-o
=
link_to
admin_group_edit_path
(
@group
),
class:
"btn
btn-default gl-button
float-right"
,
data:
{
qa_selector:
'edit_group_link'
}
do
=
sprite_icon
(
'pencil-square'
,
css_class:
'gl-icon'
)
=
_
(
'Edit'
)
%hr
.row
...
...
@@ -123,7 +123,9 @@
=
_
(
"<strong>%{group_name}</strong> group members"
).
html_safe
%
{
group_name:
@group
.
name
}
%span
.badge.badge-pill
=
@group
.
members
.
size
.float-right
=
link_to
icon
(
'pencil-square-o'
,
text:
_
(
'Manage access'
)),
group_group_members_path
(
@group
),
class:
"btn btn-sm"
=
link_to
group_group_members_path
(
@group
),
class:
'btn btn-default gl-button btn-sm'
do
=
sprite_icon
(
'pencil-square'
,
css_class:
'gl-icon'
)
=
_
(
'Manage access'
)
%ul
.content-list.group-users-list.content-list.members-list
=
render
partial:
'shared/members/member'
,
collection:
@members
,
as: :member
,
locals:
{
show_controls:
false
}
.card-footer
...
...
app/views/admin/projects/show.html.haml
View file @
61fb6cd7
...
...
@@ -6,8 +6,8 @@
.js-remove-member-modal
%h3
.page-title
=
_
(
'Project: %{name}'
)
%
{
name:
@project
.
full_name
}
=
link_to
edit_project_path
(
@project
),
class:
"btn btn-
nr
float-right"
do
%i
.fa.fa-pencil-square-o
=
link_to
edit_project_path
(
@project
),
class:
"btn btn-
default gl-button
float-right"
do
=
sprite_icon
(
'pencil-square'
,
css_class:
'gl-icon'
)
=
_
(
'Edit'
)
%hr
-
if
@project
.
last_repository_check_failed?
...
...
@@ -178,8 +178,9 @@
=
_
(
'group members'
)
%span
.badge.badge-pill
=
@group_members
.
size
.float-right
=
link_to
admin_group_path
(
@group
),
class:
'btn btn-sm'
do
=
icon
(
'pencil-square-o'
,
text:
_
(
'Manage access'
))
=
link_to
admin_group_path
(
@group
),
class:
'btn btn-default gl-button btn-sm'
do
=
sprite_icon
(
'pencil-square'
,
css_class:
'gl-icon'
)
=
_
(
'Manage access'
)
%ul
.content-list.members-list
=
render
partial:
'shared/members/member'
,
collection:
@group_members
,
as: :member
,
locals:
{
show_controls:
false
}
.card-footer
...
...
@@ -193,7 +194,9 @@
=
_
(
'project members'
)
%span
.badge.badge-pill
=
@project
.
users
.
size
.float-right
=
link_to
icon
(
'pencil-square-o'
,
text:
_
(
'Manage access'
)),
project_project_members_path
(
@project
),
class:
"btn btn-sm"
=
link_to
project_project_members_path
(
@project
),
class:
'btn btn-default gl-button btn-sm'
do
=
sprite_icon
(
'pencil-square'
,
css_class:
'gl-icon'
)
=
_
(
'Manage access'
)
%ul
.content-list.project_members.members-list
=
render
partial:
'shared/members/member'
,
collection:
@project_members
,
as: :member
,
locals:
{
show_controls:
false
}
.card-footer
...
...
app/views/admin/users/_head.html.haml
View file @
61fb6cd7
...
...
@@ -12,10 +12,10 @@
.float-right
-
if
impersonation_enabled?
&&
@user
!=
current_user
&&
@user
.
can?
(
:log_in
)
=
link_to
'Impersonate'
,
impersonate_admin_user_path
(
@user
),
method: :post
,
class:
"btn btn-
nr btn-grouped btn-info
"
,
data:
{
qa_selector:
'impersonate_user_link'
}
=
link_to
edit_admin_user_path
(
@user
),
class:
"btn btn-
nr
btn-grouped"
do
%i
.fa.fa-pencil-square-o
Edit
=
link_to
'Impersonate'
,
impersonate_admin_user_path
(
@user
),
method: :post
,
class:
"btn btn-
info gl-button btn-grouped
"
,
data:
{
qa_selector:
'impersonate_user_link'
}
=
link_to
edit_admin_user_path
(
@user
),
class:
"btn btn-
default gl-button
btn-grouped"
do
=
sprite_icon
(
'pencil-square'
,
css_class:
'gl-icon'
)
=
_
(
'Edit'
)
%hr
%ul
.nav-links.nav.nav-tabs
=
nav_link
(
path:
'users#show'
)
do
...
...
changelogs/unreleased/225944-replace-fa-pencil-square-o-icons-with-gitlab-svg-pencil-square-ico.yml
0 → 100644
View file @
61fb6cd7
---
title
:
Replace fa-pencil-square-o icons with GitLab SVG icons
merge_request
:
36059
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