Commit a1b5d10c authored by Illya Klymov's avatar Illya Klymov

Merge branch '232947-follow-up-from-remove-page-heading-in-feature-flags-empty-state' into 'master'

Update FF nav section using GitLab UI Utilities

See merge request gitlab-org/gitlab!38768
parents 01800af5 3a3f0aed
...@@ -125,6 +125,32 @@ export default { ...@@ -125,6 +125,32 @@ export default {
'isRotating', 'isRotating',
'hasRotateError', 'hasRotateError',
]), ]),
secondaryButtonClasses() {
return ['gl-mb-3', 'gl-lg-mr-3', 'gl-lg-mb-0'];
},
navigationControlsClasses() {
return [
'gl-display-flex',
'gl-flex-direction-column',
'gl-mt-3',
'gl-lg-flex-direction-row',
'gl-lg-flex-fill-1',
'gl-lg-justify-content-end',
'gl-lg-mt-0',
];
},
topAreaBaseClasses() {
return [
'gl-border-1',
'gl-border-b-gray-100',
'gl-border-b-solid',
'gl-flex-wrap',
'gl-display-flex',
'gl-flex-direction-column-reverse',
'gl-lg-align-items-center',
'gl-lg-flex-direction-row',
];
},
canUserRotateToken() { canUserRotateToken() {
return this.rotateInstanceIdPath !== ''; return this.rotateInstanceIdPath !== '';
}, },
...@@ -252,9 +278,14 @@ export default { ...@@ -252,9 +278,14 @@ export default {
modal-id="configure-feature-flags" modal-id="configure-feature-flags"
@token="rotateInstanceId()" @token="rotateInstanceId()"
/> />
<div class="top-area"> <div :class="topAreaBaseClasses">
<navigation-tabs :tabs="tabs" scope="featureflags" @onChangeTab="onChangeTab" /> <navigation-tabs
<div class="nav-controls"> :tabs="tabs"
scope="featureflags"
class="gl-border-none!"
@onChangeTab="onChangeTab"
/>
<div :class="navigationControlsClasses">
<gl-button <gl-button
v-if="canUserConfigure" v-if="canUserConfigure"
v-gl-modal="'configure-feature-flags'" v-gl-modal="'configure-feature-flags'"
...@@ -262,7 +293,7 @@ export default { ...@@ -262,7 +293,7 @@ export default {
category="secondary" category="secondary"
data-qa-selector="configure_feature_flags_button" data-qa-selector="configure_feature_flags_button"
data-testid="ff-configure-button" data-testid="ff-configure-button"
class="gl-mr-3" :class="secondaryButtonClasses"
> >
{{ s__('FeatureFlags|Configure') }} {{ s__('FeatureFlags|Configure') }}
</gl-button> </gl-button>
...@@ -272,7 +303,7 @@ export default { ...@@ -272,7 +303,7 @@ export default {
:href="newUserListPath" :href="newUserListPath"
variant="success" variant="success"
category="secondary" category="secondary"
class="gl-mr-3" :class="secondaryButtonClasses"
data-testid="ff-new-list-button" data-testid="ff-new-list-button"
> >
{{ s__('FeatureFlags|New list') }} {{ s__('FeatureFlags|New list') }}
......
---
title: Update FF nav section using GitLab UI Utilities
merge_request: 38768
author:
type: changed
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