From 5f39f5b0ec52e4f09aedc2f56959fef1a29132e0 Mon Sep 17 00:00:00 2001 From: Viet An Date: Mon, 8 Jun 2026 22:37:23 +0700 Subject: [PATCH] changes --- app/assets/styles/overrides-components.scss | 5 - app/components/Modal.vue | 3 +- app/components/TopMenu.vue | 2 +- app/components/datatable/format/ColorText.vue | 10 -- .../datatable/format/FormatDate.vue | 8 +- .../datatable/format/FormatNumber.vue | 10 +- app/components/datepicker/Datepicker.vue | 110 +++++++------- app/components/pos/Address.vue | 2 +- app/components/pos/ChooseIMEIModal.vue | 7 +- app/components/pos/ConfirmOrder.vue | 138 ++++++++++++++++++ app/components/pos/POS.vue | 99 +++++++++---- app/components/pos/ProductCard.vue | 3 +- app/plugins/02-connection.js | 36 +---- app/plugins/04-components.js | 2 - 14 files changed, 285 insertions(+), 150 deletions(-) delete mode 100644 app/components/datatable/format/ColorText.vue create mode 100644 app/components/pos/ConfirmOrder.vue diff --git a/app/assets/styles/overrides-components.scss b/app/assets/styles/overrides-components.scss index 4b20f97..bb0935c 100644 --- a/app/assets/styles/overrides-components.scss +++ b/app/assets/styles/overrides-components.scss @@ -10,11 +10,6 @@ border: 1px solid $grey-lighter; } -:root { - // somehow this value keeps picking dark mode values despite [data-theme]="light" - --bulma-hr-background-color: var(--bulma-white-ter); -} - .title, .subtitle { --bulma-subtitle-weight: var(--bulma-weight-semibold); diff --git a/app/components/Modal.vue b/app/components/Modal.vue index 8c44150..a1ce866 100644 --- a/app/components/Modal.vue +++ b/app/components/Modal.vue @@ -53,7 +53,7 @@ - + @@ -166,6 +166,7 @@ onUnmounted(() => { .modal-card-foot { background-color: var(--bulma-modal-card-body-background-color); + box-shadow: 0 -0.125em 0 0 hsla(var(--bulma-shadow-h), var(--bulma-shadow-s), var(--bulma-shadow-l), 0.1); &:empty { display: none; diff --git a/app/components/TopMenu.vue b/app/components/TopMenu.vue index 4d50359..d18858e 100644 --- a/app/components/TopMenu.vue +++ b/app/components/TopMenu.vue @@ -97,7 +97,7 @@