Commit 337a9a5b authored by Zack Cuddy's avatar Zack Cuddy Committed by Andrew Fontaine

Geo - Clean up old node css

Replaces custom sass file with gitlab-ui
utility classes
parent 654e6447
...@@ -88,12 +88,12 @@ export default { ...@@ -88,12 +88,12 @@ export default {
<template> <template>
<div <div
data-testid="nodeActions" data-testid="nodeActions"
class="geo-node-actions gl-display-flex gl-align-items-center gl-justify-content-end gl-flex-direction-column gl-sm-flex-direction-row" class="gl-display-flex gl-align-items-center gl-justify-content-end gl-flex-direction-column gl-sm-flex-direction-row gl-mx-5 gl-sm-mx-0"
> >
<gl-button <gl-button
v-if="isSecondaryNode" v-if="isSecondaryNode"
:href="node.geoProjectsUrl" :href="node.geoProjectsUrl"
class="gl-mx-2 gl-mt-5 gl-sm-mt-0" class="gl-mx-2 gl-mt-5 gl-sm-mt-0 gl-w-full gl-sm-w-auto"
target="_blank" target="_blank"
> >
<span class="gl-display-flex gl-align-items-center"> <span class="gl-display-flex gl-align-items-center">
...@@ -102,17 +102,25 @@ export default { ...@@ -102,17 +102,25 @@ export default {
</span> </span>
</gl-button> </gl-button>
<template v-if="nodeActionsAllowed"> <template v-if="nodeActionsAllowed">
<gl-button v-if="nodeMissingOauth" class="gl-mx-2 gl-mt-5 gl-sm-mt-0" @click="onRepairNode"> <gl-button
v-if="nodeMissingOauth"
class="gl-mx-2 gl-mt-5 gl-sm-mt-0 gl-w-full gl-sm-w-auto"
@click="onRepairNode"
>
{{ s__('Repair authentication') }} {{ s__('Repair authentication') }}
</gl-button> </gl-button>
<gl-button v-if="nodeEditAllowed" :href="node.editPath" class="gl-mx-2 gl-mt-5 gl-sm-mt-0"> <gl-button
v-if="nodeEditAllowed"
:href="node.editPath"
class="gl-mx-2 gl-mt-5 gl-sm-mt-0 gl-w-full gl-sm-w-auto"
>
{{ __('Edit') }} {{ __('Edit') }}
</gl-button> </gl-button>
<gl-button <gl-button
v-if="isSecondaryNode" v-if="isSecondaryNode"
data-testid="removeButton" data-testid="removeButton"
variant="danger" variant="danger"
class="gl-mx-2 gl-mt-5 gl-sm-mt-0" class="gl-mx-2 gl-mt-5 gl-sm-mt-0 gl-w-full gl-sm-w-auto"
:disabled="!nodeRemovalAllowed" :disabled="!nodeRemovalAllowed"
@click="onRemoveSecondaryNode" @click="onRemoveSecondaryNode"
> >
...@@ -121,7 +129,7 @@ export default { ...@@ -121,7 +129,7 @@ export default {
<div <div
v-gl-tooltip.hover v-gl-tooltip.hover
name="disabledRemovalTooltip" name="disabledRemovalTooltip"
class="gl-mx-2 gl-mt-5 gl-sm-mt-0" class="gl-mx-2 gl-mt-5 gl-sm-mt-0 gl-w-full gl-sm-w-auto"
:title="disabledRemovalTooltip" :title="disabledRemovalTooltip"
> >
<gl-button <gl-button
......
@media (max-width: $breakpoint-sm) {
.geo-node-actions {
margin: 0 1rem;
> * {
width: 100%;
}
}
}
.project-card-errors { .project-card-errors {
.btn-card-header { .btn-card-header {
&.collapsed { &.collapsed {
......
...@@ -157,7 +157,7 @@ RSpec.describe 'admin Geo Nodes', :js, :geo do ...@@ -157,7 +157,7 @@ RSpec.describe 'admin Geo Nodes', :js, :geo do
end end
it 'removes an existing Geo Node' do it 'removes an existing Geo Node' do
page.within(find('.geo-node-actions', match: :first)) do page.within(find('[data-testid="nodeActions"]', match: :first)) do
page.click_button('Remove') page.click_button('Remove')
end end
page.within('.modal') do page.within('.modal') do
......
...@@ -51,7 +51,7 @@ RSpec.describe 'GEO Nodes', :geo do ...@@ -51,7 +51,7 @@ RSpec.describe 'GEO Nodes', :geo do
wait_for_requests wait_for_requests
geo_node_actions = all('div.geo-node-actions') geo_node_actions = all('[data-testid="nodeActions"]')
expected_url = File.join(geo_secondary.url, '/admin/geo/projects') expected_url = File.join(geo_secondary.url, '/admin/geo/projects')
expect(geo_node_actions.last).to have_link('Open projects', href: expected_url) expect(geo_node_actions.last).to have_link('Open projects', href: expected_url)
......
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