Commit ca2f256e authored by Nicolò Maria Mezzopera's avatar Nicolò Maria Mezzopera

Merge branch '231124-convert-expand-button-to-gl' into 'master'

Convert group settings expand button to gl-button

See merge request gitlab-org/gitlab!49857
parents fbe29308 2cd896dd
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
.settings-header .settings-header
%h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only{ role: 'button' } %h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only{ role: 'button' }
= _('Naming, visibility') = _('Naming, visibility')
%button.btn.js-settings-toggle{ type: 'button' } %button.btn.gl-button.js-settings-toggle{ type: 'button' }
= _('Collapse') = _('Collapse')
%p %p
= _('Update your group name, description, avatar, and visibility.') = _('Update your group name, description, avatar, and visibility.')
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
.settings-header .settings-header
%h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only{ role: 'button' } %h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only{ role: 'button' }
= _('Permissions, LFS, 2FA') = _('Permissions, LFS, 2FA')
%button.btn.js-settings-toggle{ type: 'button' } %button.btn.gl-button.js-settings-toggle{ type: 'button' }
= expanded ? _('Collapse') : _('Expand') = expanded ? _('Collapse') : _('Expand')
%p %p
= _('Advanced permissions, Large File Storage and Two-Factor authentication settings.') = _('Advanced permissions, Large File Storage and Two-Factor authentication settings.')
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
.settings-header .settings-header
%h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only{ role: 'button' } %h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only{ role: 'button' }
= s_('GroupSettings|Badges') = s_('GroupSettings|Badges')
%button.btn.js-settings-toggle{ type: 'button' } %button.btn.gl-button.js-settings-toggle{ type: 'button' }
= expanded ? _('Collapse') : _('Expand') = expanded ? _('Collapse') : _('Expand')
%p %p
= s_('GroupSettings|Customize your group badges.') = s_('GroupSettings|Customize your group badges.')
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
.settings-header .settings-header
%h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only{ role: 'button' } %h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only{ role: 'button' }
= _('Advanced') = _('Advanced')
%button.btn.js-settings-toggle{ type: 'button' } %button.btn.gl-button.js-settings-toggle{ type: 'button' }
= expanded ? _('Collapse') : _('Expand') = expanded ? _('Collapse') : _('Expand')
%p %p
= _('Perform advanced options such as changing path, transferring, exporting, or removing the group.') = _('Perform advanced options such as changing path, transferring, exporting, or removing the group.')
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
.settings-header .settings-header
%h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only{ role: 'button' } %h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only{ role: 'button' }
= _('Pages') = _('Pages')
%button.btn.js-settings-toggle{ type: 'button' } %button.btn.gl-button.js-settings-toggle{ type: 'button' }
= expanded ? _('Collapse') : _('Expand') = expanded ? _('Collapse') : _('Expand')
%p %p
= _('Size settings for static websites') = _('Size settings for static websites')
......
---
title: Convert group settings expand button to gl-button
merge_request: 49857
author:
type: other
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