diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-20 18:40:28 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-20 18:40:28 +0300 |
commit | b595cb0c1dec83de5bdee18284abe86614bed33b (patch) | |
tree | 8c3d4540f193c5ff98019352f554e921b3a41a72 /app/assets/javascripts/clusters_list | |
parent | 2f9104a328fc8a4bddeaa4627b595166d24671d0 (diff) |
Add latest changes from gitlab-org/gitlab@15-2-stable-eev15.2.0-rc42
Diffstat (limited to 'app/assets/javascripts/clusters_list')
-rw-r--r-- | app/assets/javascripts/clusters_list/components/agent_table.vue | 4 | ||||
-rw-r--r-- | app/assets/javascripts/clusters_list/constants.js | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/clusters_list/components/agent_table.vue b/app/assets/javascripts/clusters_list/components/agent_table.vue index 496baf8cb08..e0e3b961c51 100644 --- a/app/assets/javascripts/clusters_list/components/agent_table.vue +++ b/app/assets/javascripts/clusters_list/components/agent_table.vue @@ -58,7 +58,7 @@ export default { }, computed: { fields() { - const tdClass = 'gl-py-5!'; + const tdClass = 'gl-pt-3! gl-pb-4! gl-vertical-align-middle!'; return [ { key: 'name', @@ -184,7 +184,7 @@ export default { data-testid="cluster-agent-connection-status" > <span :class="$options.AGENT_STATUSES[item.status].class" class="gl-mr-3"> - <gl-icon :name="$options.AGENT_STATUSES[item.status].icon" :size="12" /></span + <gl-icon :name="$options.AGENT_STATUSES[item.status].icon" :size="16" /></span >{{ $options.AGENT_STATUSES[item.status].name }} </span> <gl-tooltip v-if="item.status === 'active'" :target="getStatusCellId(item)" placement="right"> diff --git a/app/assets/javascripts/clusters_list/constants.js b/app/assets/javascripts/clusters_list/constants.js index 10e71513065..7bc8a1a7304 100644 --- a/app/assets/javascripts/clusters_list/constants.js +++ b/app/assets/javascripts/clusters_list/constants.js @@ -145,8 +145,8 @@ export const AGENT_STATUSES = { }, inactive: { name: s__('ClusterAgents|Not connected'), - icon: 'severity-critical', - class: 'text-danger-800', + icon: 'status-alert', + class: 'text-danger-500', tooltip: { title: s__('ClusterAgents|Agent might not be connected to GitLab'), body: sprintf( @@ -159,7 +159,7 @@ export const AGENT_STATUSES = { unused: { name: s__('ClusterAgents|Never connected'), icon: 'status-neutral', - class: 'text-secondary-400', + class: 'text-secondary-500', tooltip: { title: s__('ClusterAgents|Agent never connected to GitLab'), body: s__('ClusterAgents|Make sure you are using a valid token.'), |