Commit 49a39c70 authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Merge branch 'Swap-date-time-picker-buttons' into 'master'

Swap deprecated time/date picker buttons

Closes #219837

See merge request gitlab-org/gitlab!39141
parents bd6e5f16 f013628f
<script> <script>
import { import {
GlIcon, GlIcon,
GlDeprecatedButton, GlButton,
GlDeprecatedDropdown, GlDeprecatedDropdown,
GlDeprecatedDropdownItem, GlDeprecatedDropdownItem,
GlFormGroup, GlFormGroup,
...@@ -28,7 +28,7 @@ const events = { ...@@ -28,7 +28,7 @@ const events = {
export default { export default {
components: { components: {
GlIcon, GlIcon,
GlDeprecatedButton, GlButton,
GlDeprecatedDropdown, GlDeprecatedDropdown,
GlDeprecatedDropdownItem, GlDeprecatedDropdownItem,
GlFormGroup, GlFormGroup,
...@@ -250,10 +250,15 @@ export default { ...@@ -250,10 +250,15 @@ export default {
/> />
</div> </div>
<gl-form-group> <gl-form-group>
<gl-deprecated-button @click="closeDropdown">{{ __('Cancel') }}</gl-deprecated-button> <gl-button @click="closeDropdown">{{ __('Cancel') }}</gl-button>
<gl-deprecated-button variant="success" :disabled="!isValid" @click="setFixedRange()"> <gl-button
variant="success"
category="primary"
:disabled="!isValid"
@click="setFixedRange()"
>
{{ __('Apply') }} {{ __('Apply') }}
</gl-deprecated-button> </gl-button>
</gl-form-group> </gl-form-group>
</gl-form-group> </gl-form-group>
<gl-form-group <gl-form-group
......
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