diff options
| author | Paul Slaughter <pslaughter@gitlab.com> | 2018-06-21 14:24:33 -0500 |
|---|---|---|
| committer | Paul Slaughter <pslaughter@gitlab.com> | 2018-06-27 19:57:26 -0500 |
| commit | 8ac246d3f5ce53b064955a4801d74ef560342232 (patch) | |
| tree | 39f36eb635a670291939bb551980277636d981af | |
| parent | c287c731a8fba74e59364f7b7d5f993486df0e75 (diff) | |
| download | gitlab-ce-8ac246d3f5ce53b064955a4801d74ef560342232.tar.gz | |
Update scope styles in settings
| -rw-r--r-- | app/assets/stylesheets/pages/settings.scss | 7 | ||||
| -rw-r--r-- | app/views/shared/_personal_access_tokens_form.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/tokens/_scopes_form.html.haml | 6 |
3 files changed, 5 insertions, 10 deletions
diff --git a/app/assets/stylesheets/pages/settings.scss b/app/assets/stylesheets/pages/settings.scss index 2f28031b9c8..87091720459 100644 --- a/app/assets/stylesheets/pages/settings.scss +++ b/app/assets/stylesheets/pages/settings.scss @@ -255,6 +255,7 @@ } } +.personal-access-token-form, .modal-doorkeepr-auth, .doorkeeper-app-form { .scope-description { @@ -268,12 +269,6 @@ } } -.doorkeeper-app-form { - .scope-description { - margin: 0 0 5px 17px; - } -} - .deprecated-service { cursor: default; } diff --git a/app/views/shared/_personal_access_tokens_form.html.haml b/app/views/shared/_personal_access_tokens_form.html.haml index a6d291e6171..85918335409 100644 --- a/app/views/shared/_personal_access_tokens_form.html.haml +++ b/app/views/shared/_personal_access_tokens_form.html.haml @@ -5,7 +5,7 @@ %p.profile-settings-content Pick a name for the application, and we'll give you a unique #{type} token. -= form_for token, url: path, method: :post, html: { class: 'js-requires-input' } do |f| += form_for token, url: path, method: :post, html: { class: 'js-requires-input personal-access-token-form' } do |f| = form_errors(token) diff --git a/app/views/shared/tokens/_scopes_form.html.haml b/app/views/shared/tokens/_scopes_form.html.haml index e5c82962f82..a96abe9c781 100644 --- a/app/views/shared/tokens/_scopes_form.html.haml +++ b/app/views/shared/tokens/_scopes_form.html.haml @@ -3,7 +3,7 @@ - token = local_assigns.fetch(:token) - scopes.each do |scope| - %fieldset - = check_box_tag "#{prefix}[scopes][]", scope, token.scopes.include?(scope), id: "#{prefix}_scopes_#{scope}" - = label_tag ("#{prefix}_scopes_#{scope}"), scope, class: "label-light" + %fieldset.form-group.form-check + = check_box_tag "#{prefix}[scopes][]", scope, token.scopes.include?(scope), id: "#{prefix}_scopes_#{scope}", class: 'form-check-input' + = label_tag ("#{prefix}_scopes_#{scope}"), scope, class: 'label-light form-check-label' .scope-description= t scope, scope: [:doorkeeper, :scope_desc] |