diff options
author | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-11-15 16:43:23 -0600 |
---|---|---|
committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-11-16 12:38:56 -0600 |
commit | dba4a22fd2cfeb59e089ff2092c98d8778dab536 (patch) | |
tree | 41b1515eae6f1cc2733ddf456ce9dbbe51002068 | |
parent | 4398736072654897ee0e2b6f4d3a87cc5ecf19f5 (diff) | |
download | gitlab-ce-jivl-general-icons.tar.gz |
Replaced the cogs icon with the sprite settings iconjivl-general-icons
-rw-r--r-- | app/assets/javascripts/groups/components/item_actions.vue | 10 | ||||
-rw-r--r-- | app/views/shared/groups/_group.html.haml | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/app/assets/javascripts/groups/components/item_actions.vue b/app/assets/javascripts/groups/components/item_actions.vue index 7eff19e2e5a..9d24cf4551d 100644 --- a/app/assets/javascripts/groups/components/item_actions.vue +++ b/app/assets/javascripts/groups/components/item_actions.vue @@ -4,6 +4,7 @@ import tooltip from '../../vue_shared/directives/tooltip'; import PopupDialog from '../../vue_shared/components/popup_dialog.vue'; import eventHub from '../event_hub'; import { COMMON_STR } from '../constants'; +import { spriteIcon } from '../../lib/utils/common_utils'; export default { components: { @@ -38,6 +39,9 @@ export default { leaveConfirmationMessage() { return s__(`GroupsTree|Are you sure you want to leave the "${this.group.fullName}" group?`); }, + settingsIcon() { + return spriteIcon('settings'); + }, }, methods: { onLeaveGroup() { @@ -62,10 +66,8 @@ export default { :title="editBtnTitle" :aria-label="editBtnTitle" data-container="body" - class="edit-group btn no-expand"> - <i - class="fa fa-cogs" - aria-hidden="true"/> + class="edit-group btn no-expand" + v-html="settingsIcon"> </a> <a v-tooltip diff --git a/app/views/shared/groups/_group.html.haml b/app/views/shared/groups/_group.html.haml index 059dd24be6d..321d8767d08 100644 --- a/app/views/shared/groups/_group.html.haml +++ b/app/views/shared/groups/_group.html.haml @@ -9,7 +9,7 @@ .controls.hidden-xs - if can?(current_user, :admin_group, group) = link_to edit_group_path(group), class: "btn" do - = icon('cogs') + = sprite_icon('settings') = link_to leave_group_group_members_path(group), data: { confirm: leave_confirmation_message(group) }, method: :delete, class: "btn", title: s_("GroupsTree|Leave this group") do = icon('sign-out') |