diff options
| author | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-11-16 13:34:15 -0600 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-12-19 12:44:46 -0600 |
| commit | a623ddb0dcdc42b0bd4f9d20c79e82387d9b5547 (patch) | |
| tree | 6768bbb26c1d20c06ca88eab1b6c43ec98787f0b /app/assets | |
| parent | c034594f2c19461baf8034aeb52dbf17e694fc21 (diff) | |
| download | gitlab-ce-a623ddb0dcdc42b0bd4f9d20c79e82387d9b5547.tar.gz | |
replaced download icon for the sprite based one
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/pipelines/components/pipelines_artifacts.vue | 11 | ||||
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js | 7 |
2 files changed, 12 insertions, 6 deletions
diff --git a/app/assets/javascripts/pipelines/components/pipelines_artifacts.vue b/app/assets/javascripts/pipelines/components/pipelines_artifacts.vue index 751a20991af..fada8fd90df 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_artifacts.vue +++ b/app/assets/javascripts/pipelines/components/pipelines_artifacts.vue @@ -1,5 +1,6 @@ <script> import tooltip from '../../vue_shared/directives/tooltip'; + import Icon from '../../vue_shared/components/icon.vue'; export default { props: { @@ -11,6 +12,9 @@ directives: { tooltip, }, + components: { + Icon, + }, }; </script> <template> @@ -24,10 +28,9 @@ data-placement="top" data-toggle="dropdown" aria-label="Artifacts"> - <i - class="fa fa-download" - aria-hidden="true"> - </i> + <icon + name="download"> + </icon> <i class="fa fa-caret-down" aria-hidden="true"> diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js index 13e4cb5717e..1f8bd2646ea 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js +++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js @@ -1,5 +1,6 @@ import tooltip from '../../vue_shared/directives/tooltip'; import { pluralize } from '../../lib/utils/text_utility'; +import { spriteIcon } from '../../lib/utils/common_utils'; export default { name: 'MRWidgetHeader', @@ -25,6 +26,9 @@ export default { gfm: `\`${this.mr.sourceBranch}\``, }); }, + downloadIcon() { + return spriteIcon('download'); + }, }, methods: { isBranchTitleLong(branchTitle) { @@ -82,8 +86,7 @@ export default { aria-label="Download as" role="button"> <i - class="fa fa-download" - aria-hidden="true"> + v-html="downloadIcon"> </i> <i class="fa fa-caret-down" |