diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-17 03:09:34 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-17 03:09:34 +0300 |
| commit | 28811a419e29bc3388eaf2dded29bcc1b716afd1 (patch) | |
| tree | 5ddf15a597b47674017ebb4d72162dc5aa582770 /app/assets/javascripts/alert_management | |
| parent | aa33f5d5bbdcfff893da23eebd95064b4fa2e453 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/alert_management')
| -rw-r--r-- | app/assets/javascripts/alert_management/components/alert_status.vue | 6 | ||||
| -rw-r--r-- | app/assets/javascripts/alert_management/components/sidebar/sidebar_assignees.vue | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/app/assets/javascripts/alert_management/components/alert_status.vue b/app/assets/javascripts/alert_management/components/alert_status.vue index 8531ca1374e..ff71b348cc9 100644 --- a/app/assets/javascripts/alert_management/components/alert_status.vue +++ b/app/assets/javascripts/alert_management/components/alert_status.vue @@ -101,12 +101,12 @@ export default { @keydown.esc.native="$emit('hide-dropdown')" @hide="$emit('hide-dropdown')" > - <div v-if="isSidebar" class="dropdown-title text-center"> - <span class="alert-title">{{ s__('AlertManagement|Assign status') }}</span> + <div v-if="isSidebar" class="dropdown-title gl-display-flex"> + <span class="alert-title gl-ml-auto">{{ s__('AlertManagement|Assign status') }}</span> <gl-button :aria-label="__('Close')" variant="link" - class="dropdown-title-button dropdown-menu-close" + class="dropdown-title-button dropdown-menu-close gl-ml-auto gl-text-black-normal!" icon="close" @click="$emit('hide-dropdown')" /> diff --git a/app/assets/javascripts/alert_management/components/sidebar/sidebar_assignees.vue b/app/assets/javascripts/alert_management/components/sidebar/sidebar_assignees.vue index 0c97d5b2754..0f354e85e96 100644 --- a/app/assets/javascripts/alert_management/components/sidebar/sidebar_assignees.vue +++ b/app/assets/javascripts/alert_management/components/sidebar/sidebar_assignees.vue @@ -225,12 +225,12 @@ export default { @keydown.esc.native="hideDropdown" @hide="hideDropdown" > - <div class="dropdown-title"> - <span class="alert-title">{{ __('Assign To') }}</span> + <div class="dropdown-title gl-display-flex"> + <span class="alert-title gl-ml-auto">{{ __('Assign To') }}</span> <gl-button :aria-label="__('Close')" variant="link" - class="dropdown-title-button dropdown-menu-close" + class="dropdown-title-button dropdown-menu-close gl-ml-auto gl-text-black-normal!" icon="close" @click="hideDropdown" /> |