From fa065de4bc5fe62cca0ba8e7246280419b94f005 Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Wed, 26 Oct 2022 10:50:28 +0300 Subject: [PATCH 1/7] body selected styling --- public/css/app.css | 11 +++++++++++ resources/assets/sass/app.css | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/public/css/app.css b/public/css/app.css index 0abe2a8dd..056b86abc 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -47400,6 +47400,17 @@ html[dir="rtl"] .lines-radius-border thead td:last-child { padding: 4px 15px; } +/* document body selected */ +::-moz-selection { + background: #55588B; + color: #FFFFFF; +} +::selection { + background: #55588B; + color: #FFFFFF; +} +/* document body selected */ + input[type=number]::-webkit-outer-spin-button, input[type=number]::-webkit-inner-spin-button { -webkit-appearance: none; diff --git a/resources/assets/sass/app.css b/resources/assets/sass/app.css index 965ba680e..ad3748e85 100644 --- a/resources/assets/sass/app.css +++ b/resources/assets/sass/app.css @@ -608,6 +608,17 @@ html[dir="rtl"] .lines-radius-border thead td:last-child { padding: 4px 15px; } +/* document body selected */ +::-moz-selection { + background: #55588B; + color: #FFFFFF; +} +::selection { + background: #55588B; + color: #FFFFFF; +} +/* document body selected */ + input[type=number]::-webkit-outer-spin-button, input[type=number]::-webkit-inner-spin-button { -webkit-appearance: none; From 4adf21a9a1ca0302eb4914ba80c58abd002d7c3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Wed, 26 Oct 2022 12:17:01 +0300 Subject: [PATCH 2/7] removed hard coded suggestion --- resources/views/banking/transactions/index.blade.php | 7 ------- 1 file changed, 7 deletions(-) diff --git a/resources/views/banking/transactions/index.blade.php b/resources/views/banking/transactions/index.blade.php index f469aa217..680784803 100644 --- a/resources/views/banking/transactions/index.blade.php +++ b/resources/views/banking/transactions/index.blade.php @@ -231,13 +231,6 @@ 'description' => trans('general.empty.actions.new', ['type' => trans_choice('general.expenses', 1)]), 'active_badge' => false ], - [ - 'url' => 'https://akaunting.com/premium-cloud', - 'permission' => 'create-banking-transactions', - 'text' => trans('import.title', ['type' => trans_choice('general.bank_transactions', 2)]), - 'description' => '', - 'active_badge' => false - ] ]" /> @endif From 41bdf04586fe8af1cc220cbf75e6260711abb943 Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Wed, 26 Oct 2022 13:46:15 +0300 Subject: [PATCH 3/7] necessary class name added --- resources/views/common/items/index.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/common/items/index.blade.php b/resources/views/common/items/index.blade.php index f4cf11ea8..615990d46 100644 --- a/resources/views/common/items/index.blade.php +++ b/resources/views/common/items/index.blade.php @@ -84,7 +84,7 @@ - + {{ $item->name }} @if (! $item->enabled) From 7523d79dc31f8312d91889d451de93094487e7cf Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Thu, 27 Oct 2022 10:34:53 +0300 Subject: [PATCH 4/7] marquee function refaactoring --- public/akaunting-js/generalAction.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/public/akaunting-js/generalAction.js b/public/akaunting-js/generalAction.js index f76732771..cbf0431bc 100644 --- a/public/akaunting-js/generalAction.js +++ b/public/akaunting-js/generalAction.js @@ -426,14 +426,16 @@ document.querySelectorAll('[data-truncate-marquee]').forEach((truncate) => { //disable/enable icons ejected from data-truncate-marquee, HTML of icons ejected from parent element (data-truncate-marquee) document.querySelectorAll('[data-index-icon]').forEach((defaultText) => { let icon_parents_element = defaultText.parentElement.parentElement.parentElement; - + if (icon_parents_element.classList.contains('flex')) { icon_parents_element.appendChild(defaultText); } else { - icon_parents_element.parentElement.appendChild(defaultText); + if (icon_parents_element.classList.contains('overflow-x-hidden')) { + icon_parents_element.parentElement.appendChild(defaultText); + } else { + defaultText.parentElement.appendChild(defaultText); + } } - - // defaultText.parentElement.parentElement.parentElement.parentElement.appendChild(defaultText); }); //disable/enable icons ejected from data-truncate-marquee From 8029fb602b4eb1cf3c477f5b74c19536f1d67715 Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Thu, 27 Oct 2022 11:27:04 +0300 Subject: [PATCH 5/7] form styling for company wizard --- resources/assets/js/views/wizard/Company.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/assets/js/views/wizard/Company.vue b/resources/assets/js/views/wizard/Company.vue index 23995a026..42f6b31ad 100644 --- a/resources/assets/js/views/wizard/Company.vue +++ b/resources/assets/js/views/wizard/Company.vue @@ -61,7 +61,7 @@ > -
+
@@ -90,7 +90,7 @@ {{ translations.company.logo }} - +
From de80bc85a434ee1409c27ea8d6deefb07406017a Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Thu, 27 Oct 2022 12:17:13 +0300 Subject: [PATCH 6/7] ui styling --- public/css/app.css | 14 ++++++++++---- .../components/documents/form/line-item.blade.php | 2 +- resources/views/modules/item/show.blade.php | 4 ++-- safelist.txt | 1 + 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/public/css/app.css b/public/css/app.css index 056b86abc..0f82a05a1 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -50246,10 +50246,6 @@ body{ width: 66.666667%; } - .lg\:w-auto{ - width: auto; - } - .lg\:w-1\/4{ width: 25%; } @@ -50266,6 +50262,10 @@ body{ width: 1rem; } + .lg\:w-auto{ + width: auto; + } + .lg\:w-2\/4{ width: 50%; } @@ -50335,6 +50335,12 @@ body{ gap: 4rem; } + .lg\:space-x-16 > :not([hidden]) ~ :not([hidden]){ + --tw-space-x-reverse: 0; + margin-right: calc(4rem * var(--tw-space-x-reverse)); + margin-left: calc(4rem * calc(1 - var(--tw-space-x-reverse))); + } + .lg\:space-y-0 > :not([hidden]) ~ :not([hidden]){ --tw-space-y-reverse: 0; margin-top: calc(0px * calc(1 - var(--tw-space-y-reverse))); diff --git a/resources/views/components/documents/form/line-item.blade.php b/resources/views/components/documents/form/line-item.blade.php index a4f169718..2180995ab 100644 --- a/resources/views/components/documents/form/line-item.blade.php +++ b/resources/views/components/documents/form/line-item.blade.php @@ -31,7 +31,7 @@ @if (! $hideItemName) -
+
diff --git a/resources/views/modules/item/show.blade.php b/resources/views/modules/item/show.blade.php index 19be9a869..562752e54 100644 --- a/resources/views/modules/item/show.blade.php +++ b/resources/views/modules/item/show.blade.php @@ -15,7 +15,7 @@
-
+
-
+
diff --git a/safelist.txt b/safelist.txt index 96edddc49..a5d5f2780 100644 --- a/safelist.txt +++ b/safelist.txt @@ -14,6 +14,7 @@ lg:px-6 lg:relative lg:right-0 lg:justify-around +lg:space-x-16 ltr:-right-1.5 rtl:-left-1.5 rtl:-scale-x-100 \ No newline at end of file From cb60aee543c6ed8e3792f1ddfd123fe16dcef3e3 Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Thu, 27 Oct 2022 12:32:31 +0300 Subject: [PATCH 7/7] file styling --- resources/assets/js/views/wizard/Company.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/js/views/wizard/Company.vue b/resources/assets/js/views/wizard/Company.vue index 42f6b31ad..42831b9b5 100644 --- a/resources/assets/js/views/wizard/Company.vue +++ b/resources/assets/js/views/wizard/Company.vue @@ -90,7 +90,7 @@ {{ translations.company.logo }} - +