Skip to content

G
gitlab-ce
Commit fcf099f8 authored by Sam Beckham's avatar Sam Beckham
Browse files
Options

Adds default button classes where appropriate 

this only applies to the previously changed buttons
parent 400d2af4
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 22 deletions
app/views/admin/abuse_reports/_abuse_report.html.haml
View file @ fcf099f8
......@@ -29,6 +29,6 @@
- if user && !user.blocked?
= link_to _('Block user'), block_admin_user_path(user), data: {confirm: _('USER WILL BE BLOCKED! Are you sure?')}, method: :put, class: "gl-button btn btn-sm btn-block"
- else
.gl-button.btn.btn-sm.disabled.btn-block
.gl-button.btn.btn-default.btn-sm.disabled.btn-block
= _('Already blocked')
= link_to _('Remove report'), [:admin, abuse_report], remote: true, method: :delete, class: "gl-button btn btn-sm btn-block btn-close js-remove-tr"
app/views/admin/application_settings/_usage.html.haml
View file @ fcf099f8
......@@ -27,7 +27,7 @@
- usage_ping_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: usage_ping_path }
%p.mb-2= s_('%{usage_ping_link_start}Learn more%{usage_ping_link_end} about what information is shared with GitLab Inc.').html_safe % { usage_ping_link_start: usage_ping_link_start, usage_ping_link_end: '</a>'.html_safe }
%button.gl-button.btn.js-payload-preview-trigger{ type: 'button', data: { payload_selector: ".#{payload_class}" } }
%button.gl-button.btn.btn-default.js-payload-preview-trigger{ type: 'button', data: { payload_selector: ".#{payload_class}" } }
.spinner.js-spinner.d-none
.js-text.d-inline= _('Preview payload')
%pre.usage-data.js-syntax-highlight.code.highlight.mt-2.d-none{ class: payload_class, data: { endpoint: usage_data_admin_application_settings_path(format: :html) } }
......
app/views/admin/spam_logs/_spam_log.html.haml
View file @ fcf099f8
......@@ -27,13 +27,13 @@
data: { confirm: "USER #{user.name} WILL BE REMOVED! Are you sure?" }, method: :delete, class: "gl-button btn btn-sm btn-danger"
%td
- if spam_log.submitted_as_ham?
.gl-button.btn.btn-sm.disabled
.gl-button.btn.btn-default.btn-sm.disabled
Submitted as ham
- else
= link_to 'Submit as ham', mark_as_ham_admin_spam_log_path(spam_log), method: :post, class: 'gl-button btn btn-sm btn-warning'
- if user && !user.blocked?
= link_to 'Block user', block_admin_user_path(user), data: {confirm: 'USER WILL BE BLOCKED! Are you sure?'}, method: :put, class: "gl-button btn btn-sm"
- else
.gl-button.btn.btn-sm.disabled
.gl-button.btn.btn-default.btn-sm.disabled
Already blocked
= link_to 'Remove log', [:admin, spam_log], remote: true, method: :delete, class: "gl-button btn btn-sm btn-close js-remove-tr"
app/views/authentication/_authenticate.html.haml
View file @ fcf099f8
......@@ -7,7 +7,7 @@
%script#js-authenticate-token-2fa-error{ type: "text/template" }
%div
%p <%= error_message %> (<%= error_name %>)
%a.btn.gl-button.btn-block.btn-warning#js-token-2fa-try-again= _("Try again?")
%a.btn.btn-default.gl-button.btn-block.btn-warning#js-token-2fa-try-again= _("Try again?")
%script#js-authenticate-token-2fa-authenticated{ type: "text/template" }
%div
......
app/views/authentication/_register.html.haml
View file @ fcf099f8
......@@ -21,7 +21,7 @@
%div
%p
%span <%= error_message %> (<%= error_name %>)
%a.btn.gl-button.btn-warning#js-token-2fa-try-again= _("Try again?")
%a.btn.btn-default.gl-button.btn-warning#js-token-2fa-try-again= _("Try again?")
%script#js-register-token-2fa-registered{ type: "text/template" }
.row.gl-mb-3
......
app/views/award_emoji/_awards_block.html.haml
View file @ fcf099f8
......@@ -8,7 +8,7 @@
- grouped_emojis = awardable.grouped_awards(with_thumbs: inline)
.awards.js-awards-block{ class: ("hidden" if !inline && grouped_emojis.empty?), data: { award_url: toggle_award_url(awardable) } }
- awards_sort(grouped_emojis).each do |emoji, awards|
%button.gl-button.btn.award-control.js-emoji-btn.has-tooltip{ type: "button",
%button.gl-button.btn.btn-default.award-control.js-emoji-btn.has-tooltip{ type: "button",
class: [(award_state_class(awardable, awards, current_user))],
data: { title: award_user_list(awards, current_user) } }
= emoji_icon(emoji)
......@@ -17,7 +17,7 @@
- if can?(current_user, :award_emoji, awardable)
.award-menu-holder.js-award-holder
%button.gl-button.btn.award-control.has-tooltip.js-add-award{ type: 'button',
%button.gl-button.btn.btn-default.award-control.has-tooltip.js-add-award{ type: 'button',
'aria-label': _('Add reaction'),
data: { title: _('Add reaction') } }
%span{ class: "award-control-icon award-control-icon-neutral" }= sprite_icon('slight-smile')
......
app/views/ci/variables/_url_query_variable_row.html.haml
View file @ fcf099f8
......@@ -24,5 +24,5 @@
name: value_input_name,
placeholder: s_('CiVariables|Input variable value') }
= value
%button.gl-button.btn.btn-svg.btn-item-remove.js-row-remove-button.ci-variable-row-remove-button.table-section{ type: 'button', 'aria-label': s_('CiVariables|Remove variable row') }
%button.gl-button.btn.btn-default.btn-svg.btn-item-remove.js-row-remove-button.ci-variable-row-remove-button.table-section{ type: 'button', 'aria-label': s_('CiVariables|Remove variable row') }
= sprite_icon('close')
app/views/ci/variables/_variable_row.html.haml
View file @ fcf099f8
......@@ -60,5 +60,5 @@
value: is_masked,
data: { default: is_masked_default.to_s } }
= render_if_exists 'ci/variables/environment_scope', form_field: form_field, variable: variable
%button.gl-button.btn.btn-svg.js-row-remove-button.ci-variable-row-remove-button.table-section{ type: 'button', 'aria-label': s_('CiVariables|Remove variable row') }
%button.gl-button.btn.btn-default.btn-svg.js-row-remove-button.ci-variable-row-remove-button.table-section{ type: 'button', 'aria-label': s_('CiVariables|Remove variable row') }
= sprite_icon('close')
app/views/layouts/header/_current_user_dropdown.html.haml
View file @ fcf099f8
......@@ -11,7 +11,7 @@
%li.divider
- if can?(current_user, :update_user_status, current_user)
%li
%button.gl-button.btn.menu-item.js-set-status-modal-trigger{ type: 'button' }
%button.gl-button.btn.btn-default.menu-item.js-set-status-modal-trigger{ type: 'button' }
- if show_status_emoji?(current_user.status) || user_status_set_to_busy?(current_user.status)
= s_('SetStatusModal|Edit status')
- else
......
app/views/projects/branches/_delete_protected_modal.html.haml
View file @ fcf099f8
......@@ -34,7 +34,7 @@
= text_field_tag 'delete_branch_input', '', class: 'form-control js-delete-branch-input'
.modal-footer
%button.gl-button.btn{ data: { dismiss: 'modal' } } Cancel
%button.gl-button.btn.btn-default{ data: { dismiss: 'modal' } } Cancel
= link_to s_('Branches|Delete protected branch'), '',
class: "gl-button btn btn-danger js-delete-branch",
title: s_('Branches|Delete branch'),
......
app/views/projects/settings/operations/_alert_management.html.haml
View file @ fcf099f8
......@@ -7,7 +7,7 @@
.settings-header
%h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only
= _('Alert integrations')
%button.gl-button.btn.js-settings-toggle{ type: 'button' }
%button.gl-button.btn.btn-default.js-settings-toggle{ type: 'button' }
= _('Expand')
%p
= _('Display alerts from all configured monitoring tools.')
......
app/views/projects/settings/operations/_error_tracking.html.haml
View file @ fcf099f8
......@@ -6,7 +6,7 @@
.settings-header
%h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only
= _('Error tracking')
%button.gl-button.btn.js-settings-toggle{ type: 'button' }
%button.gl-button.btn.btn-default.js-settings-toggle{ type: 'button' }
= _('Expand')
%p
= _('To link Sentry to GitLab, enter your Sentry URL and Auth Token.')
......
app/views/projects/settings/operations/_prometheus.html.haml
View file @ fcf099f8
......@@ -2,7 +2,7 @@
.settings-header
%h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only
= _('Prometheus')
%button.gl-button.btn.js-settings-toggle{ type: 'button' }
%button.gl-button.btn.btn-default.js-settings-toggle{ type: 'button' }
= _('Expand')
%p
= _('Link Prometheus monitoring to GitLab.')
......
app/views/projects/settings/operations/_tracing.html.haml
View file @ fcf099f8
......@@ -5,7 +5,7 @@
.settings-header{ :class => "border-top" }
%h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only
= _("Jaeger tracing")
%button.btn.gl-button.js-settings-toggle{ type: 'button' }
%button.btn.btn-default.gl-button.js-settings-toggle{ type: 'button' }
= _('Expand')
%p
- if has_jaeger_url
......
app/views/shared/_clone_panel.html.haml
View file @ fcf099f8
......@@ -5,7 +5,7 @@
%span.js-clone-dropdown-label
= enabled_protocol_button(container, enabled_protocol)
- else
%a#clone-dropdown.input-group-text.btn.gl-button.btn-default.clone-dropdown-btn.qa-clone-dropdown{ href: '#', data: { toggle: 'dropdown' } }
%a#clone-dropdown.input-group-text.gl-button.btn.btn-default.clone-dropdown-btn.qa-clone-dropdown{ href: '#', data: { toggle: 'dropdown' } }
%span.js-clone-dropdown-label
= default_clone_protocol.upcase
= sprite_icon('chevron-down')
......
app/views/shared/_label.html.haml
View file @ fcf099f8
......@@ -29,7 +29,7 @@
%ul
- if label.project_label? && label.project.group && can?(current_user, :admin_label, label.project.group)
%li
%button.js-promote-project-label-button.gl-button.btn.btn-transparent{ disabled: true, type: 'button',
%button.js-promote-project-label-button.gl-button.btn.btn-default.btn-transparent{ disabled: true, type: 'button',
data: { url: promote_project_label_path(label.project, label),
label_title: label.title,
label_color: label.color,
......
app/views/sherlock/queries/_general.html.haml
View file @ fcf099f8
......@@ -26,7 +26,7 @@
.card
.card-header
.float-right
%button.js-clipboard-trigger.gl-button.btn.btn-sm{ title: t('sherlock.copy_to_clipboard'), type: :button }
%button.js-clipboard-trigger.gl-button.btn.btn-default.btn-sm{ title: t('sherlock.copy_to_clipboard'), type: :button }
= sprite_icon('copy-to-clipboard')
%pre.hidden
= @query.formatted_query
......@@ -41,7 +41,7 @@
.card
.card-header
.float-right
%button.js-clipboard-trigger.gl-button.btn.btn-sm{ title: t('sherlock.copy_to_clipboard'), type: :button }
%button.js-clipboard-trigger.gl-button.btn.btn-default.btn-sm{ title: t('sherlock.copy_to_clipboard'), type: :button }
= sprite_icon('copy-to-clipboard')
%pre.hidden
= @query.explain
......
ee/app/views/projects/mirrors/_table_pull_row.html.haml
View file @ fcf099f8
......@@ -21,9 +21,9 @@
- if ssh_public_key
= clipboard_button(text: ssh_public_key, class: 'gl-button btn btn-default rspec-copy-ssh-public-key', title: _('Copy SSH public key'), qa_selector: 'copy_public_key_button')
- if import_state.mirror_update_due? || import_state.updating_mirror?
%button.btn.btn-icon.gl-button.disabled{ type: 'button', data: { container: 'body', toggle: 'tooltip', qa_selector: 'updating_button' }, title: _('Updating') }= sprite_icon("retry", css_class: "spin")
%button.btn.btn-default.btn-icon.gl-button.disabled{ type: 'button', data: { container: 'body', toggle: 'tooltip', qa_selector: 'updating_button' }, title: _('Updating') }= sprite_icon("retry", css_class: "spin")
- elsif @project.archived?
%button.btn.btn-icon.gl-button.disabled{ type: 'button', data: { container: 'body', toggle: 'tooltip', qa_selector: 'update_now_button' }, title: _('This Project is currently archived and read-only. Please unarchive the project first if you want to resume Pull mirroring') }= sprite_icon("retry")
%button.btn.btn-default.btn-icon.gl-button.disabled{ type: 'button', data: { container: 'body', toggle: 'tooltip', qa_selector: 'update_now_button' }, title: _('This Project is currently archived and read-only. Please unarchive the project first if you want to resume Pull mirroring') }= sprite_icon("retry")
- else
= link_to update_now_project_mirror_path(@project), method: :post, class: 'btn gl-button btn-icon btn-default js-force-update-mirror', data: { container: 'body', toggle: 'tooltip', qa_selector: 'update_now_button' }, title: _('Update now') do
= sprite_icon("retry")
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7