diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-20 12:40:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-20 12:40:42 +0300 |
commit | ee664acb356f8123f4f6b00b73c1e1cf0866c7fb (patch) | |
tree | f8479f94a28f66654c6a4f6fb99bad6b4e86a40e /app/assets/javascripts/clusters | |
parent | 62f7d5c5b69180e82ae8196b7b429eeffc8e7b4f (diff) |
Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42
Diffstat (limited to 'app/assets/javascripts/clusters')
3 files changed, 8 insertions, 12 deletions
diff --git a/app/assets/javascripts/clusters/agents/components/activity_events_list.vue b/app/assets/javascripts/clusters/agents/components/activity_events_list.vue index 18c6503bfb2..ca65665b9ed 100644 --- a/app/assets/javascripts/clusters/agents/components/activity_events_list.vue +++ b/app/assets/javascripts/clusters/agents/components/activity_events_list.vue @@ -132,11 +132,7 @@ export default { :key="key" class="agent-activity-list issuable-discussion" > - <h4 - class="gl-pb-4 gl-ml-5" - :class="$options.borderClasses" - data-testid="activity-section-title" - > + <h4 class="gl-pb-4" :class="$options.borderClasses" data-testid="activity-section-title"> {{ key }} </h4> diff --git a/app/assets/javascripts/clusters/agents/components/activity_history_item.vue b/app/assets/javascripts/clusters/agents/components/activity_history_item.vue index 7792d89a575..ed11fe1130d 100644 --- a/app/assets/javascripts/clusters/agents/components/activity_history_item.vue +++ b/app/assets/javascripts/clusters/agents/components/activity_history_item.vue @@ -45,8 +45,8 @@ export default { }; </script> <template> - <history-item :icon="eventDetails.eventTypeIcon" class="gl-my-0! gl-pr-0!"> - <strong> + <history-item :icon="eventDetails.eventTypeIcon" class="gl-my-0! gl-px-0! gl-pb-0!"> + <strong class="gl-pl-3 gl-font-lg"> <gl-sprintf :message="eventDetails.title" ><template v-if="eventDetails.titleIcon" #titleIcon ><gl-icon @@ -61,15 +61,15 @@ export default { </strong> <template #body> - <p class="gl-mt-2 gl-mb-0 gl-pb-2" :class="bodyClass"> + <p class="gl-mt-2 gl-mb-0 gl-ml-3 gl-pb-3 gl-text-secondary" :class="bodyClass"> <gl-sprintf :message="eventDetails.body"> <template #userName> - <span class="gl-font-weight-bold">{{ eventDetails.user.name }}</span> + <span class="gl-font-weight-bold gl-text-body">{{ eventDetails.user.name }}</span> <gl-link :href="eventDetails.user.webUrl">@{{ eventDetails.user.username }}</gl-link> </template> <template #strong="{ content }"> - <span class="gl-font-weight-bold"> {{ content }} </span> + <span class="gl-font-weight-bold gl-text-body"> {{ content }} </span> </template> </gl-sprintf> <time-ago-tooltip :time="eventDetails.recordedAt" /> diff --git a/app/assets/javascripts/clusters/clusters_bundle.js b/app/assets/javascripts/clusters/clusters_bundle.js index a8fef372637..21524c5b29e 100644 --- a/app/assets/javascripts/clusters/clusters_bundle.js +++ b/app/assets/javascripts/clusters/clusters_bundle.js @@ -1,7 +1,7 @@ import { GlToast } from '@gitlab/ui'; import Visibility from 'visibilityjs'; import Vue from 'vue'; -import createFlash from '~/flash'; +import { createAlert } from '~/flash'; import AccessorUtilities from '~/lib/utils/accessor'; import initProjectSelectDropdown from '~/project_select'; import Poll from '~/lib/utils/poll'; @@ -196,7 +196,7 @@ export default class Clusters { } static handleError() { - createFlash({ + createAlert({ message: s__('ClusterIntegration|Something went wrong on our end.'), }); } |