Commit 15c747b6 authored by David O'Regan's avatar David O'Regan Committed by Natalia Tepluhina

GitLab UI integration branch for 1455-flex-rename

parent 45186341
...@@ -93,7 +93,7 @@ export default { ...@@ -93,7 +93,7 @@ export default {
placement="top" placement="top"
class="trigger-description gl-display-flex" class="trigger-description gl-display-flex"
> >
<div class="gl-flex-fill-1 gl-text-truncate">{{ item.description }}</div> <div class="gl-flex-grow-1 gl-text-truncate">{{ item.description }}</div>
</tooltip-on-truncate> </tooltip-on-truncate>
</template> </template>
<template #cell(owner)="{ item }"> <template #cell(owner)="{ item }">
......
...@@ -111,7 +111,7 @@ export default { ...@@ -111,7 +111,7 @@ export default {
'gl-text-body! emoji-picker-category-active': index === currentCategory, 'gl-text-body! emoji-picker-category-active': index === currentCategory,
}" }"
type="button" type="button"
class="gl-border-0 gl-border-b-2 gl-border-b-solid gl-flex-fill-1 gl-text-gray-300 gl-pt-3 gl-pb-3 gl-bg-transparent emoji-picker-category-tab" class="gl-border-0 gl-border-b-2 gl-border-b-solid gl-flex-grow-1 gl-text-gray-300 gl-pt-3 gl-pb-3 gl-bg-transparent emoji-picker-category-tab"
:aria-label="category.name" :aria-label="category.name"
@click="scrollToCategory(category.name)" @click="scrollToCategory(category.name)"
> >
......
...@@ -89,7 +89,7 @@ export default { ...@@ -89,7 +89,7 @@ export default {
data-testid="manual-action-link" data-testid="manual-action-link"
@click="onClickAction(action)" @click="onClickAction(action)"
> >
<span class="gl-flex-fill-1">{{ action.name }}</span> <span class="gl-flex-grow-1">{{ action.name }}</span>
<span v-if="action.scheduledAt" class="gl-text-gray-500 float-right"> <span v-if="action.scheduledAt" class="gl-text-gray-500 float-right">
<gl-icon name="clock" /> <gl-icon name="clock" />
{{ remainingTime(action) }} {{ remainingTime(action) }}
......
...@@ -121,7 +121,7 @@ export default { ...@@ -121,7 +121,7 @@ export default {
variant="info" variant="info"
category="secondary" category="secondary"
type="button" type="button"
class="gl-mb-3 gl-flex-fill-1" class="gl-mb-3 gl-flex-grow-1"
>{{ $options.i18n.reviewAppButtonLabel }}</gl-button >{{ $options.i18n.reviewAppButtonLabel }}</gl-button
> >
<gl-button <gl-button
......
...@@ -58,7 +58,7 @@ export default { ...@@ -58,7 +58,7 @@ export default {
<span <span
v-gl-tooltip v-gl-tooltip
:title="environment.name" :title="environment.name"
class="gl-text-truncate gl-ml-2 gl-mr-2 gl-flex-fill" class="gl-text-truncate gl-ml-2 gl-mr-2 gl-flex-grow-1"
> >
{{ environment.name }}? {{ environment.name }}?
</span> </span>
......
...@@ -260,7 +260,7 @@ export default { ...@@ -260,7 +260,7 @@ export default {
</template> </template>
<div v-else class="px-3">{{ __("You don't have any recent searches") }}</div> <div v-else class="px-3">{{ __("You don't have any recent searches") }}</div>
</gl-dropdown> </gl-dropdown>
<div class="filtered-search-input-container gl-flex-fill-1"> <div class="filtered-search-input-container gl-flex-grow-1">
<gl-form-input <gl-form-input
v-model="errorSearchQuery" v-model="errorSearchQuery"
class="pl-2 filtered-search" class="pl-2 filtered-search"
......
...@@ -157,7 +157,7 @@ export default { ...@@ -157,7 +157,7 @@ export default {
:text="importTarget.target_namespace" :text="importTarget.target_namespace"
:disabled="isAlreadyImported" :disabled="isAlreadyImported"
toggle-class="gl-rounded-top-right-none! gl-rounded-bottom-right-none!" toggle-class="gl-rounded-top-right-none! gl-rounded-bottom-right-none!"
class="import-entities-namespace-dropdown gl-h-7 gl-flex-fill-1" class="import-entities-namespace-dropdown gl-h-7 gl-flex-grow-1"
data-qa-selector="target_namespace_selector_dropdown" data-qa-selector="target_namespace_selector_dropdown"
> >
<gl-dropdown-item @click="$emit('update-target-namespace', '')">{{ <gl-dropdown-item @click="$emit('update-target-namespace', '')">{{
...@@ -184,7 +184,7 @@ export default { ...@@ -184,7 +184,7 @@ export default {
> >
/ /
</div> </div>
<div class="gl-flex-fill-1"> <div class="gl-flex-grow-1">
<gl-form-input <gl-form-input
class="gl-rounded-top-left-none gl-rounded-bottom-left-none" class="gl-rounded-top-left-none gl-rounded-bottom-left-none"
:class="{ 'is-invalid': isInvalid && !isAlreadyImported }" :class="{ 'is-invalid': isInvalid && !isAlreadyImported }"
......
...@@ -36,7 +36,7 @@ export default { ...@@ -36,7 +36,7 @@ export default {
<template> <template>
<div class="top-area"> <div class="top-area">
<gl-tabs <gl-tabs
class="gl-display-flex gl-flex-fill-1 gl-p-0 gl-m-0 mobile-separator issuable-state-filters" class="gl-display-flex gl-flex-grow-1 gl-p-0 gl-m-0 mobile-separator issuable-state-filters"
nav-class="gl-border-b-0" nav-class="gl-border-b-0"
> >
<gl-tab <gl-tab
......
...@@ -148,7 +148,7 @@ export default { ...@@ -148,7 +148,7 @@ export default {
<template #row-details="{ item }"> <template #row-details="{ item }">
<div <div
class="gl-display-flex gl-flex-direction-column gl-flex-fill-1 gl-bg-gray-10 gl-rounded-base gl-inset-border-1-gray-100" class="gl-display-flex gl-flex-direction-column gl-flex-grow-1 gl-bg-gray-10 gl-rounded-base gl-inset-border-1-gray-100"
> >
<file-sha <file-sha
v-if="item.file_sha256" v-if="item.file_sha256"
......
...@@ -91,7 +91,7 @@ export default { ...@@ -91,7 +91,7 @@ export default {
label-position="hidden" label-position="hidden"
@change="toggleFeature" @change="toggleFeature"
/> />
<div class="select-wrapper gl-flex-fill-1"> <div class="select-wrapper gl-flex-grow-1">
<select <select
:disabled="displaySelectInput" :disabled="displaySelectInput"
class="form-control project-repo-select select-control" class="form-control project-repo-select select-control"
......
...@@ -381,7 +381,7 @@ export default { ...@@ -381,7 +381,7 @@ export default {
:label="s__('ProjectSettings|Project visibility')" :label="s__('ProjectSettings|Project visibility')"
> >
<div class="project-feature-controls gl-display-flex gl-align-items-center gl-my-3 gl-mx-0"> <div class="project-feature-controls gl-display-flex gl-align-items-center gl-my-3 gl-mx-0">
<div class="select-wrapper gl-flex-fill-1"> <div class="select-wrapper gl-flex-grow-1">
<select <select
v-model="visibilityLevel" v-model="visibilityLevel"
:disabled="!canChangeVisibilityLevel" :disabled="!canChangeVisibilityLevel"
......
...@@ -61,7 +61,7 @@ export default { ...@@ -61,7 +61,7 @@ export default {
<span :class="severityClass" class="gl-mr-5" data-testid="codequality-severity-icon"> <span :class="severityClass" class="gl-mr-5" data-testid="codequality-severity-icon">
<gl-icon v-tooltip="severityLabel" :name="severityIcon" :size="12" /> <gl-icon v-tooltip="severityLabel" :name="severityIcon" :size="12" />
</span> </span>
<div class="gl-flex-fill-1"> <div class="gl-flex-grow-1">
<div> <div>
<strong v-if="isStatusSuccess">{{ s__('ciReport|Fixed:') }}</strong> <strong v-if="isStatusSuccess">{{ s__('ciReport|Fixed:') }}</strong>
{{ issueName }} {{ issueName }}
......
...@@ -48,7 +48,7 @@ export default { ...@@ -48,7 +48,7 @@ export default {
<template> <template>
<gl-form class="search-page-form" @submit.prevent="applyQuery"> <gl-form class="search-page-form" @submit.prevent="applyQuery">
<section class="gl-lg-display-flex gl-align-items-flex-end"> <section class="gl-lg-display-flex gl-align-items-flex-end">
<div class="gl-flex-fill-1 gl-mb-4 gl-lg-mb-0 gl-lg-mr-2"> <div class="gl-flex-grow-1 gl-mb-4 gl-lg-mb-0 gl-lg-mr-2">
<label>{{ __('What are you searching for?') }}</label> <label>{{ __('What are you searching for?') }}</label>
<gl-search-box-by-type <gl-search-box-by-type
id="dashboard_search" id="dashboard_search"
......
...@@ -75,7 +75,7 @@ export default { ...@@ -75,7 +75,7 @@ export default {
</template> </template>
</gl-sprintf> </gl-sprintf>
</div> </div>
<div class="gl-flex-fill-1 gl-ml-7"> <div class="gl-flex-grow-1 gl-ml-7">
<gl-form-group <gl-form-group
label-for="user-list-name" label-for="user-list-name"
:label="$options.translations.nameLabel" :label="$options.translations.nameLabel"
......
...@@ -51,7 +51,7 @@ export default { ...@@ -51,7 +51,7 @@ export default {
<gl-icon :name="iconName" :size="24" /> <gl-icon :name="iconName" :size="24" />
</span> </span>
<div class="gl-display-flex gl-flex-fill-1 gl-flex-direction-column gl-md-flex-direction-row"> <div class="gl-display-flex gl-flex-grow-1 gl-flex-direction-column gl-md-flex-direction-row">
<slot name="header"></slot> <slot name="header"></slot>
<div> <div>
......
...@@ -160,7 +160,7 @@ export default { ...@@ -160,7 +160,7 @@ export default {
<div class="ci-widget media"> <div class="ci-widget media">
<template v-if="hasCIError"> <template v-if="hasCIError">
<gl-icon name="status_failed" class="gl-text-red-500" :size="24" /> <gl-icon name="status_failed" class="gl-text-red-500" :size="24" />
<p class="gl-flex-fill-1 gl-ml-5 gl-mb-0" data-testid="ci-error-message"> <p class="gl-flex-grow-1 gl-ml-5 gl-mb-0" data-testid="ci-error-message">
<gl-sprintf :message="$options.errorText"> <gl-sprintf :message="$options.errorText">
<template #link="{ content }"> <template #link="{ content }">
<gl-link :href="mrTroubleshootingDocsPath">{{ content }}</gl-link> <gl-link :href="mrTroubleshootingDocsPath">{{ content }}</gl-link>
...@@ -171,7 +171,7 @@ export default { ...@@ -171,7 +171,7 @@ export default {
<template v-else-if="!hasPipeline"> <template v-else-if="!hasPipeline">
<gl-loading-icon size="md" /> <gl-loading-icon size="md" />
<p <p
class="gl-flex-fill-1 gl-display-flex gl-ml-5 gl-mb-0" class="gl-flex-grow-1 gl-display-flex gl-ml-5 gl-mb-0"
data-testid="monitoring-pipeline-message" data-testid="monitoring-pipeline-message"
> >
{{ $options.monitoringPipelineText }} {{ $options.monitoringPipelineText }}
......
...@@ -107,7 +107,7 @@ export default { ...@@ -107,7 +107,7 @@ export default {
<template #header> <template #header>
<div <div
data-testid="terraform-header-text" data-testid="terraform-header-text"
class="gl-flex-fill-1 gl-display-flex gl-flex-direction-column" class="gl-flex-grow-1 gl-display-flex gl-flex-direction-column"
> >
<p v-if="validPlanCountText" class="gl-m-0"> <p v-if="validPlanCountText" class="gl-m-0">
<gl-sprintf :message="validPlanCountText"> <gl-sprintf :message="validPlanCountText">
......
...@@ -71,8 +71,8 @@ export default { ...@@ -71,8 +71,8 @@ export default {
<gl-icon :name="iconType" :size="16" data-testid="change-type-icon" /> <gl-icon :name="iconType" :size="16" data-testid="change-type-icon" />
</span> </span>
<div class="gl-display-flex gl-flex-fill-1 gl-flex-direction-column flex-md-row gl-pl-3"> <div class="gl-display-flex gl-flex-grow-1 gl-flex-direction-column flex-md-row gl-pl-3">
<div class="gl-flex-fill-1 gl-display-flex gl-flex-direction-column gl-pr-3"> <div class="gl-flex-grow-1 gl-display-flex gl-flex-direction-column gl-pr-3">
<p class="gl-mb-3 gl-line-height-normal"> <p class="gl-mb-3 gl-line-height-normal">
<gl-sprintf :message="reportHeaderText"> <gl-sprintf :message="reportHeaderText">
<template #name> <template #name>
......
...@@ -62,7 +62,7 @@ export default { ...@@ -62,7 +62,7 @@ export default {
<slot name="left-action"></slot> <slot name="left-action"></slot>
</div> </div>
<div <div
class="gl-display-flex gl-xs-flex-direction-column gl-justify-content-space-between gl-align-items-stretch gl-flex-fill-1" class="gl-display-flex gl-xs-flex-direction-column gl-justify-content-space-between gl-align-items-stretch gl-flex-grow-1"
> >
<div class="gl-display-flex gl-flex-direction-column gl-xs-mb-3 gl-min-w-0 gl-flex-grow-1"> <div class="gl-display-flex gl-flex-direction-column gl-xs-mb-3 gl-min-w-0 gl-flex-grow-1">
<div <div
...@@ -81,7 +81,7 @@ export default { ...@@ -81,7 +81,7 @@ export default {
</div> </div>
<div <div
v-if="$slots['left-secondary']" v-if="$slots['left-secondary']"
class="gl-display-flex gl-align-items-center gl-text-gray-500 gl-min-h-6 gl-min-w-0 gl-flex-fill-1" class="gl-display-flex gl-align-items-center gl-text-gray-500 gl-min-h-6 gl-min-w-0 gl-flex-grow-1"
> >
<slot name="left-secondary"></slot> <slot name="left-secondary"></slot>
</div> </div>
...@@ -114,7 +114,7 @@ export default { ...@@ -114,7 +114,7 @@ export default {
<div class="gl-w-7"></div> <div class="gl-w-7"></div>
<div <div
v-if="isDetailsShown" v-if="isDetailsShown"
class="gl-display-flex gl-flex-direction-column gl-flex-fill-1 gl-bg-gray-10 gl-rounded-base gl-inset-border-1-gray-100 gl-mb-3" class="gl-display-flex gl-flex-direction-column gl-flex-grow-1 gl-bg-gray-10 gl-rounded-base gl-inset-border-1-gray-100 gl-mb-3"
> >
<div <div
v-for="(row, detailIndex) in detailsSlots" v-for="(row, detailIndex) in detailsSlots"
......
...@@ -109,7 +109,7 @@ export default { ...@@ -109,7 +109,7 @@ export default {
<div class="gl-display-flex gl-p-5 gl-bg-gray-10 gl-border-solid gl-border-1 gl-border-gray-100"> <div class="gl-display-flex gl-p-5 gl-bg-gray-10 gl-border-solid gl-border-1 gl-border-gray-100">
<gl-filtered-search <gl-filtered-search
v-model="internalFilter" v-model="internalFilter"
class="gl-mr-4 gl-flex-fill-1" class="gl-mr-4 gl-flex-grow-1"
:placeholder="__('Filter results')" :placeholder="__('Filter results')"
:available-tokens="tokens" :available-tokens="tokens"
@submit="submitSearch" @submit="submitSearch"
......
...@@ -225,7 +225,7 @@ export default { ...@@ -225,7 +225,7 @@ export default {
<template v-if="!instructionsEmpty"> <template v-if="!instructionsEmpty">
<div class="gl-display-flex"> <div class="gl-display-flex">
<pre <pre
class="gl-bg-gray gl-flex-fill-1 gl-white-space-pre-line" class="gl-bg-gray gl-flex-grow-1 gl-white-space-pre-line"
data-testid="binary-instructions" data-testid="binary-instructions"
>{{ instructions.installInstructions }}</pre >{{ instructions.installInstructions }}</pre
> >
...@@ -241,7 +241,7 @@ export default { ...@@ -241,7 +241,7 @@ export default {
<h5 class="gl-mb-3">{{ $options.i18n.registerRunnerCommand }}</h5> <h5 class="gl-mb-3">{{ $options.i18n.registerRunnerCommand }}</h5>
<div class="gl-display-flex"> <div class="gl-display-flex">
<pre <pre
class="gl-bg-gray gl-flex-fill-1 gl-white-space-pre-line" class="gl-bg-gray gl-flex-grow-1 gl-white-space-pre-line"
data-testid="register-command" data-testid="register-command"
>{{ instructions.registerInstructions }}</pre >{{ instructions.registerInstructions }}</pre
> >
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
.todos-filters .todos-filters
.issues-details-filters.row-content-block.second-block .issues-details-filters.row-content-block.second-block
= form_tag todos_filter_path(without: [:project_id, :author_id, :type, :action_id]), method: :get, class: 'filter-form gl-display-flex gl-flex-direction-column gl-sm-flex-direction-row' do = form_tag todos_filter_path(without: [:project_id, :author_id, :type, :action_id]), method: :get, class: 'filter-form gl-display-flex gl-flex-direction-column gl-sm-flex-direction-row' do
.filter-categories.gl-display-flex.gl-flex-direction-column.gl-md-flex-direction-row.gl-flex-fill-1.gl-flex-wrap.gl-mx-n2 .filter-categories.gl-display-flex.gl-flex-direction-column.gl-md-flex-direction-row.gl-flex-grow-1.gl-flex-wrap.gl-mx-n2
.filter-item.gl-m-2 .filter-item.gl-m-2
- if params[:group_id].present? - if params[:group_id].present?
= hidden_field_tag(:group_id, params[:group_id]) = hidden_field_tag(:group_id, params[:group_id])
......
...@@ -13,5 +13,5 @@ ...@@ -13,5 +13,5 @@
= render "layouts/flash" = render "layouts/flash"
.content-wrapper.hide-when-top-nav-responsive-open{ id: "content-body", class: "d-flex flex-column align-items-stretch" } .content-wrapper.hide-when-top-nav-responsive-open{ id: "content-body", class: "d-flex flex-column align-items-stretch" }
= yield = yield
= render "layouts/nav/top_nav_responsive", class: "gl-flex-fill-1 gl-overflow-y-auto" = render "layouts/nav/top_nav_responsive", class: "gl-flex-grow-1 gl-overflow-y-auto"
= footer_message = footer_message
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
.gl-md-display-flex .gl-md-display-flex
- if %w(issues merge_requests).include?(@scope) - if %w(issues merge_requests).include?(@scope)
#js-search-sidebar{ class: search_bar_classes } #js-search-sidebar{ class: search_bar_classes }
.gl-w-full.gl-flex-fill-1.gl-overflow-x-hidden .gl-w-full.gl-flex-grow-1.gl-overflow-x-hidden
= render partial: "search/results/empty" = render partial: "search/results/empty"
= render_if_exists 'shared/promotions/promote_advanced_search' = render_if_exists 'shared/promotions/promote_advanced_search'
- else - else
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
.results.gl-md-display-flex.gl-mt-3 .results.gl-md-display-flex.gl-mt-3
- if %w(issues merge_requests).include?(@scope) - if %w(issues merge_requests).include?(@scope)
#js-search-sidebar{ class: search_bar_classes } #js-search-sidebar{ class: search_bar_classes }
.gl-w-full.gl-flex-fill-1.gl-overflow-x-hidden .gl-w-full.gl-flex-grow-1.gl-overflow-x-hidden
- if @scope == 'commits' - if @scope == 'commits'
%ul.content-list.commit-list %ul.content-list.commit-list
= render partial: "search/results/commit", collection: @search_objects = render partial: "search/results/commit", collection: @search_objects
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
.wiki-page-header.top-area.has-sidebar-toggle.flex-column.flex-lg-row .wiki-page-header.top-area.has-sidebar-toggle.flex-column.flex-lg-row
= wiki_sidebar_toggle_button = wiki_sidebar_toggle_button
%h3.page-title.gl-flex-fill-1 %h3.page-title.gl-flex-grow-1
= link_to_wiki_page @page = link_to_wiki_page @page
%span.light %span.light
&middot; &middot;
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
.wiki-page-header.top-area.has-sidebar-toggle.flex-column.flex-lg-row .wiki-page-header.top-area.has-sidebar-toggle.flex-column.flex-lg-row
= wiki_sidebar_toggle_button = wiki_sidebar_toggle_button
%h3.page-title.gl-flex-fill-1 %h3.page-title.gl-flex-grow-1
- if @page.persisted? - if @page.persisted?
= link_to_wiki_page @page = link_to_wiki_page @page
%span.light %span.light
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
- add_page_specific_style 'page_bundles/wiki' - add_page_specific_style 'page_bundles/wiki'
.wiki-page-header.top-area.flex-column.flex-lg-row .wiki-page-header.top-area.flex-column.flex-lg-row
%h3.page-title.gl-flex-fill-1 %h3.page-title.gl-flex-grow-1
= s_("Wiki|Wiki Pages") = s_("Wiki|Wiki Pages")
.nav-controls.pb-md-3.pb-lg-0 .nav-controls.pb-md-3.pb-lg-0
......
...@@ -118,7 +118,7 @@ export default { ...@@ -118,7 +118,7 @@ export default {
<template> <template>
<gl-dropdown ref="groupsDropdown" class="dropdown dropdown-groups" toggle-class="gl-shadow-none"> <gl-dropdown ref="groupsDropdown" class="dropdown dropdown-groups" toggle-class="gl-shadow-none">
<template #button-content> <template #button-content>
<div class="gl-display-flex gl-flex-fill-1"> <div class="gl-display-flex gl-flex-grow-1">
<gl-avatar <gl-avatar
v-if="selectedGroup.name" v-if="selectedGroup.name"
:src="selectedGroup.avatar_url" :src="selectedGroup.avatar_url"
......
...@@ -166,7 +166,7 @@ export default { ...@@ -166,7 +166,7 @@ export default {
toggle-class="gl-shadow-none" toggle-class="gl-shadow-none"
> >
<template #button-content> <template #button-content>
<div class="gl-display-flex gl-flex-fill-1"> <div class="gl-display-flex gl-flex-grow-1">
<gl-avatar <gl-avatar
v-if="isOnlyOneProjectSelected" v-if="isOnlyOneProjectSelected"
:src="selectedProjects[0].avatarUrl" :src="selectedProjects[0].avatarUrl"
......
...@@ -60,8 +60,8 @@ export default { ...@@ -60,8 +60,8 @@ export default {
:default-max-date="$options.CURRENT_DATE" :default-max-date="$options.CURRENT_DATE"
:max-date-range="$options.MAX_DATE_RANGE" :max-date-range="$options.MAX_DATE_RANGE"
:same-day-selection="true" :same-day-selection="true"
start-picker-class="gl-mb-5 gl-pr-5 gl-display-flex gl-flex-direction-column gl-lg-flex-direction-row gl-flex-fill-1 gl-lg-align-items-flex-end" start-picker-class="gl-mb-5 gl-pr-5 gl-display-flex gl-flex-direction-column gl-lg-flex-direction-row gl-flex-grow-1 gl-lg-align-items-flex-end"
end-picker-class="gl-mb-5 gl-lg-pr-5 gl-display-flex gl-flex-direction-column gl-lg-flex-direction-row gl-flex-fill-1 gl-lg-align-items-flex-end" end-picker-class="gl-mb-5 gl-lg-pr-5 gl-display-flex gl-flex-direction-column gl-lg-flex-direction-row gl-flex-grow-1 gl-lg-align-items-flex-end"
@input="onInput" @input="onInput"
/> />
</div> </div>
......
...@@ -33,20 +33,20 @@ export default { ...@@ -33,20 +33,20 @@ export default {
class="gl-display-flex gl-sm-flex-direction-column gl-align-items-flex-start gl-h-full gl-w-full" class="gl-display-flex gl-sm-flex-direction-column gl-align-items-flex-start gl-h-full gl-w-full"
> >
<geo-node-verification-info <geo-node-verification-info
class="gl-flex-fill-1 gl-mb-5 gl-md-mb-0 gl-md-mr-5 gl-h-full gl-w-full" class="gl-flex-grow-1 gl-mb-5 gl-md-mb-0 gl-md-mr-5 gl-h-full gl-w-full"
:node="node" :node="node"
/> />
<geo-node-primary-other-info class="gl-flex-fill-1 gl-h-full gl-w-full" :node="node" /> <geo-node-primary-other-info class="gl-flex-grow-1 gl-h-full gl-w-full" :node="node" />
</div> </div>
<div v-else class="gl-display-flex gl-flex-direction-column gl-h-full gl-w-full"> <div v-else class="gl-display-flex gl-flex-direction-column gl-h-full gl-w-full">
<div <div
class="gl-display-flex gl-sm-flex-direction-column gl-align-items-flex-start gl-h-full gl-w-full gl-mb-5" class="gl-display-flex gl-sm-flex-direction-column gl-align-items-flex-start gl-h-full gl-w-full gl-mb-5"
> >
<geo-node-replication-summary <geo-node-replication-summary
class="gl-flex-fill-1 gl-mb-5 gl-md-mb-0 gl-md-mr-5 gl-h-full gl-w-full" class="gl-flex-grow-1 gl-mb-5 gl-md-mb-0 gl-md-mr-5 gl-h-full gl-w-full"
:node="node" :node="node"
/> />
<geo-node-secondary-other-info class="gl-flex-fill-1 gl-h-full gl-w-full" :node="node" /> <geo-node-secondary-other-info class="gl-flex-grow-1 gl-h-full gl-w-full" :node="node" />
</div> </div>
<geo-node-replication-details :node="node" /> <geo-node-replication-details :node="node" />
</div> </div>
......
...@@ -89,22 +89,22 @@ export default { ...@@ -89,22 +89,22 @@ export default {
<section> <section>
<div class="gl-display-flex gl-align-items-center gl-my-3"> <div class="gl-display-flex gl-align-items-center gl-my-3">
<div class="gl-mr-3 gl-bg-transparent gl-w-5 gl-h-2"></div> <div class="gl-mr-3 gl-bg-transparent gl-w-5 gl-h-2"></div>
<span class="gl-flex-fill-1 gl-mr-4">{{ $options.i18n.total }}</span> <span class="gl-flex-grow-1 gl-mr-4">{{ $options.i18n.total }}</span>
<span class="gl-font-weight-bold">{{ totalCount.toLocaleString() }}</span> <span class="gl-font-weight-bold">{{ totalCount.toLocaleString() }}</span>
</div> </div>
<div class="gl-display-flex gl-align-items-center gl-my-3"> <div class="gl-display-flex gl-align-items-center gl-my-3">
<div class="gl-mr-3 gl-bg-green-500 gl-w-5 gl-h-2"></div> <div class="gl-mr-3 gl-bg-green-500 gl-w-5 gl-h-2"></div>
<span class="gl-flex-fill-1 gl-mr-4">{{ successLabel }}</span> <span class="gl-flex-grow-1 gl-mr-4">{{ successLabel }}</span>
<span class="gl-font-weight-bold">{{ successCount.toLocaleString() }}</span> <span class="gl-font-weight-bold">{{ successCount.toLocaleString() }}</span>
</div> </div>
<div class="gl-display-flex gl-align-items-center gl-my-3"> <div class="gl-display-flex gl-align-items-center gl-my-3">
<div class="gl-mr-3 gl-bg-gray-200 gl-w-5 gl-h-2"></div> <div class="gl-mr-3 gl-bg-gray-200 gl-w-5 gl-h-2"></div>
<span class="gl-flex-fill-1 gl-mr-4">{{ queuedLabel }}</span> <span class="gl-flex-grow-1 gl-mr-4">{{ queuedLabel }}</span>
<span class="gl-font-weight-bold">{{ queuedCount.toLocaleString() }}</span> <span class="gl-font-weight-bold">{{ queuedCount.toLocaleString() }}</span>
</div> </div>
<div class="gl-display-flex gl-align-items-center gl-my-3"> <div class="gl-display-flex gl-align-items-center gl-my-3">
<div class="gl-mr-3 gl-bg-red-500 gl-w-5 gl-h-2"></div> <div class="gl-mr-3 gl-bg-red-500 gl-w-5 gl-h-2"></div>
<span class="gl-flex-fill-1 gl-mr-4">{{ failedLabel }}</span> <span class="gl-flex-grow-1 gl-mr-4">{{ failedLabel }}</span>
<span class="gl-font-weight-bold">{{ failureCount.toLocaleString() }}</span> <span class="gl-font-weight-bold">{{ failureCount.toLocaleString() }}</span>
</div> </div>
</section> </section>
......
...@@ -53,9 +53,9 @@ export default { ...@@ -53,9 +53,9 @@ export default {
<template> <template>
<div> <div>
<div class="gl-display-flex gl-align-items-center gl-mb-3"> <div class="gl-display-flex gl-align-items-center gl-mb-3">
<span class="gl-flex-fill-1">{{ $options.i18n.dataType }}</span> <span class="gl-flex-grow-1">{{ $options.i18n.dataType }}</span>
<span class="gl-flex-fill-1">{{ $options.i18n.synchronization }}</span> <span class="gl-flex-grow-1">{{ $options.i18n.synchronization }}</span>
<span class="gl-flex-fill-1">{{ $options.i18n.verification }}</span> <span class="gl-flex-grow-1">{{ $options.i18n.verification }}</span>
</div> </div>
<div <div
v-for="type in replicationOverview" v-for="type in replicationOverview"
...@@ -63,7 +63,7 @@ export default { ...@@ -63,7 +63,7 @@ export default {
class="gl-display-flex gl-align-items-center gl-mb-3" class="gl-display-flex gl-align-items-center gl-mb-3"
data-testid="replication-type" data-testid="replication-type"
> >
<span class="gl-flex-fill-1" data-testid="replicable-title">{{ type.title }}</span> <span class="gl-flex-grow-1" data-testid="replicable-title">{{ type.title }}</span>
<geo-node-replication-sync-percentage :values="type.sync" /> <geo-node-replication-sync-percentage :values="type.sync" />
<geo-node-replication-sync-percentage :values="type.verification" /> <geo-node-replication-sync-percentage :values="type.verification" />
</div> </div>
......
...@@ -44,7 +44,7 @@ export default { ...@@ -44,7 +44,7 @@ export default {
</script> </script>
<template> <template>
<div class="gl-display-flex gl-align-items-center gl-flex-fill-1"> <div class="gl-display-flex gl-align-items-center gl-flex-grow-1">
<div :class="percentColor" class="gl-rounded-full gl-w-3 gl-h-3 gl-mr-2"></div> <div :class="percentColor" class="gl-rounded-full gl-w-3 gl-h-3 gl-mr-2"></div>
<span class="gl-font-weight-bold"> <span class="gl-font-weight-bold">
{{ percent === null ? $options.i18n.nA : `${percent}%` }} {{ percent === null ? $options.i18n.nA : `${percent}%` }}
......
...@@ -60,15 +60,15 @@ export default { ...@@ -60,15 +60,15 @@ export default {
@click="$emit('collapse')" @click="$emit('collapse')"
/> />
<div <div
class="gl-display-flex gl-flex-direction-column gl-md-flex-direction-row gl-md-align-items-center gl-flex-fill-1" class="gl-display-flex gl-flex-direction-column gl-md-flex-direction-row gl-md-align-items-center gl-flex-grow-1"
> >
<div class="gl-display-flex gl-align-items-center gl-flex-fill-1"> <div class="gl-display-flex gl-align-items-center gl-flex-grow-1">
<gl-badge v-if="node.current" variant="info" class="gl-mr-2">{{ <gl-badge v-if="node.current" variant="info" class="gl-mr-2">{{
$options.i18n.currentNodeLabel $options.i18n.currentNodeLabel
}}</gl-badge> }}</gl-badge>
<h4 class="gl-font-lg">{{ node.name }}</h4> <h4 class="gl-font-lg">{{ node.name }}</h4>
</div> </div>
<div class="gl-display-flex gl-align-items-center gl-flex-fill-2"> <div class="gl-display-flex gl-align-items-center gl-flex-grow-2">
<geo-node-health-status :status="node.healthStatus" /> <geo-node-health-status :status="node.healthStatus" />
<geo-node-last-updated <geo-node-last-updated
v-if="statusCheckTimestamp" v-if="statusCheckTimestamp"
......
...@@ -35,7 +35,7 @@ export default { ...@@ -35,7 +35,7 @@ export default {
}; };
</script> </script>
<template> <template>
<div class="gl-p-5 gl-my-5 gl-bg-gray-10 gl-flex-fill-1 gl-white-space-nowrap" :class="cssClass"> <div class="gl-p-5 gl-my-5 gl-bg-gray-10 gl-flex-grow-1 gl-white-space-nowrap" :class="cssClass">
<p class="mb-2"> <p class="mb-2">
<gl-sprintf :message="__('%{size} %{unit}')"> <gl-sprintf :message="__('%{size} %{unit}')">
<template #size> <template #size>
......
...@@ -159,7 +159,7 @@ export default { ...@@ -159,7 +159,7 @@ export default {
<gl-loading-icon v-if="isLoadingGrades" size="lg" class="gl-my-12" /> <gl-loading-icon v-if="isLoadingGrades" size="lg" class="gl-my-12" />
<accordion <accordion
v-else v-else
class="security-dashboard-accordion gl-px-5 gl-display-flex gl-flex-fill-1 gl-border-t-1 gl-border-t-solid gl-border-t-gray-100" class="security-dashboard-accordion gl-px-5 gl-display-flex gl-flex-grow-1 gl-border-t-1 gl-border-t-solid gl-border-t-gray-100"
> >
<template #default="{ accordionId }"> <template #default="{ accordionId }">
<accordion-item <accordion-item
......
...@@ -121,7 +121,7 @@ export default { ...@@ -121,7 +121,7 @@ export default {
><b>{{ selectedVulnerabilitiesCount }}</b> {{ $options.i18n.selected }}</span ><b>{{ selectedVulnerabilitiesCount }}</b> {{ $options.i18n.selected }}</span
> >
</div> </div>
<div class="gl-flex-fill-1 gl-ml-6 gl-mr-4"> <div class="gl-flex-grow-1 gl-ml-6 gl-mr-4">
<status-dropdown @change="handleStatusDropdownChange" /> <status-dropdown @change="handleStatusDropdownChange" />
</div> </div>
<template v-if="shouldShowActionButtons"> <template v-if="shouldShowActionButtons">
......
...@@ -35,7 +35,7 @@ export default { ...@@ -35,7 +35,7 @@ export default {
}; };
</script> </script>
<template> <template>
<div class="gl-p-5 gl-my-5 gl-bg-gray-10 gl-flex-fill-1 gl-white-space-nowrap" :class="cssClass"> <div class="gl-p-5 gl-my-5 gl-bg-gray-10 gl-flex-grow-1 gl-white-space-nowrap" :class="cssClass">
<p class="mb-2"> <p class="mb-2">
<gl-sprintf :message="__('%{size} %{unit}')"> <gl-sprintf :message="__('%{size} %{unit}')">
<template #size> <template #size>
......
...@@ -44,7 +44,7 @@ $selection-summary-with-error-height: 118px; ...@@ -44,7 +44,7 @@ $selection-summary-with-error-height: 118px;
.security-dashboard-accordion > ul { .security-dashboard-accordion > ul {
@include gl-display-flex; @include gl-display-flex;
@include gl-flex-fill-1; @include gl-flex-grow-1;
} }
.security-charts > section { .security-charts > section {
......
...@@ -150,7 +150,7 @@ $badge-height: $gl-spacing-scale-7; ...@@ -150,7 +150,7 @@ $badge-height: $gl-spacing-scale-7;
} }
.card-wrapper { .card-wrapper {
@include gl-flex-fill-1; @include gl-flex-grow-1;
@include gl-mb-0; @include gl-mb-0;
@include gl-overflow-hidden; @include gl-overflow-hidden;
@include gl-w-auto; @include gl-w-auto;
......
...@@ -11,7 +11,7 @@ exports[`packages_list_row renders 1`] = ` ...@@ -11,7 +11,7 @@ exports[`packages_list_row renders 1`] = `
<!----> <!---->
<div <div
class="gl-display-flex gl-xs-flex-direction-column gl-justify-content-space-between gl-align-items-stretch gl-flex-fill-1" class="gl-display-flex gl-xs-flex-direction-column gl-justify-content-space-between gl-align-items-stretch gl-flex-grow-1"
> >
<div <div
class="gl-display-flex gl-flex-direction-column gl-xs-mb-3 gl-min-w-0 gl-flex-grow-1" class="gl-display-flex gl-flex-direction-column gl-xs-mb-3 gl-min-w-0 gl-flex-grow-1"
...@@ -42,7 +42,7 @@ exports[`packages_list_row renders 1`] = ` ...@@ -42,7 +42,7 @@ exports[`packages_list_row renders 1`] = `
</div> </div>
<div <div
class="gl-display-flex gl-align-items-center gl-text-gray-500 gl-min-h-6 gl-min-w-0 gl-flex-fill-1" class="gl-display-flex gl-align-items-center gl-text-gray-500 gl-min-h-6 gl-min-w-0 gl-flex-grow-1"
> >
<div <div
class="gl-display-flex" class="gl-display-flex"
......
...@@ -908,10 +908,10 @@ ...@@ -908,10 +908,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@29.34.0": "@gitlab/ui@29.34.1":
version "29.34.0" version "29.34.1"
resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-29.34.0.tgz#c8e9d7411f98537d3153d99b6c614583d4d1285d" resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-29.34.1.tgz#1dfd6864c0c7b325745f28ec708d1f187df3acd8"
integrity sha512-ukEHnvd+4f9M+K4b5EArVygUDbS+kUcsP94f6I7Rvd95TR/LlJXwf6vtFdgdBNbk8W98AzW9GwdlT4hmgWfRdw== integrity sha512-uNS3KNAzDFELq5SkfN7Yg9F8Pc98kcPVaXVhZGvw8JcjyVdLF4AORUbzFBsAtJXOwkWPH8yfBQY7+RVC9wkjGg==
dependencies: dependencies:
"@babel/standalone" "^7.0.0" "@babel/standalone" "^7.0.0"
"@gitlab/vue-toasted" "^1.3.0" "@gitlab/vue-toasted" "^1.3.0"
......
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