From 2265809d82f159208f72a837a0080720dc11092e Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Mon, 15 Aug 2022 10:13:49 +0300 Subject: [PATCH 1/6] added loading into finish button --- presets.js | 7 +- public/css/app.css | 80 +++++++++++++++++++++ resources/assets/js/views/wizard/Finish.vue | 14 +++- 3 files changed, 98 insertions(+), 3 deletions(-) diff --git a/presets.js b/presets.js index 51577c105..cfadf4427 100644 --- a/presets.js +++ b/presets.js @@ -211,6 +211,10 @@ module.exports = { '0%': { boxShadow: '0 28px 0 -28px #ffffff' }, '100%': { boxShadow: '0 28px 0 #ffffff' }, }, + submit_second: { + '0%': { boxShadow: '0 28px 0 -28px #55588b' }, + '100%': { boxShadow: '0 28px 0 #55588b' }, + }, }, animation: { @@ -218,7 +222,8 @@ module.exports = { pulsate_transparent: 'pulsate_transparent 1500ms ease infinite;', pulsate: 'pulsate 1500ms ease infinite;', spin: 'spin 1000ms infinite', - submit: 'submit 0.7s ease alternate infinite' + submit: 'submit 0.7s ease alternate infinite', + submit_second: 'submit_second 0.7s ease alternate infinite' }, transitionProperty: { diff --git a/public/css/app.css b/public/css/app.css index 78ffc6b87..ee318da5b 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -9981,6 +9981,34 @@ input[type="date"]::-webkit-inner-spin-button, -webkit-animation: submit 0.7s ease alternate infinite; animation: submit 0.7s ease alternate infinite; } +@-webkit-keyframes submit_second{ + + 0%{ + -webkit-box-shadow: 0 28px 0 -28px #55588b; + box-shadow: 0 28px 0 -28px #55588b; + } + + 100%{ + -webkit-box-shadow: 0 28px 0 #55588b; + box-shadow: 0 28px 0 #55588b; + } +} +@keyframes submit_second{ + + 0%{ + -webkit-box-shadow: 0 28px 0 -28px #55588b; + box-shadow: 0 28px 0 -28px #55588b; + } + + 100%{ + -webkit-box-shadow: 0 28px 0 #55588b; + box-shadow: 0 28px 0 #55588b; + } +} +.animate-submit_second{ + -webkit-animation: submit_second 0.7s ease alternate infinite; + animation: submit_second 0.7s ease alternate infinite; +} .cursor-auto{ cursor: auto; } @@ -47306,6 +47334,27 @@ body{ animation: submit 0.7s ease alternate infinite; } +@keyframes submit_second{ + + 0%{ + content: var(--tw-content); + -webkit-box-shadow: 0 28px 0 -28px #55588b; + box-shadow: 0 28px 0 -28px #55588b; + } + + 100%{ + content: var(--tw-content); + -webkit-box-shadow: 0 28px 0 #55588b; + box-shadow: 0 28px 0 #55588b; + } +} + +.before\:animate-submit_second::before{ + content: var(--tw-content); + -webkit-animation: submit_second 0.7s ease alternate infinite; + animation: submit_second 0.7s ease alternate infinite; +} + .before\:rounded-full::before{ content: var(--tw-content); border-radius: 9999px; @@ -47441,6 +47490,27 @@ body{ animation: submit 0.7s ease alternate infinite; } +@keyframes submit_second{ + + 0%{ + content: var(--tw-content); + -webkit-box-shadow: 0 28px 0 -28px #55588b; + box-shadow: 0 28px 0 -28px #55588b; + } + + 100%{ + content: var(--tw-content); + -webkit-box-shadow: 0 28px 0 #55588b; + box-shadow: 0 28px 0 #55588b; + } +} + +.after\:animate-submit_second::after{ + content: var(--tw-content); + -webkit-animation: submit_second 0.7s ease alternate infinite; + animation: submit_second 0.7s ease alternate infinite; +} + .after\:rounded-full::after{ content: var(--tw-content); border-radius: 9999px; @@ -47693,6 +47763,16 @@ body{ background-color: rgb(197 217 186 / var(--tw-bg-opacity)); } +.disabled\:bg-gray-300:disabled{ + --tw-bg-opacity: 1; + background-color: rgb(209 213 219 / var(--tw-bg-opacity)); +} + +.disabled\:bg-gray-100:disabled{ + --tw-bg-opacity: 1; + background-color: rgb(243 244 246 / var(--tw-bg-opacity)); +} + .disabled\:opacity-50:disabled{ opacity: 0.5; } diff --git a/resources/assets/js/views/wizard/Finish.vue b/resources/assets/js/views/wizard/Finish.vue index a80525116..db142ff03 100644 --- a/resources/assets/js/views/wizard/Finish.vue +++ b/resources/assets/js/views/wizard/Finish.vue @@ -55,8 +55,16 @@ - - {{ translations.finish.create_first_invoice }} + + + + + {{ translations.finish.create_first_invoice }} + @@ -93,6 +101,7 @@ export default { active: 3, route_url: url, image_src: app_url + "/public/img/wizard-modules.png", + anchor_loading: false }; }, @@ -124,6 +133,7 @@ export default { finish() { window.location.href = url + "/sales/invoices/create"; + this.anchor_loading = true; }, }, }; From 29155a7f460a13bf6fbc97e3ec77128045590c9b Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Mon, 15 Aug 2022 10:32:11 +0300 Subject: [PATCH 2/6] css compiled --- public/css/app.css | 5 ----- 1 file changed, 5 deletions(-) diff --git a/public/css/app.css b/public/css/app.css index ee318da5b..4889c553c 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -47763,11 +47763,6 @@ body{ background-color: rgb(197 217 186 / var(--tw-bg-opacity)); } -.disabled\:bg-gray-300:disabled{ - --tw-bg-opacity: 1; - background-color: rgb(209 213 219 / var(--tw-bg-opacity)); -} - .disabled\:bg-gray-100:disabled{ --tw-bg-opacity: 1; background-color: rgb(243 244 246 / var(--tw-bg-opacity)); From 88da20b2975ebeb545a498b29498291036fe0089 Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Mon, 15 Aug 2022 11:49:09 +0300 Subject: [PATCH 3/6] styling for user pages --- resources/views/auth/users/edit.blade.php | 2 +- resources/views/components/form/accordion/head.blade.php | 2 +- resources/views/components/form/section/head.blade.php | 2 +- resources/views/components/show/accordion/head.blade.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/views/auth/users/edit.blade.php b/resources/views/auth/users/edit.blade.php index 3908a8787..25136a84f 100644 --- a/resources/views/auth/users/edit.blade.php +++ b/resources/views/auth/users/edit.blade.php @@ -16,7 +16,7 @@ @if (user()->id == $user->id) - + @endif diff --git a/resources/views/components/form/accordion/head.blade.php b/resources/views/components/form/accordion/head.blade.php index bb4d36897..0a1b81c40 100644 --- a/resources/views/components/form/accordion/head.blade.php +++ b/resources/views/components/form/accordion/head.blade.php @@ -4,7 +4,7 @@ @if (! empty($description)) - + {!! $description !!} @endif diff --git a/resources/views/components/form/section/head.blade.php b/resources/views/components/form/section/head.blade.php index 3b25475cc..08120159b 100644 --- a/resources/views/components/form/section/head.blade.php +++ b/resources/views/components/form/section/head.blade.php @@ -4,7 +4,7 @@ @if (!empty($description)) - + {!! $description !!} @endif diff --git a/resources/views/components/show/accordion/head.blade.php b/resources/views/components/show/accordion/head.blade.php index 69af6ca93..f81998840 100644 --- a/resources/views/components/show/accordion/head.blade.php +++ b/resources/views/components/show/accordion/head.blade.php @@ -6,7 +6,7 @@ @if (! empty($description)) - + {!! $description !!} @endif From b81026d36f89c35a53e3c1e77941650b530555d6 Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Mon, 15 Aug 2022 14:59:26 +0300 Subject: [PATCH 4/6] RTL control for Document Form --- .../js/components/AkauntingItemButton.vue | 2 +- .../documents/form/line-item.blade.php | 18 ++++---- .../documents/form/totals.blade.php | 42 +++++++++---------- .../components/form/accordion/index.blade.php | 2 +- .../transfers/show/attachment.blade.php | 2 +- .../transfers/show/create.blade.php | 2 +- .../transfers/show/transactions.blade.php | 2 +- 7 files changed, 35 insertions(+), 35 deletions(-) diff --git a/resources/assets/js/components/AkauntingItemButton.vue b/resources/assets/js/components/AkauntingItemButton.vue index f0d73cccc..81cf6f2f0 100644 --- a/resources/assets/js/components/AkauntingItemButton.vue +++ b/resources/assets/js/components/AkauntingItemButton.vue @@ -40,7 +40,7 @@ v-bind="money" masked disabled - class="text-right disabled-money text-gray" + class="ltr:text-right rtl:text-left disabled-money text-gray" > diff --git a/resources/views/components/documents/form/line-item.blade.php b/resources/views/components/documents/form/line-item.blade.php index 210c23337..99cea16db 100644 --- a/resources/views/components/documents/form/line-item.blade.php +++ b/resources/views/components/documents/form/line-item.blade.php @@ -159,8 +159,8 @@ v-model="row.total" :currency="$currency" dynamicCurrency="currency" - money-class="text-right mt-0 disabled-money px-0" - form-group-class="text-right disabled-money" + money-class="ltr:text-right rtl:text-left mt-0 disabled-money px-0" + form-group-class="ltr:text-right rtl:text-left disabled-money" /> @endif @@ -186,7 +186,7 @@
-
+
@if (! $hideDiscount && in_array(setting('localisation.discount_location'), ['item', 'both']))
@@ -252,7 +252,7 @@ @stack('discount_input_end') -
+
@@ -327,7 +327,7 @@ @stack('taxes_input_end')
-
+
-
+
- +
diff --git a/resources/views/components/documents/form/totals.blade.php b/resources/views/components/documents/form/totals.blade.php index 6766b5650..e519ea068 100644 --- a/resources/views/components/documents/form/totals.blade.php +++ b/resources/views/components/documents/form/totals.blade.php @@ -15,11 +15,11 @@ - + {{ trans('invoices.sub_total') }} - +
@@ -46,11 +46,11 @@ - + {{ trans('invoices.item_discount') }} - +
@@ -78,7 +78,7 @@ - +
{{ trans('invoices.add_discount') }} @@ -110,7 +110,7 @@
- +
@@ -141,11 +141,11 @@ - + - +
@@ -172,7 +172,7 @@ - + {{ trans('invoices.total') }} @@ -195,7 +195,7 @@ - +
@@ -224,7 +224,7 @@ ]"> - + {!! $head !!} - +
@endif diff --git a/resources/views/components/transfers/show/attachment.blade.php b/resources/views/components/transfers/show/attachment.blade.php index 6e7020c83..e2a118a26 100644 --- a/resources/views/components/transfers/show/attachment.blade.php +++ b/resources/views/components/transfers/show/attachment.blade.php @@ -11,7 +11,7 @@ {{ trans('transers.slider.attachments') }}
- expand_more + expand_more
$transfer->owner->name, 'date' => $created_date]) !!}
- expand_more + expand_more
$transfer->owner->name]) !!}
- expand_more + expand_more
Date: Mon, 15 Aug 2022 15:07:35 +0300 Subject: [PATCH 5/6] RTL controlled for select components --- public/css/app.css | 21 +++++++++++++-------- resources/assets/sass/app.css | 5 +++++ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/public/css/app.css b/public/css/app.css index 4889c553c..5bf4ab8ba 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -47133,6 +47133,11 @@ html[dir='rtl'] .el-input__suffix { text-align: left; } +html[dir='rtl'] .el-scrollbar__wrap { + margin-left: -15px !important; + margin-right: unset !important; +} + .el-select-dropdown.is-multiple .el-select-dropdown__item.selected::after { right: 15px !important; } @@ -47846,6 +47851,10 @@ body{ right: 0.5rem; } +[dir="ltr"] .ltr\:left-3{ + left: 0.75rem; +} + [dir="ltr"] .ltr\:-right-2{ right: -0.5rem; } @@ -47862,10 +47871,6 @@ body{ left: 0px; } -[dir="ltr"] .ltr\:left-3{ - left: 0.75rem; -} - [dir="ltr"] .ltr\:left-8{ left: 2rem; } @@ -48017,6 +48022,10 @@ body{ left: 0.5rem; } +[dir="rtl"] .rtl\:right-3{ + right: 0.75rem; +} + [dir="rtl"] .rtl\:-left-2{ left: -0.5rem; } @@ -48033,10 +48042,6 @@ body{ right: 0px; } -[dir="rtl"] .rtl\:right-3{ - right: 0.75rem; -} - [dir="rtl"] .rtl\:right-8{ right: 2rem; } diff --git a/resources/assets/sass/app.css b/resources/assets/sass/app.css index b470be399..2e5d15b39 100644 --- a/resources/assets/sass/app.css +++ b/resources/assets/sass/app.css @@ -436,6 +436,11 @@ html[dir='rtl'] .el-input__suffix { text-align: left; } +html[dir='rtl'] .el-scrollbar__wrap { + margin-left: -15px !important; + margin-right: unset !important; +} + .el-select-dropdown.is-multiple .el-select-dropdown__item.selected::after { right: 15px !important; } From 7bd5e75f72d0ec8eab0e7747a452f233a2b953bd Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Mon, 15 Aug 2022 17:26:34 +0300 Subject: [PATCH 6/6] enable button responsive control --- resources/assets/js/components/AkauntingSwitch.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/js/components/AkauntingSwitch.vue b/resources/assets/js/components/AkauntingSwitch.vue index 05775e336..f8e9245d4 100644 --- a/resources/assets/js/components/AkauntingSwitch.vue +++ b/resources/assets/js/components/AkauntingSwitch.vue @@ -1,5 +1,5 @@