Commit 4a8e4ea5 authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Merge branch 'okr-alert-widget-form' into 'master'

Migrate button in alert_widget_form.vue

Closes #219808

See merge request gitlab-org/gitlab!43720
parents a08b854e ad315537
...@@ -3,7 +3,7 @@ import { isEmpty, findKey } from 'lodash'; ...@@ -3,7 +3,7 @@ import { isEmpty, findKey } from 'lodash';
import Vue from 'vue'; import Vue from 'vue';
import { import {
GlLink, GlLink,
GlDeprecatedButton, GlButton,
GlButtonGroup, GlButtonGroup,
GlFormGroup, GlFormGroup,
GlFormInput, GlFormInput,
...@@ -36,7 +36,7 @@ const SUBMIT_BUTTON_CLASS = { ...@@ -36,7 +36,7 @@ const SUBMIT_BUTTON_CLASS = {
export default { export default {
components: { components: {
GlDeprecatedButton, GlButton,
GlButtonGroup, GlButtonGroup,
GlFormGroup, GlFormGroup,
GlFormInput, GlFormInput,
...@@ -267,30 +267,27 @@ export default { ...@@ -267,30 +267,27 @@ export default {
</gl-dropdown> </gl-dropdown>
</gl-form-group> </gl-form-group>
<gl-button-group class="mb-3" :label="s__('PrometheusAlerts|Operator')"> <gl-button-group class="mb-3" :label="s__('PrometheusAlerts|Operator')">
<gl-deprecated-button <gl-button
:class="{ active: operator === operators.greaterThan }" :class="{ active: operator === operators.greaterThan }"
:disabled="formDisabled" :disabled="formDisabled"
type="button"
@click="operator = operators.greaterThan" @click="operator = operators.greaterThan"
> >
{{ operators.greaterThan }} {{ operators.greaterThan }}
</gl-deprecated-button> </gl-button>
<gl-deprecated-button <gl-button
:class="{ active: operator === operators.equalTo }" :class="{ active: operator === operators.equalTo }"
:disabled="formDisabled" :disabled="formDisabled"
type="button"
@click="operator = operators.equalTo" @click="operator = operators.equalTo"
> >
{{ operators.equalTo }} {{ operators.equalTo }}
</gl-deprecated-button> </gl-button>
<gl-deprecated-button <gl-button
:class="{ active: operator === operators.lessThan }" :class="{ active: operator === operators.lessThan }"
:disabled="formDisabled" :disabled="formDisabled"
type="button"
@click="operator = operators.lessThan" @click="operator = operators.lessThan"
> >
{{ operators.lessThan }} {{ operators.lessThan }}
</gl-deprecated-button> </gl-button>
</gl-button-group> </gl-button-group>
<gl-form-group :label="s__('PrometheusAlerts|Threshold')" label-for="alerts-threshold"> <gl-form-group :label="s__('PrometheusAlerts|Threshold')" label-for="alerts-threshold">
<gl-form-input <gl-form-input
......
---
title: Migrate button in alert_widget_form.vue
merge_request: 43720
author:
type: other
...@@ -123,14 +123,8 @@ ...@@ -123,14 +123,8 @@
} }
.alert-form { .alert-form {
.btn-group, .btn-group {
.action-group {
display: flex; display: flex;
.btn {
flex: 1 auto;
box-shadow: none;
}
} }
} }
......
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