Commit 4a4b59ed authored by Olena Horal-Koretska's avatar Olena Horal-Koretska

Merge branch 'final-button-sweep' into 'master'

Upgrades the final few bootstrap buttons

See merge request gitlab-org/gitlab!59641
parents 0293d150 2d3d1a20
...@@ -46,9 +46,10 @@ ...@@ -46,9 +46,10 @@
%tr %tr
%td %td
= form_tag admin_runner_path(@runner), id: 'runner-projects-search', class: 'form-inline', method: :get do = form_tag admin_runner_path(@runner), id: 'runner-projects-search', class: 'form-inline', method: :get do
.form-group .input-group
= search_field_tag :search, params[:search], class: 'form-control', spellcheck: false = search_field_tag :search, params[:search], class: 'form-control gl-form-input', spellcheck: false
= submit_tag 'Search', class: 'btn' .input-group-append
= submit_tag 'Search', class: 'gl-button btn btn-default'
%td %td
- @projects.each do |project| - @projects.each do |project|
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
.col-sm-10 .col-sm-10
%p.text-success.gl-mt-3 %p.text-success.gl-mt-3
= s_('PrometheusService|GitLab manages Prometheus on your clusters.') = s_('PrometheusService|GitLab manages Prometheus on your clusters.')
= link_to s_('PrometheusService|Manage clusters'), project_clusters_path(project), class: 'btn' = link_to s_('PrometheusService|Manage clusters'), project_clusters_path(project), class: 'gl-button btn btn-default'
- else - else
.col-sm-2 .col-sm-2
= image_tag 'illustrations/monitoring/loading.svg' = image_tag 'illustrations/monitoring/loading.svg'
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
.row-content-block .row-content-block
.float-right .float-right
= link_to(sherlock_transaction_path(@transaction), class: 'btn') do = link_to(sherlock_transaction_path(@transaction), class: 'btn gl-button btn-default') do
= sprite_icon('arrow-left') = sprite_icon('arrow-left')
= t('sherlock.transaction') = t('sherlock.transaction')
.oneline .oneline
......
---
title: Upgrades the final few bootstrap buttons
merge_request: 59641
author:
type: other
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
#js-dropdown-my-reaction.filtered-search-input-dropdown-menu.dropdown-menu #js-dropdown-my-reaction.filtered-search-input-dropdown-menu.dropdown-menu
%ul{ data: { dropdown: true } } %ul{ data: { dropdown: true } }
%li.filter-dropdown-item{ data: { value: 'None' } } %li.filter-dropdown-item{ data: { value: 'None' } }
%button.btn.btn-link{ type: 'button' } %button.gl-button.btn.btn-link{ type: 'button' }
= _('None') = _('None')
%li.filter-dropdown-item{ data: { value: 'Any' } } %li.filter-dropdown-item{ data: { value: 'Any' } }
%button.btn.btn-link{ type: 'button' } %button.btn.btn-link{ type: 'button' }
......
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