diff options
Diffstat (limited to 'app/views/admin')
-rw-r--r-- | app/views/admin/conversational_development_index/_callout.html.haml | 2 | ||||
-rw-r--r-- | app/views/admin/health_check/_failing_storages.html.haml | 2 | ||||
-rw-r--r-- | app/views/admin/health_check/show.html.haml | 2 | ||||
-rw-r--r-- | app/views/admin/hook_logs/show.html.haml | 2 | ||||
-rw-r--r-- | app/views/admin/runners/_runner.html.haml | 6 | ||||
-rw-r--r-- | app/views/admin/runners/index.html.haml | 2 | ||||
-rw-r--r-- | app/views/admin/users/_user.html.haml | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/app/views/admin/conversational_development_index/_callout.html.haml b/app/views/admin/conversational_development_index/_callout.html.haml index 9f7e0463a91..33a4dab1e00 100644 --- a/app/views/admin/conversational_development_index/_callout.html.haml +++ b/app/views/admin/conversational_development_index/_callout.html.haml @@ -1,7 +1,7 @@ .prepend-top-default .user-callout{ data: { uid: 'convdev_intro_callout_dismissed' } } .bordered-box.landing.content-block - %button.btn.btn-secondary.close.js-close-callout{ type: 'button', + %button.btn.btn-default.close.js-close-callout{ type: 'button', 'aria-label' => 'Dismiss ConvDev introduction' } = icon('times', class: 'dismiss-icon', 'aria-hidden' => 'true') .user-callout-copy diff --git a/app/views/admin/health_check/_failing_storages.html.haml b/app/views/admin/health_check/_failing_storages.html.haml index d60102b65ea..6830201538d 100644 --- a/app/views/admin/health_check/_failing_storages.html.haml +++ b/app/views/admin/health_check/_failing_storages.html.haml @@ -12,4 +12,4 @@ = _("Access to failing storages has been temporarily disabled to allow the mount to recover. Reset storage information after the issue has been resolved to allow access again.") .prepend-top-10 = button_to _("Reset git storage health information"), reset_storage_health_admin_health_check_path, - method: :post, class: 'btn btn-secondary' + method: :post, class: 'btn btn-default' diff --git a/app/views/admin/health_check/show.html.haml b/app/views/admin/health_check/show.html.haml index f72616b4f71..d51ac854b04 100644 --- a/app/views/admin/health_check/show.html.haml +++ b/app/views/admin/health_check/show.html.haml @@ -11,7 +11,7 @@ %code#health-check-token= Gitlab::CurrentSettings.health_check_access_token .prepend-top-10 = button_to _("Reset health check access token"), reset_health_check_token_admin_application_settings_path, - method: :put, class: 'btn btn-secondary', + method: :put, class: 'btn btn-default', data: { confirm: _('Are you sure you want to reset the health check token?') } %p.light #{ _('Health information can be retrieved from the following endpoints. More information is available') } diff --git a/app/views/admin/hook_logs/show.html.haml b/app/views/admin/hook_logs/show.html.haml index b935bcd2999..2eb3ac85722 100644 --- a/app/views/admin/hook_logs/show.html.haml +++ b/app/views/admin/hook_logs/show.html.haml @@ -4,7 +4,7 @@ %hr -= link_to 'Resend Request', retry_admin_hook_hook_log_path(@hook, @hook_log), class: "btn btn-secondary float-right prepend-left-10" += link_to 'Resend Request', retry_admin_hook_hook_log_path(@hook, @hook_log), class: "btn btn-default float-right prepend-left-10" = render partial: 'shared/hook_logs/content', locals: { hook_log: @hook_log } diff --git a/app/views/admin/runners/_runner.html.haml b/app/views/admin/runners/_runner.html.haml index ac2bb753fd6..44eb0c89f2f 100644 --- a/app/views/admin/runners/_runner.html.haml +++ b/app/views/admin/runners/_runner.html.haml @@ -38,14 +38,14 @@ Never %td.admin-runner-btn-group-cell .float-right.btn-group - = link_to admin_runner_path(runner), class: 'btn btn-sm btn-secondary has-tooltip', title: 'Edit', ref: 'tooltip', aria: { label: 'Edit' }, data: { placement: 'top', container: 'body'} do + = link_to admin_runner_path(runner), class: 'btn btn-sm btn-default has-tooltip', title: 'Edit', ref: 'tooltip', aria: { label: 'Edit' }, data: { placement: 'top', container: 'body'} do = icon('pencil') - if runner.active? - = link_to [:pause, :admin, runner], method: :get, class: 'btn btn-sm btn-secondary has-tooltip', title: 'Pause', ref: 'tooltip', aria: { label: 'Pause' }, data: { placement: 'top', container: 'body', confirm: "Are you sure?" } do + = link_to [:pause, :admin, runner], method: :get, class: 'btn btn-sm btn-default has-tooltip', title: 'Pause', ref: 'tooltip', aria: { label: 'Pause' }, data: { placement: 'top', container: 'body', confirm: "Are you sure?" } do = icon('pause') - else - = link_to [:resume, :admin, runner], method: :get, class: 'btn btn-secondary btn-sm has-tooltip', title: 'Resume', ref: 'tooltip', aria: { label: 'Resume' }, data: { placement: 'top', container: 'body'} do + = link_to [:resume, :admin, runner], method: :get, class: 'btn btn-default btn-sm has-tooltip', title: 'Resume', ref: 'tooltip', aria: { label: 'Resume' }, data: { placement: 'top', container: 'body'} do = icon('play') = link_to [:admin, runner], method: :delete, class: 'btn btn-danger btn-sm has-tooltip', title: 'Remove', ref: 'tooltip', aria: { label: 'Remove' }, data: { placement: 'top', container: 'body', confirm: "Are you sure?" } do = icon('remove') diff --git a/app/views/admin/runners/index.html.haml b/app/views/admin/runners/index.html.haml index 8a130782b46..8e71e42570f 100644 --- a/app/views/admin/runners/index.html.haml +++ b/app/views/admin/runners/index.html.haml @@ -35,7 +35,7 @@ You can reset runners registration token by pressing a button below. .prepend-top-10 = button_to _("Reset runners registration token"), reset_runners_token_admin_application_settings_path, - method: :put, class: 'btn btn-secondary', + method: :put, class: 'btn btn-default', data: { confirm: _("Are you sure you want to reset registration token?") } = render partial: 'ci/runner/how_to_setup_shared_runner', diff --git a/app/views/admin/users/_user.html.haml b/app/views/admin/users/_user.html.haml index d8d5e2a65db..b2163ee85fa 100644 --- a/app/views/admin/users/_user.html.haml +++ b/app/views/admin/users/_user.html.haml @@ -18,7 +18,7 @@ = link_to 'Edit', edit_admin_user_path(user), id: "edit_#{dom_id(user)}", class: 'btn' - unless user == current_user .dropdown.inline - %a.dropdown-new.btn.btn-secondary#project-settings-button{ href: '#', data: { toggle: 'dropdown' } } + %a.dropdown-new.btn.btn-default#project-settings-button{ href: '#', data: { toggle: 'dropdown' } } = icon('cog') = icon('caret-down') %ul.dropdown-menu.dropdown-menu-right |