Change star, filter and settings icons to the their sprite based replacements
This commit is contained in:
parent
9fefb6c2be
commit
e882455a9d
|
@ -4,9 +4,11 @@ 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 Icon from '../../vue_shared/components/icon.vue';
|
||||
|
||||
export default {
|
||||
components: {
|
||||
Icon,
|
||||
PopupDialog,
|
||||
},
|
||||
directives: {
|
||||
|
@ -63,9 +65,9 @@ export default {
|
|||
:aria-label="editBtnTitle"
|
||||
data-container="body"
|
||||
class="edit-group btn no-expand">
|
||||
<i
|
||||
class="fa fa-cogs"
|
||||
aria-hidden="true"/>
|
||||
<icon
|
||||
name="settings">
|
||||
</icon>
|
||||
</a>
|
||||
<a
|
||||
v-tooltip
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
import Flash from './flash';
|
||||
import { __, s__ } from './locale';
|
||||
import { spriteIcon } from './lib/utils/common_utils';
|
||||
|
||||
export default class Star {
|
||||
constructor() {
|
||||
|
@ -7,16 +8,18 @@ export default class Star {
|
|||
.on('ajax:success', function handleSuccess(e, data) {
|
||||
const $this = $(this);
|
||||
const $starSpan = $this.find('span');
|
||||
const $starIcon = $this.find('i');
|
||||
const $startIcon = $this.find('svg');
|
||||
|
||||
function toggleStar(isStarred) {
|
||||
$this.parent().find('.star-count').text(data.star_count);
|
||||
if (isStarred) {
|
||||
$starSpan.removeClass('starred').text(s__('StarProject|Star'));
|
||||
$starIcon.removeClass('fa-star').addClass('fa-star-o');
|
||||
$startIcon.remove();
|
||||
$this.prepend(spriteIcon('star-o'));
|
||||
} else {
|
||||
$starSpan.addClass('starred').text(__('Unstar'));
|
||||
$starIcon.removeClass('fa-star-o').addClass('fa-star');
|
||||
$startIcon.remove();
|
||||
$this.prepend(spriteIcon('star'));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
- if current_user
|
||||
= link_to toggle_star_project_path(@project), { class: 'btn star-btn toggle-star', method: :post, remote: true } do
|
||||
- if current_user.starred?(@project)
|
||||
= icon('star')
|
||||
= sprite_icon('star')
|
||||
%span.starred= _('Unstar')
|
||||
- else
|
||||
= icon('star-o')
|
||||
= sprite_icon('star-o')
|
||||
%span= s_('StarProject|Star')
|
||||
.count-with-arrow
|
||||
%span.arrow
|
||||
|
@ -13,7 +13,7 @@
|
|||
|
||||
- else
|
||||
= link_to new_user_session_path, class: 'btn has-tooltip star-btn', title: _('You must sign in to star a project') do
|
||||
= icon('star')
|
||||
= sprite_icon('star')
|
||||
#{ s_('StarProject|Star') }
|
||||
.count-with-arrow
|
||||
%span.arrow
|
||||
|
|
|
@ -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')
|
||||
|
|
Loading…
Reference in New Issue