Skip to content

Commit

Permalink
Merge pull request #1548 from ProcessMaker/bugfix/FOUR-14227
Browse files Browse the repository at this point in the history
FOUR-14227: Design in modal to edit pages is not the same with mockup
  • Loading branch information
caleeli authored Feb 27, 2024
2 parents 9771830 + 3eab500 commit 2db7999
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
3 changes: 2 additions & 1 deletion src/components/sortable/sortableList/sortableList.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ $border-color: #cdddee;
&-header {
display: flex;
align-items: center;
border-bottom: 1px solid $border-color;
}

&-title {
Expand All @@ -31,7 +32,7 @@ $border-color: #cdddee;
display: flex;
align-items: center;
height: 56px;
border-top: 1px solid $border-color;
border-bottom: 1px solid $border-color;
cursor: move;

&-icon {
Expand Down
13 changes: 12 additions & 1 deletion src/components/vue-form-builder.vue
Original file line number Diff line number Diff line change
Expand Up @@ -359,11 +359,18 @@
header-close-content="×"
role="dialog"
size="lg"
:title="$t('Edit Pages')"
:ok-title="$t('CONFIRM')"
ok-only
ok-variant="secondary"
header-class = "modal-header-custom"
>
<template #modal-title>
<h5 class="modal-title">{{ $t('Edit Pages') }}</h5>
<span class="modal-subtitle">{{ $t('Change pages order and name') }}</span>
</template>
<template #modal-header-close="{ close }">
<button type="button" aria-label="Close" class="close" @click="close()">×</button>
</template>
<Sortable
:items="config"
filter-key="name"
Expand Down Expand Up @@ -1501,4 +1508,8 @@ $side-bar-font-size: 0.875rem;
box-shadow: 0 0 0 13px rgba(0, 0, 0, 0);
}
}
.modal-subtitle {
font-size: 15px;
font-weight: normal;
}
</style>

0 comments on commit 2db7999

Please sign in to comment.