Skip to content
Snippets Groups Projects
Commit 4731eba4 authored by Tim Zallmann's avatar Tim Zallmann
Browse files

Update Action Icons

parent d01d509b
No related branches found
No related tags found
No related merge requests found
<script>
import getActionIcon from '../../../vue_shared/ci_action_icons';
import tooltip from '../../../vue_shared/directives/tooltip';
import tooltip from '../../../vue_shared/directives/tooltip';
import icon from '../../../vue_shared/components/icon.vue';
 
/**
Loading
Loading
@@ -39,12 +38,8 @@
},
 
computed: {
actionIconSvg() {
return getActionIcon(this.actionIcon);
},
cssClass() {
return `js-${gl.text.dasherize(this.actionIcon)}`;
return `${gl.text.dasherize(this.actionIcon)} js-${gl.text.dasherize(this.actionIcon)}`;
},
},
};
Loading
Loading
@@ -59,7 +54,6 @@
:class="cssClass"
data-container="body">
<icon
name="stop"
size="16"/>
:name="actionIcon"/>
</a>
</template>
Loading
Loading
@@ -37,13 +37,6 @@
directives: {
tooltip,
},
computed: {
actionIconSvg() {
alert('LA');
return getActionIcon(this.actionIcon);
},
},
};
</script>
<template>
Loading
Loading
@@ -56,8 +49,7 @@
class="ci-action-icon-wrapper js-ci-status-icon"
data-container="body"
aria-label="Job's action">
{{actionIcon}}
<icon
name="retry"/>
:name="actionIcon"/>
</a>
</template>
Loading
Loading
@@ -40,7 +40,7 @@
},
fullCssClass() {
let classString = '' || this.cssClass;
// if (this.size) classString += `s${this.size}`
if (this.size) classString += `s${this.size}`
return classString;
},
},
Loading
Loading
Loading
Loading
@@ -734,6 +734,15 @@ button.mini-pipeline-graph-dropdown-toggle {
&:focus svg {
fill: $gl-text-color;
}
&.icon-action-retry,
&.icon-action-play {
svg {
width: calc($ci-action-icon-size-6);
height: calc($ci-action-icon-size-6);
left: 8px;
}
}
}
 
// link to the build
Loading
Loading
Loading
Loading
@@ -8,7 +8,7 @@ module Gitlab
end
 
def action_icon
'icon_action_cancel'
'cancel'
end
 
def action_path
Loading
Loading
Loading
Loading
@@ -8,7 +8,7 @@ module Gitlab
end
 
def icon
'icon_status_warning'
'warning'
end
 
def group
Loading
Loading
Loading
Loading
@@ -12,7 +12,7 @@ module Gitlab
end
 
def action_icon
'icon_action_play'
'play'
end
 
def action_title
Loading
Loading
Loading
Loading
@@ -8,7 +8,7 @@ module Gitlab
end
 
def action_icon
'icon_action_retry'
'retry'
end
 
def action_title
Loading
Loading
Loading
Loading
@@ -12,7 +12,7 @@ module Gitlab
end
 
def action_icon
'icon_action_stop'
'stop'
end
 
def action_title
Loading
Loading
Loading
Loading
@@ -11,7 +11,7 @@ describe('action component', () => {
tooltipText: 'bar',
link: 'foo',
actionMethod: 'post',
actionIcon: 'icon_action_cancel',
actionIcon: 'cancel',
},
}).$mount();
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment