diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-10-09 14:16:21 +0200 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-10-30 10:27:46 +0100 |
| commit | 4731eba4c3f1d83296fed47bdbf8675e150c01ca (patch) | |
| tree | fb3d07ec0ee79f6da79180e8bcb0a5a0a6d69723 /app/assets/javascripts/pipelines | |
| parent | d01d509bd8612f9879fa762de8ea3763bcff81cf (diff) | |
| download | gitlab-ce-4731eba4c3f1d83296fed47bdbf8675e150c01ca.tar.gz | |
Update Action Icons
Diffstat (limited to 'app/assets/javascripts/pipelines')
| -rw-r--r-- | app/assets/javascripts/pipelines/components/graph/action_component.vue | 12 | ||||
| -rw-r--r-- | app/assets/javascripts/pipelines/components/graph/dropdown_action_component.vue | 10 |
2 files changed, 4 insertions, 18 deletions
diff --git a/app/assets/javascripts/pipelines/components/graph/action_component.vue b/app/assets/javascripts/pipelines/components/graph/action_component.vue index 59a944f74a9..781cc9222de 100644 --- a/app/assets/javascripts/pipelines/components/graph/action_component.vue +++ b/app/assets/javascripts/pipelines/components/graph/action_component.vue @@ -1,6 +1,5 @@ <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'; /** @@ -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)}`; }, }, }; @@ -59,7 +54,6 @@ :class="cssClass" data-container="body"> <icon - name="stop" - size="16"/> + :name="actionIcon"/> </a> </template> diff --git a/app/assets/javascripts/pipelines/components/graph/dropdown_action_component.vue b/app/assets/javascripts/pipelines/components/graph/dropdown_action_component.vue index 7c3409b1e5e..a9be6e08f2e 100644 --- a/app/assets/javascripts/pipelines/components/graph/dropdown_action_component.vue +++ b/app/assets/javascripts/pipelines/components/graph/dropdown_action_component.vue @@ -37,13 +37,6 @@ directives: { tooltip, }, - - computed: { - actionIconSvg() { - alert('LA'); - return getActionIcon(this.actionIcon); - }, - }, }; </script> <template> @@ -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> |