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

Merge branch '231181-apply-gitlab-ui-styles-3' into 'master'

Apply gl-button class to buttons

See merge request gitlab-org/gitlab!47485
parents 4979ceea 10431462
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
.settings-header .settings-header
%h4 %h4
= _('Amazon EKS') = _('Amazon EKS')
%button.btn.js-settings-toggle{ type: 'button' } %button.btn.gl-button.js-settings-toggle{ type: 'button' }
= expanded ? 'Collapse' : 'Expand' = expanded ? 'Collapse' : 'Expand'
%p %p
= _('Amazon EKS integration allows you to provision EKS clusters from GitLab.') = _('Amazon EKS integration allows you to provision EKS clusters from GitLab.')
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
.settings-header .settings-header
%h4 %h4
= _('Gitpod') = _('Gitpod')
%button.btn.btn-default.js-settings-toggle{ type: 'button' } %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
= expanded ? _('Collapse') : _('Expand') = expanded ? _('Collapse') : _('Expand')
%p %p
%integration-help-text{ "id" => "js-gitpod-settings-help-text", "message" => gitpod_enable_description, "message-url" => "https://gitpod.io/" } %integration-help-text{ "id" => "js-gitpod-settings-help-text", "message" => gitpod_enable_description, "message-url" => "https://gitpod.io/" }
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
.settings-header .settings-header
%h4 %h4
= _('PlantUML') = _('PlantUML')
%button.btn.btn-default.js-settings-toggle{ type: 'button' } %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
= expanded ? _('Collapse') : _('Expand') = expanded ? _('Collapse') : _('Expand')
%p %p
= _('Allow rendering of PlantUML diagrams in Asciidoc documents.') = _('Allow rendering of PlantUML diagrams in Asciidoc documents.')
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
.settings-header .settings-header
%h4 %h4
= _('Snowplow') = _('Snowplow')
%button.btn.btn-default.js-settings-toggle{ type: 'button' } %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
= expanded ? _('Collapse') : _('Expand') = expanded ? _('Collapse') : _('Expand')
%p %p
= _('Configure the %{link} integration.').html_safe % { link: link_to('Snowplow', 'https://snowplowanalytics.com/', target: '_blank') } = _('Configure the %{link} integration.').html_safe % { link: link_to('Snowplow', 'https://snowplowanalytics.com/', target: '_blank') }
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
.settings-header .settings-header
%h4 %h4
= _('Third party offers') = _('Third party offers')
%button.btn.btn-default.js-settings-toggle{ type: 'button' } %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
= expanded ? _('Collapse') : _('Expand') = expanded ? _('Collapse') : _('Expand')
%p %p
= _('Control the display of third party offers.') = _('Control the display of third party offers.')
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
.settings-header .settings-header
%h4 %h4
= _('Visibility and access controls') = _('Visibility and access controls')
%button.btn.js-settings-toggle{ type: 'button' } %button.btn.gl-button.js-settings-toggle{ type: 'button' }
= expanded_by_default? ? _('Collapse') : _('Expand') = expanded_by_default? ? _('Collapse') : _('Expand')
%p %p
= _('Set default and restrict visibility levels. Configure import sources and git access protocol.') = _('Set default and restrict visibility levels. Configure import sources and git access protocol.')
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
.settings-header .settings-header
%h4 %h4
= _('Account and limit') = _('Account and limit')
%button.btn.js-settings-toggle{ type: 'button' } %button.btn.gl-button.js-settings-toggle{ type: 'button' }
= expanded_by_default? ? _('Collapse') : _('Expand') = expanded_by_default? ? _('Collapse') : _('Expand')
%p %p
= _('Set projects and maximum size limits, session duration, user options, and check feature availability for namespace plan.') = _('Set projects and maximum size limits, session duration, user options, and check feature availability for namespace plan.')
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
.settings-header .settings-header
%h4 %h4
= _('Diff limits') = _('Diff limits')
%button.btn.js-settings-toggle{ type: 'button' } %button.btn.gl-button.js-settings-toggle{ type: 'button' }
= expanded_by_default? ? _('Collapse') : _('Expand') = expanded_by_default? ? _('Collapse') : _('Expand')
%p %p
= _('Diff content limits') = _('Diff content limits')
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
.settings-header .settings-header
%h4 %h4
= _('Sign-up restrictions') = _('Sign-up restrictions')
%button.btn.js-settings-toggle{ type: 'button' } %button.btn.gl-button.js-settings-toggle{ type: 'button' }
= expanded_by_default? ? _('Collapse') : _('Expand') = expanded_by_default? ? _('Collapse') : _('Expand')
%p %p
= _('Configure the way a user creates a new account.') = _('Configure the way a user creates a new account.')
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
.settings-header .settings-header
%h4 %h4
= _('Sign-in restrictions') = _('Sign-in restrictions')
%button.btn.js-settings-toggle{ type: 'button' } %button.btn.gl-button.js-settings-toggle{ type: 'button' }
= expanded_by_default? ? _('Collapse') : _('Expand') = expanded_by_default? ? _('Collapse') : _('Expand')
%p %p
= _('Set requirements for a user to sign-in. Enable mandatory two-factor authentication.') = _('Set requirements for a user to sign-in. Enable mandatory two-factor authentication.')
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
.settings-header .settings-header
%h4 %h4
= _('Terms of Service and Privacy Policy') = _('Terms of Service and Privacy Policy')
%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
= _('Include a Terms of Service agreement and Privacy Policy that all users must accept.') = _('Include a Terms of Service agreement and Privacy Policy that all users must accept.')
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
.settings-header .settings-header
%h4 %h4
= _('Web terminal') = _('Web terminal')
%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 max session time for web terminal.') = _('Set max session time for web terminal.')
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
.settings-header .settings-header
%h4 %h4
= _('Web IDE') = _('Web IDE')
%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
= _('Manage Web IDE features') = _('Manage Web IDE features')
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
.settings-header .settings-header
%h4 %h4
= _('Maintenance mode') = _('Maintenance mode')
%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
= _('Prevent users from performing write operations on GitLab while performing maintenance.') = _('Prevent users from performing write operations on GitLab while performing maintenance.')
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
.settings-header .settings-header
%h4 %h4
= _('Advanced Search') = _('Advanced Search')
%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 Search with Elasticsearch') = _('Advanced Search with Elasticsearch')
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
.settings-header .settings-header
%h4 %h4
= _('Slack application') = _('Slack application')
%button.btn.js-settings-toggle{ type: 'button' } %button.btn.gl-button.js-settings-toggle{ type: 'button' }
= expanded ? 'Collapse' : 'Expand' = expanded ? 'Collapse' : 'Expand'
%p %p
= _('Slack integration allows you to interact with GitLab via slash commands in a chat window.') = _('Slack integration allows you to interact with GitLab via slash commands in a chat window.')
......
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