Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FOUR-17003 Fix position of buttons CANCEL and SAVE #7105

Merged
merged 2 commits into from
Jul 24, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions resources/views/processes/edit.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
{{-- Configuration --}}
<div
class="tab-pane fade show"
:class="{'active': activeTab === ''}"
:class="{'active': activeTab === '' || activeTab === 'nav-config'}"
id="nav-config"
role="tabpanel"
aria-labelledby="nav-config-tab"
Expand Down Expand Up @@ -338,16 +338,17 @@ class="invalid-feedback"
</div>
</div>
</div>
</div>
<div class="d-flex justify-content-end mt-2">
{!! Form::button(__('Cancel'),
['class'=>'btn btn-outline-secondary button-custom',
'@click' => 'onClose'])
!!}
{!! Form::button(__('Save'),
['class'=>'btn btn-secondary ml-3 button-custom',
'@click' => 'onUpdate'])
!!}

<div class="d-flex justify-content-end mt-2">
{!! Form::button(__('Cancel'),
['class'=>'btn btn-outline-secondary button-custom',
'@click' => 'onClose'])
!!}
{!! Form::button(__('Save'),
['class'=>'btn btn-secondary ml-3 button-custom',
'@click' => 'onUpdate'])
!!}
</div>
</div>

{{-- Translations --}}
Expand Down Expand Up @@ -573,7 +574,7 @@ class="custom-control-input">
</div>
<div class="d-flex justify-content-end mt-2">
{!! Form::button(__('Cancel'), ['class'=>'btn btn-outline-secondary', '@click' => 'onClose']) !!}
{!! Form::button(__('Save and publish'), [
{!! Form::button(__('Save'), [
'class' => 'btn btn-secondary ml-2',
'@click' => 'onUpdate'
]) !!}
Expand Down
Loading