Commit 54756729 authored by Jacques Erasmus's avatar Jacques Erasmus

Merge branch 'gitlab-ui-integration-remove-deprecated-utils' into 'master'

Upgrade GitLab UI to v33.0.0

See merge request gitlab-org/gitlab!78667
parents e6f2c523 6c131b5b
...@@ -57,7 +57,7 @@ export default { ...@@ -57,7 +57,7 @@ export default {
'totalClusters', 'totalClusters',
]), ]),
contentAlignClasses() { contentAlignClasses() {
return 'gl-display-flex gl-align-items-center gl-justify-content-end gl-justify-content-md-start'; return 'gl-display-flex gl-align-items-center gl-justify-content-end gl-md-justify-content-start';
}, },
currentPage: { currentPage: {
get() { get() {
......
...@@ -128,7 +128,7 @@ export default { ...@@ -128,7 +128,7 @@ export default {
> >
<template #cell(name)="{ item }"> <template #cell(name)="{ item }">
<div <div
class="gl-display-flex align-items-center gl-justify-content-end gl-justify-content-md-start" class="gl-display-flex align-items-center gl-justify-content-end gl-md-justify-content-start"
data-testid="terraform-states-table-name" data-testid="terraform-states-table-name"
> >
<p class="gl-font-weight-bold gl-m-0 gl-text-gray-900"> <p class="gl-font-weight-bold gl-m-0 gl-text-gray-900">
......
...@@ -90,7 +90,7 @@ export default { ...@@ -90,7 +90,7 @@ export default {
</template> </template>
<div class="row"> <div class="row">
<div <div
class="col-md-5 order-md-last col-12 gl-mt-5 gl-mt-md-n2! gl-pt-md-2 svg-content svg-225" class="col-md-5 order-md-last col-12 gl-mt-5 gl-md-mt-n2! gl-md-pt-2 svg-content svg-225"
> >
<img data-testid="pipeline-image" :src="pipelineSvgPath" /> <img data-testid="pipeline-image" :src="pipelineSvgPath" />
</div> </div>
......
...@@ -201,7 +201,7 @@ export default { ...@@ -201,7 +201,7 @@ export default {
v-if="item.group.latestSnapshot" v-if="item.group.latestSnapshot"
:key="col.key" :key="col.key"
:data-testid="col.testId" :data-testid="col.testId"
class="gl-display-flex gl-align-items-center gl-justify-content-end gl-justify-content-md-start" class="gl-display-flex gl-align-items-center gl-justify-content-end gl-md-justify-content-start"
> >
<span class="gl-w-7 gl-mr-3">{{ item.adoption[col.key].percent }}</span> <span class="gl-w-7 gl-mr-3">{{ item.adoption[col.key].percent }}</span>
<gl-progress-bar <gl-progress-bar
......
- if credential.expires? - if credential.expires?
- expiry_date = credential.expires_at.to_date - expiry_date = credential.expires_at.to_date
- date_classes = 'gl-display-flex gl-align-items-center has-tooltip gl-w-full gl-justify-content-end gl-justify-content-md-start' - date_classes = 'gl-display-flex gl-align-items-center has-tooltip gl-w-full gl-justify-content-end gl-md-justify-content-start'
- if credential.expired? - if credential.expired?
%span{ class: date_classes + ' gl-text-red-500', title: _('This credential has expired'), data: { testid: 'expiry-date-icon' } } %span{ class: date_classes + ' gl-text-red-500', title: _('This credential has expired'), data: { testid: 'expiry-date-icon' } }
......
...@@ -924,10 +924,10 @@ ...@@ -924,10 +924,10 @@
resolved "https://registry.yarnpkg.com/@gitlab/tributejs/-/tributejs-1.0.0.tgz#672befa222aeffc83e7d799b0500a7a4418e59b8" resolved "https://registry.yarnpkg.com/@gitlab/tributejs/-/tributejs-1.0.0.tgz#672befa222aeffc83e7d799b0500a7a4418e59b8"
integrity sha512-nmKw1+hB6MHvlmPz63yPwVs1qQkycHwsKgxpEbzmky16Y6mL4EJMk3w1b8QlOAF/AIAzjCERPhe/R4MJiohbZw== integrity sha512-nmKw1+hB6MHvlmPz63yPwVs1qQkycHwsKgxpEbzmky16Y6mL4EJMk3w1b8QlOAF/AIAzjCERPhe/R4MJiohbZw==
"@gitlab/ui@32.68.0": "@gitlab/ui@33.0.0":
version "32.68.0" version "33.0.0"
resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-32.68.0.tgz#f7c4ebd2f9b3635db16589b289fdda149ca1cbcc" resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-33.0.0.tgz#d41f59e9acc19af84a80fa14c4ac4eff0b8f6ba5"
integrity sha512-rTd0+bNBjPvL1ZMfGEHNoBSZwumu6DMQLBwtPhUaj288nAB4K2xibdhFmsm1yqhnW04VNLyBs9FqKdXRQqFttA== integrity sha512-os2PmiOIdzlYIv0GoFtvTmBXhl8B4rnzPgibHUOiMZf8n9Oye8LNs9+zA1fk5PRur/SVwmS5+0hIFH7Dyqt9hw==
dependencies: dependencies:
"@babel/standalone" "^7.0.0" "@babel/standalone" "^7.0.0"
bootstrap-vue "2.20.1" bootstrap-vue "2.20.1"
......
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