Commit 387ec6cd authored by Scott Hampton's avatar Scott Hampton

Backporting EE changes to CE

Changes in EE involving ability to size MR widget icons.
Also changing loading icon to medium size.
parent 1ddd9eff
...@@ -13,6 +13,11 @@ export default { ...@@ -13,6 +13,11 @@ export default {
type: String, type: String,
required: true, required: true,
}, },
statusIconSize: {
type: Number,
required: false,
default: 32,
},
}, },
computed: { computed: {
iconName() { iconName() {
...@@ -45,6 +50,6 @@ export default { ...@@ -45,6 +50,6 @@ export default {
}" }"
class="report-block-list-icon" class="report-block-list-icon"
> >
<icon :name="iconName" :size="32" /> <icon :name="iconName" :size="statusIconSize" />
</div> </div>
</template> </template>
...@@ -24,6 +24,11 @@ export default { ...@@ -24,6 +24,11 @@ export default {
type: String, type: String,
required: true, required: true,
}, },
statusIconSize: {
type: Number,
required: false,
default: 32,
},
isNew: { isNew: {
type: Boolean, type: Boolean,
required: false, required: false,
...@@ -34,7 +39,7 @@ export default { ...@@ -34,7 +39,7 @@ export default {
</script> </script>
<template> <template>
<li :class="{ 'is-dismissed': issue.isDismissed }" class="report-block-list-issue"> <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" /> <component :is="component" v-if="component" :issue="issue" :status="status" :is-new="isNew" />
</li> </li>
......
...@@ -33,7 +33,7 @@ export default { ...@@ -33,7 +33,7 @@ export default {
</script> </script>
<template> <template>
<div class="space-children d-flex append-right-10 widget-status-icon"> <div class="space-children d-flex append-right-10 widget-status-icon">
<div v-if="isLoading" class="mr-widget-icon"><gl-loading-icon /></div> <div v-if="isLoading" class="mr-widget-icon"><gl-loading-icon size="md" /></div>
<ci-icon v-else :status="statusObj" :size="24" /> <ci-icon v-else :status="statusObj" :size="24" />
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment