diff --git a/app/assets/stylesheets/page_bundles/escalation_policies.scss b/app/assets/stylesheets/page_bundles/escalation_policies.scss index 1d07f044e42eac43559f1d265aa4f1554518de8b..74aefe53df80e6800dcda0b0411080fa114a0b99 100644 --- a/app/assets/stylesheets/page_bundles/escalation_policies.scss +++ b/app/assets/stylesheets/page_bundles/escalation_policies.scss @@ -4,10 +4,6 @@ width: 640px; } -.rule-control { - width: 240px; -} - .rule-close-icon { right: 1rem; } diff --git a/ee/app/assets/javascripts/escalation_policies/components/escalation_rule.vue b/ee/app/assets/javascripts/escalation_policies/components/escalation_rule.vue index ac717296a1f4a0752ae3b1e3507369d3b6d5aed6..816dd6fdf52f788d0487e909dc13e82f06769855 100644 --- a/ee/app/assets/javascripts/escalation_policies/components/escalation_rule.vue +++ b/ee/app/assets/javascripts/escalation_policies/components/escalation_rule.vue @@ -221,9 +221,8 @@ export default { <gl-sprintf :message="$options.i18n.fields.rules.condition"> <template #alertStatus> <gl-collapsible-listbox - block data-testid="alert-status-dropdown" - toggle-class="rule-control gl-mx-3" + toggle-class="gl-mx-3" :items="alertStatusesListBoxItems" :selected="status" :toggle-text="$options.ALERT_STATUSES[status]" @@ -245,8 +244,7 @@ export default { <gl-sprintf :message="$options.i18n.fields.rules.action"> <template #doAction> <gl-collapsible-listbox - block - toggle-class="rule-control gl-mx-3" + toggle-class="gl-mx-3" data-testid="action-dropdown" :selected="action" :toggle-text="$options.ACTIONS[action]" @@ -257,9 +255,7 @@ export default { <template #scheduleOrUser> <template v-if="isEmailOncallScheduleUserActionSelected"> <gl-collapsible-listbox - block data-testid="schedules-dropdown" - toggle-class="rule-control" :disabled="noSchedules" :items="schedulesListBoxItems" :selected="oncallScheduleIid" diff --git a/ee/app/assets/javascripts/escalation_policies/components/user_select.vue b/ee/app/assets/javascripts/escalation_policies/components/user_select.vue index 0b75ce2f222ff99fe6644a31b3a840fefa451b00..bf787c2584f1a10703c3ce3334b592063d72586b 100644 --- a/ee/app/assets/javascripts/escalation_policies/components/user_select.vue +++ b/ee/app/assets/javascripts/escalation_policies/components/user_select.vue @@ -98,7 +98,7 @@ export default { <template> <div v-if="selectedUsers.length" - class="rule-control gl-rounded-base gl-px-3 gl-py-2 gl-shadow-inner-1-gray-400" + class="gl-w-30 gl-rounded-base gl-px-3 gl-py-2 gl-shadow-inner-1-gray-400" > <gl-token :style="backgroundStyle" :class="textClass" @close="clearSelectedUsers"> <gl-avatar :src="user.avatarUrl" :size="16" /> @@ -113,7 +113,7 @@ export default { :dropdown-items="users" :loading="loading" :placeholder="placeholderText" - container-class="rule-control" + container-class="gl-w-30" class="escalation-email-user-dropdown" @text-input="filterUsers" @token-add="emitUserUpdate"