Commit 1b728a48 authored by Phil Hughes's avatar Phil Hughes

Merge branch 'mrincon-remove-unused-css-runners' into 'master'

Remove unused CSS classes in runner

See merge request gitlab-org/gitlab!58758
parents 1e9726a1 d34f6dfe
...@@ -25,32 +25,3 @@ ...@@ -25,32 +25,3 @@
background-color: $red-500; background-color: $red-500;
} }
} }
.runner {
.btn {
padding: 1px 6px;
}
h4 {
font-weight: $gl-font-weight-normal;
}
}
.admin-runner-btn-group-cell {
min-width: 150px;
.btn-sm {
padding: 4px 9px;
}
.btn-default {
color: $gl-text-color-secondary;
}
}
@include media-breakpoint-down(md) {
.runners-content {
width: 100%;
overflow: auto;
}
}
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
= _('Runners currently online: %{active_runners_count}') % { active_runners_count: @active_runners_count } = _('Runners currently online: %{active_runners_count}') % { active_runners_count: @active_runners_count }
- if @runners.any? - if @runners.any?
.runners-content.content-list .content-list{ data: { testid: 'runners-table' } }
.table-holder .table-holder
.gl-responsive-table-row.table-row-header{ role: 'row' } .gl-responsive-table-row.table-row-header{ role: 'row' }
.table-section.section-10{ role: 'rowheader' }= _('Type/State') .table-section.section-10{ role: 'rowheader' }= _('Type/State')
......
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
- if @group_runners.any? - if @group_runners.any?
.runners-content.content-list .content-list{ data: { testid: 'runners-table' } }
.table-holder .table-holder
.gl-responsive-table-row.table-row-header{ role: 'row' } .gl-responsive-table-row.table-row-header{ role: 'row' }
.table-section.section-10{ role: 'rowheader' }= _('Type/State') .table-section.section-10{ role: 'rowheader' }= _('Type/State')
......
%li.runner{ id: dom_id(runner) } %li.runner{ id: dom_id(runner) }
%h4 %h4.gl-font-weight-normal
= runner_status_icon(runner) = runner_status_icon(runner)
- if @project_runners.include?(runner) - if @project_runners.include?(runner)
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
%span.has-tooltip{ title: _('Locked to current projects') } %span.has-tooltip{ title: _('Locked to current projects') }
= sprite_icon('lock') = sprite_icon('lock')
%small.edit-runner = link_to edit_project_runner_path(@project, runner), class: 'btn gl-button btn-sm btn-icon', data: { testid: 'edit-runner-link' } do
= link_to edit_project_runner_path(@project, runner), class: 'btn gl-button btn-edit' do = sprite_icon('pencil')
= sprite_icon('pencil', css_class: 'gl-my-2')
- else - else
%span.commit-sha %span.commit-sha
= runner.short_sha = runner.short_sha
......
...@@ -201,21 +201,21 @@ RSpec.describe "Admin Runners" do ...@@ -201,21 +201,21 @@ RSpec.describe "Admin Runners" do
visit admin_runners_path visit admin_runners_path
within '.runners-content .gl-responsive-table-row:nth-child(2)' do within '[data-testid="runners-table"] .gl-responsive-table-row:nth-child(2)' do
expect(page).to have_content 'runner-2' expect(page).to have_content 'runner-2'
end end
within '.runners-content .gl-responsive-table-row:nth-child(3)' do within '[data-testid="runners-table"] .gl-responsive-table-row:nth-child(3)' do
expect(page).to have_content 'runner-1' expect(page).to have_content 'runner-1'
end end
sorting_by 'Last Contact' sorting_by 'Last Contact'
within '.runners-content .gl-responsive-table-row:nth-child(2)' do within '[data-testid="runners-table"] .gl-responsive-table-row:nth-child(2)' do
expect(page).to have_content 'runner-1' expect(page).to have_content 'runner-1'
end end
within '.runners-content .gl-responsive-table-row:nth-child(3)' do within '[data-testid="runners-table"] .gl-responsive-table-row:nth-child(3)' do
expect(page).to have_content 'runner-2' expect(page).to have_content 'runner-2'
end end
end end
......
...@@ -79,7 +79,7 @@ RSpec.describe 'Runners' do ...@@ -79,7 +79,7 @@ RSpec.describe 'Runners' do
visit project_runners_path(project) visit project_runners_path(project)
within '.activated-specific-runners' do within '.activated-specific-runners' do
first('.edit-runner > a').click first('[data-testid="edit-runner-link"]').click
end end
expect(page.find_field('runner[access_level]')).not_to be_checked expect(page.find_field('runner[access_level]')).not_to be_checked
...@@ -99,7 +99,7 @@ RSpec.describe 'Runners' do ...@@ -99,7 +99,7 @@ RSpec.describe 'Runners' do
visit project_runners_path(project) visit project_runners_path(project)
within '.activated-specific-runners' do within '.activated-specific-runners' do
first('.edit-runner > a').click first('[data-testid="edit-runner-link"]').click
end end
expect(page.find_field('runner[run_untagged]')).to be_checked expect(page.find_field('runner[run_untagged]')).to be_checked
......
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