diff options
| author | Scott Hampton <shampton@gitlab.com> | 2019-04-02 08:58:19 -0700 |
|---|---|---|
| committer | Scott Hampton <shampton@gitlab.com> | 2019-04-04 14:26:10 -0700 |
| commit | 387ec6cde605fe49b2e1977f52c79059770f2943 (patch) | |
| tree | 14a47c3c74e5d30116897bab2d4c85186367fc6e /app/assets/javascripts/reports | |
| parent | 1ddd9eff6dd931b0689743d571b7bf3fccedb979 (diff) | |
| download | gitlab-ce-387ec6cde605fe49b2e1977f52c79059770f2943.tar.gz | |
Backporting EE changes to CE9788-add-generic-metrics-report-type-to-merge-requests-backport
Changes in EE involving ability to size MR widget icons.
Also changing loading icon to medium size.
Diffstat (limited to 'app/assets/javascripts/reports')
| -rw-r--r-- | app/assets/javascripts/reports/components/issue_status_icon.vue | 7 | ||||
| -rw-r--r-- | app/assets/javascripts/reports/components/report_item.vue | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/app/assets/javascripts/reports/components/issue_status_icon.vue b/app/assets/javascripts/reports/components/issue_status_icon.vue index 2946fbc6a1f..04fba43b2f3 100644 --- a/app/assets/javascripts/reports/components/issue_status_icon.vue +++ b/app/assets/javascripts/reports/components/issue_status_icon.vue @@ -13,6 +13,11 @@ export default { type: String, required: true, }, + statusIconSize: { + type: Number, + required: false, + default: 32, + }, }, computed: { iconName() { @@ -45,6 +50,6 @@ export default { }" class="report-block-list-icon" > - <icon :name="iconName" :size="32" /> + <icon :name="iconName" :size="statusIconSize" /> </div> </template> diff --git a/app/assets/javascripts/reports/components/report_item.vue b/app/assets/javascripts/reports/components/report_item.vue index 839e86bdf17..d2106f9ad2e 100644 --- a/app/assets/javascripts/reports/components/report_item.vue +++ b/app/assets/javascripts/reports/components/report_item.vue @@ -24,6 +24,11 @@ export default { type: String, required: true, }, + statusIconSize: { + type: Number, + required: false, + default: 32, + }, isNew: { type: Boolean, required: false, @@ -34,7 +39,7 @@ export default { </script> <template> <li :class="{ 'is-dismissed': issue.isDismissed }" class="report-block-list-issue"> - <issue-status-icon :status="status" class="append-right-5" /> + <issue-status-icon :status="status" :status-icon-size="statusIconSize" class="append-right-5" /> <component :is="component" v-if="component" :issue="issue" :status="status" :is-new="isNew" /> </li> |