Change modal cancel variant

2024-04-03 18:48:33 +01:00
parent a03ea55a82
commit ca4993c5c4
15 changed files with 26 additions and 18 deletions
--- a/client/web/admin/src/components/Apigw/CFilterModal.vue
+++ b/client/web/admin/src/components/Apigw/CFilterModal.vue
@@ -6,7 +6,7 @@
      :title="(filter || {}).label"
      :ok-title="$t('filters.modal.ok')"
      body-class="p-0"
-      cancel-variant="link"
+      cancel-variant="light"
      @ok="onSave"
      @hidden="onHidden"
    >
--- a/client/web/admin/src/components/Permissions/CPermissionClone.vue
+++ b/client/web/admin/src/components/Permissions/CPermissionClone.vue
@@ -15,7 +15,7 @@
      v-model="showModal"
      data-test-id="modal-clone-permission"
      ok-variant="primary"
-      cancel-variant="link"
+      cancel-variant="light"
      centered
      :title="$t('ui.clone.title')"
      :ok-title="$t('ui.clone.clone')"
--- a/client/web/admin/src/components/Settings/UI/CUIBrandingEditor.vue
+++ b/client/web/admin/src/components/Settings/UI/CUIBrandingEditor.vue
@@ -150,7 +150,7 @@
      id="custom-css-editor"
      v-model="customCSSModal.show"
      :title="$t('custom-css')"
-      cancel-variant="link"
+      cancel-variant="light"
      size="lg"
      :ok-title="$t('general:label.saveAndClose')"
      :cancel-title="$t('general:label.cancel')"
--- a/client/web/compose/src/components/Admin/Module/DalSchemaAlterations.vue
+++ b/client/web/compose/src/components/Admin/Module/DalSchemaAlterations.vue
@@ -133,9 +133,9 @@

    <template #modal-footer>
      <b-button
-        variant="outline-light"
        :disabled="processing"
        class="text-primary border-0"
+        variant="light"
        @click="showModal = false"
      >
        {{ canResolveAlterations ? $t('general:label.cancel') : $t('general:label.close') }}
--- a/client/web/compose/src/components/Admin/Module/Records/ColumnPicker.vue
+++ b/client/web/compose/src/components/Admin/Module/Records/ColumnPicker.vue
@@ -18,7 +18,7 @@
      size="lg"
      scrollable
      :ok-title="$t('general.label.saveAndClose')"
-      cancel-variant="link"
+      cancel-variant="light"
      title-class="d-flex align-items-center p-0"
      @ok="onSave"
    >
--- a/client/web/compose/src/components/Public/Record/BulkEdit/index.vue
+++ b/client/web/compose/src/components/Public/Record/BulkEdit/index.vue
@@ -75,15 +75,15 @@
            {{ $t('recordList.bulkRecord.reset') }}
          </b-button>

-          <div>
+          <div class="d-flex gap-1">
            <b-button
-              variant="link"
+              variant="light"
              rounded
-              class="text-primary"
              @click="onModalHide"
            >
              {{ $t('general.label.cancel') }}
            </b-button>
+
            <b-button
              variant="primary"
              :disabled="!fields.length || processing"
--- a/client/web/compose/src/components/Translator/CTranslatorModal.vue
+++ b/client/web/compose/src/components/Translator/CTranslatorModal.vue
@@ -20,6 +20,7 @@
        :highlight-key="highlightKey"
        @change="changes=$event"
      />
+
      <template #modal-footer>
        <b-button
          data-test-id="button-submit"
--- a/client/web/compose/src/views/Admin/Charts/Edit.vue
+++ b/client/web/compose/src/views/Admin/Charts/Edit.vue
@@ -327,7 +327,7 @@
      :ok-title="$t('general:label.saveAndClose')"
      centered
      size="md"
-      cancel-variant="link"
+      cancel-variant="light"
      no-fade
    >
      <b-form-group
@@ -393,7 +393,7 @@
        />

        <b-button
-          variant="link"
+          variant="light"
          class="ml-auto"
          :disabled="colorSchemeModal.processing"
          @click="closeColorSchemeModal"
@@ -990,6 +990,7 @@ export default {
  },
 }
 </script>
+
 <style lang="scss">

 .chart-preview {
--- a/client/web/compose/src/views/Admin/Pages/Builder.vue
+++ b/client/web/compose/src/views/Admin/Pages/Builder.vue
@@ -188,7 +188,7 @@
      :ok-title="$t('build.addBlock')"
      ok-variant="primary"
      :ok-disabled="blockEditorOkDisabled"
-      cancel-variant="link"
+      cancel-variant="light"
      :cancel-title="$t('block.general.label.cancel')"
      size="xl"
      :visible="showCreator"
@@ -268,8 +268,8 @@

        <div>
          <b-button
-            variant="link"
-            class="text-decoration-none"
+            variant="light"
+            class="mr-2"
            @click="cancel()"
          >
            {{ $t('label.cancel') }}
--- a/client/web/compose/src/views/Admin/Pages/Edit.vue
+++ b/client/web/compose/src/views/Admin/Pages/Edit.vue
@@ -373,7 +373,7 @@
      :ok-title="$t('general:label.saveAndClose')"
      ok-variant="primary"
      :ok-disabled="!layoutEditor.layout.meta.title"
-      cancel-variant="link"
+      cancel-variant="light"
      size="xl"
      scrollable
      no-fade
@@ -758,12 +758,12 @@

        <div class="ml-auto">
          <b-button
-            variant="link"
-            class="text-primary"
+            variant="light"
            @click="closeIconModal"
          >
            {{ $t('general:label.cancel') }}
          </b-button>
+
          <b-button
            variant="primary"
            class="ml-2"
@@ -773,6 +773,7 @@
          </b-button>
        </div>
      </template>
+
      <b-form-group
        :label="$t('icon.upload')"
        label-class="text-primary"
--- a/client/web/reporter/src/views/Report/Builder.vue
+++ b/client/web/reporter/src/views/Report/Builder.vue
@@ -152,7 +152,7 @@
      :ok-title="$t('builder:save-button')"
      :visible="showEditor"
      ok-variant="primary"
-      cancel-variant="link"
+      cancel-variant="light"
      scrollable
      size="xl"
      body-class="p-0 border-top-0"
@@ -235,7 +235,7 @@
    <b-modal
      v-model="datasources.showConfigurator"
      :title="$t('builder:datasources.label')"
-      cancel-variant="link"
+      cancel-variant="light"
      :cancel-disabled="datasources.processing"
      scrollable
      size="xl"
@@ -315,6 +315,7 @@
      scrollable
      :ok-title="$t('builder:scenarios.save')"
      ok-variant="primary"
+      cancel-variant="light"
      :title="$t('builder:scenarios.label')"
      body-class="py-3"
      no-fade
--- a/client/web/workflow/src/components/Configurator/Error.vue
+++ b/client/web/workflow/src/components/Configurator/Error.vue
@@ -41,6 +41,7 @@
      size="lg"
      :ok-title="$t('general:save')"
      :cancel-title="$t('general:cancel')"
+      cancel-variant="light"
      body-class="p-0"
      no-fade
      @ok="saveExpression"
--- a/client/web/workflow/src/components/Configurator/Expressions.vue
+++ b/client/web/workflow/src/components/Configurator/Expressions.vue
@@ -56,6 +56,7 @@
      size="lg"
      :ok-title="$t('general:save')"
      :cancel-title="$t('general:cancel')"
+      cancel-variant="light"
      body-class="p-0"
      no-fade
      @ok="saveExpression"
--- a/client/web/workflow/src/components/Configurator/Function.vue
+++ b/client/web/workflow/src/components/Configurator/Function.vue
@@ -303,6 +303,7 @@
      size="lg"
      :ok-title="$t('general:save')"
      :cancel-title="$t('general:cancel')"
+      cancel-variant="light"
      body-class="p-0"
      no-fade
      @ok="saveExpression"
--- a/client/web/workflow/src/components/WorkflowEditor.vue
+++ b/client/web/workflow/src/components/WorkflowEditor.vue
@@ -421,6 +421,7 @@
      :ok-title="`${dryRun.lookup ? $t('editor:load-and-configure') : $t('editor:run-workflow')}`"
      :cancel-title="$t('editor:back')"
      ok-variant="success"
+      cancel-variant="light"
      no-fade
      @cancel.prevent="dryRun.lookup = true"
      @ok="dryRunOk"