Commit ee5225cb authored by Brandon Labuschagne's avatar Brandon Labuschagne

Merge branch 'yo-gl-button-admin' into 'master'

Apply new GitLab UI for buttons in admin settings

See merge request gitlab-org/gitlab!51789
parents b842ce34 fad5858c
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
.settings-header .settings-header
%h4 %h4
= _('External authentication') = _('External authentication')
%button.btn.js-settings-toggle{ type: 'button' } %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
= expanded ? 'Collapse' : 'Expand' = expanded ? 'Collapse' : 'Expand'
%p %p
= _('External Classification Policy Authorization') = _('External Classification Policy Authorization')
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
.settings-header .settings-header
%h4 %h4
= _('Email') = _('Email')
%button.btn.btn-default.js-settings-toggle{ type: 'button' } %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
= expanded_by_default? ? _('Collapse') : _('Expand') = expanded_by_default? ? _('Collapse') : _('Expand')
%p %p
= _('Various email settings.') = _('Various email settings.')
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
.settings-header .settings-header
%h4 %h4
= _('Help page') = _('Help page')
%button.btn.btn-default.js-settings-toggle{ type: 'button' } %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
= expanded_by_default? ? _('Collapse') : _('Expand') = expanded_by_default? ? _('Collapse') : _('Expand')
%p %p
= _('Help page text and support page url.') = _('Help page text and support page url.')
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
.settings-header .settings-header
%h4 %h4
= _('Pages') = _('Pages')
%button.btn.btn-default.js-settings-toggle{ type: 'button' } %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
= expanded_by_default? ? _('Collapse') : _('Expand') = expanded_by_default? ? _('Collapse') : _('Expand')
%p %p
= _('Size and domain settings for static websites') = _('Size and domain settings for static websites')
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
.settings-header .settings-header
%h4 %h4
= _('Real-time features') = _('Real-time features')
%button.btn.btn-default.js-settings-toggle{ type: 'button' } %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
= expanded_by_default? ? _('Collapse') : _('Expand') = expanded_by_default? ? _('Collapse') : _('Expand')
%p %p
= _('Change this value to influence how frequently the GitLab UI polls for updates.') = _('Change this value to influence how frequently the GitLab UI polls for updates.')
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
.settings-header .settings-header
%h4 %h4
= _('Gitaly') = _('Gitaly')
%button.btn.btn-default.js-settings-toggle{ type: 'button' } %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
= expanded_by_default? ? _('Collapse') : _('Expand') = expanded_by_default? ? _('Collapse') : _('Expand')
%p %p
= _('Configure Gitaly timeouts.') = _('Configure Gitaly timeouts.')
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
.settings-header .settings-header
%h4 %h4
= _('Localization') = _('Localization')
%button.btn.btn-default.js-settings-toggle{ type: 'button' } %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
= expanded_by_default? ? _('Collapse') : _('Expand') = expanded_by_default? ? _('Collapse') : _('Expand')
%p %p
= _('Various localization settings.') = _('Various localization settings.')
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
.settings-header .settings-header
%h4 %h4
= _('Spam and Anti-bot Protection') = _('Spam and Anti-bot Protection')
%button.btn.btn-default.js-settings-toggle{ type: 'button' } %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
= expanded_by_default? ? _('Collapse') : _('Expand') = expanded_by_default? ? _('Collapse') : _('Expand')
%p %p
- recaptcha_v2_link_url = 'https://developers.google.com/recaptcha/docs/versions' - recaptcha_v2_link_url = 'https://developers.google.com/recaptcha/docs/versions'
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
.settings-header .settings-header
%h4 %h4
= _('Abuse reports') = _('Abuse reports')
%button.btn.btn-default.js-settings-toggle{ type: 'button' } %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
= expanded_by_default? ? _('Collapse') : _('Expand') = expanded_by_default? ? _('Collapse') : _('Expand')
%p %p
= _('Set notification email for abuse reports.') = _('Set notification email for abuse reports.')
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
.settings-header .settings-header
%h4 %h4
= _('Default initial branch name') = _('Default initial branch name')
%button.gl-button.js-settings-toggle{ type: 'button' } %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
= expanded_by_default? ? _('Collapse') : _('Expand') = expanded_by_default? ? _('Collapse') : _('Expand')
%p %p
= _('Set the default name of the initial branch when creating new repositories through the user interface.') = _('Set the default name of the initial branch when creating new repositories through the user interface.')
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
.settings-header .settings-header
%h4 %h4
= _('Repository mirroring') = _('Repository mirroring')
%button.btn.js-settings-toggle{ type: 'button' } %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
= expanded_by_default? ? 'Collapse' : 'Expand' = expanded_by_default? ? 'Collapse' : 'Expand'
%p %p
= _('Configure repository mirroring.') = _('Configure repository mirroring.')
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
.settings-header .settings-header
%h4 %h4
= _('Repository storage') = _('Repository storage')
%button.btn.btn-default.js-settings-toggle{ type: 'button' } %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
= expanded_by_default? ? _('Collapse') : _('Expand') = expanded_by_default? ? _('Collapse') : _('Expand')
%p %p
= _('Configure storage path settings.') = _('Configure storage path settings.')
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
.settings-header .settings-header
%h4 %h4
= _('Repository maintenance') = _('Repository maintenance')
%button.btn.btn-default.js-settings-toggle{ type: 'button' } %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
= expanded_by_default? ? _('Collapse') : _('Expand') = expanded_by_default? ? _('Collapse') : _('Expand')
%p %p
= _('Configure automatic git checks and housekeeping on repositories.') = _('Configure automatic git checks and housekeeping on repositories.')
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
.settings-header .settings-header
%h4 %h4
= _('Repository static objects') = _('Repository static objects')
%button.btn.btn-default.js-settings-toggle{ type: 'button' } %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
= expanded_by_default? ? _('Collapse') : _('Expand') = expanded_by_default? ? _('Collapse') : _('Expand')
%p %p
= _('Serve repository static objects (e.g. archives, blobs, ...) from an external storage (e.g. a CDN).') = _('Serve repository static objects (e.g. archives, blobs, ...) from an external storage (e.g. a CDN).')
......
---
title: Apply new GitLab UI for buttons in admin settings
merge_request: 51789
author: Yogi (@yo)
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