From 47090f03ded0bfd5edc3284df509b39bbf1e60d7 Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Fri, 9 Sep 2022 09:36:57 +0300 Subject: [PATCH 1/2] rtl controlled --- public/css/app.css | 42 +++++++++++++++++++ public/css/print.css | 26 +++++++++++- resources/assets/sass/app.css | 10 +++++ .../documents/template/default.blade.php | 6 +-- .../documents/template/modern.blade.php | 6 +-- .../components/form/group/toggle.blade.php | 8 ++-- 6 files changed, 87 insertions(+), 11 deletions(-) diff --git a/public/css/app.css b/public/css/app.css index 150baf2bf..3ca14ce7b 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -47211,6 +47211,16 @@ html[dir='rtl'] .el-scrollbar__wrap { opacity: 0.5; } +/* template table border radius control */ +html[dir="rtl"] .lines-radius-border thead td:first-child { + border-radius: 0px 10px 10px 0px; +} + +html[dir="rtl"] .lines-radius-border thead td:last-child { + border-radius: 10px 0px 0px 10px; +} +/* template table border radius control */ + [dir="ltr"] .ltr\:-right-57 { right: -14.5rem; } @@ -47943,6 +47953,22 @@ body{ margin-left: calc(0.5rem * calc(1 - var(--tw-space-x-reverse))); } +[dir="ltr"] .ltr\:rounded-tl-lg{ + border-top-left-radius: 0.5rem; +} + +[dir="ltr"] .ltr\:rounded-bl-lg{ + border-bottom-left-radius: 0.5rem; +} + +[dir="ltr"] .ltr\:rounded-tr-lg{ + border-top-right-radius: 0.5rem; +} + +[dir="ltr"] .ltr\:rounded-br-lg{ + border-bottom-right-radius: 0.5rem; +} + [dir="ltr"] .ltr\:pr-6{ padding-right: 1.5rem; } @@ -48122,6 +48148,22 @@ body{ --tw-space-x-reverse: 1; } +[dir="rtl"] .rtl\:rounded-tr-lg{ + border-top-right-radius: 0.5rem; +} + +[dir="rtl"] .rtl\:rounded-br-lg{ + border-bottom-right-radius: 0.5rem; +} + +[dir="rtl"] .rtl\:rounded-tl-lg{ + border-top-left-radius: 0.5rem; +} + +[dir="rtl"] .rtl\:rounded-bl-lg{ + border-bottom-left-radius: 0.5rem; +} + [dir="rtl"] .rtl\:pl-6{ padding-left: 1.5rem; } diff --git a/public/css/print.css b/public/css/print.css index 738af5d3e..964c24adf 100644 --- a/public/css/print.css +++ b/public/css/print.css @@ -242,7 +242,7 @@ html[dir='rtl'] .print-template .ml-2 border-radius: 0.25rem } -html[dir='ltr'] .border-radius-first { +/* html[dir='ltr'] .border-radius-first { border-radius: 10px 0px 0px 10px; } @@ -256,8 +256,18 @@ html[dir='ltr'] .border-radius-last { html[dir='rtl'] .border-radius-last { border-radius: 10px 0px 0px 10px; +} */ + +/* template table border radius control */ +html[dir="ltr"] .lines-radius-border thead td:first-child { + border-radius: 10px 0px 0px 10px; } +html[dir="ltr"] .lines-radius-border thead td:last-child { + border-radius: 0px 10px 10px 0px; +} +/* template table border radius control */ + html[dir='ltr'] .float-left { float: left !important; @@ -371,6 +381,13 @@ html[dir='rtl'] .text-right vertical-align: top; } +.col-55 +{ + display: inline-block; + width: 55%; + vertical-align: top; +} + .col-50 { display: inline-block; @@ -378,6 +395,13 @@ html[dir='rtl'] .text-right vertical-align: top; } +.col-45 +{ + display: inline-block; + width: 45%; + vertical-align: top; +} + .col-42 { display: inline-block; diff --git a/resources/assets/sass/app.css b/resources/assets/sass/app.css index 2e5d15b39..f7bccae24 100644 --- a/resources/assets/sass/app.css +++ b/resources/assets/sass/app.css @@ -503,6 +503,16 @@ html[dir='rtl'] .el-scrollbar__wrap { @apply cursor-default pointer-events-none opacity-50; } +/* template table border radius control */ +html[dir="rtl"] .lines-radius-border thead td:first-child { + border-radius: 0px 10px 10px 0px; +} + +html[dir="rtl"] .lines-radius-border thead td:last-child { + border-radius: 10px 0px 0px 10px; +} +/* template table border radius control */ + [dir="ltr"] .ltr\:-right-57 { right: -14.5rem; } diff --git a/resources/views/components/documents/template/default.blade.php b/resources/views/components/documents/template/default.blade.php index 023e80b44..705645817 100644 --- a/resources/views/components/documents/template/default.blade.php +++ b/resources/views/components/documents/template/default.blade.php @@ -195,12 +195,12 @@
- +
@stack('name_th_start') @if (! $hideItems || (! $hideName && ! $hideDescription)) -
+ {{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }} @@ -242,7 +242,7 @@ @stack('total_th_start') @if (! $hideAmount) - + {{ trans($textAmount) }} diff --git a/resources/views/components/documents/template/modern.blade.php b/resources/views/components/documents/template/modern.blade.php index ee83c890b..7345a4fe2 100644 --- a/resources/views/components/documents/template/modern.blade.php +++ b/resources/views/components/documents/template/modern.blade.php @@ -206,12 +206,12 @@
- +
@stack('name_th_start') @if (! $hideItems || (! $hideName && ! $hideDescription)) - @endif @@ -245,7 +245,7 @@ @stack('total_th_start') @if (! $hideAmount) - @endif diff --git a/resources/views/components/form/group/toggle.blade.php b/resources/views/components/form/group/toggle.blade.php index 1bd1459b2..ee43b789c 100644 --- a/resources/views/components/form/group/toggle.blade.php +++ b/resources/views/components/form/group/toggle.blade.php @@ -11,24 +11,24 @@
@if (empty($attributes['disabled'])) -
+ {{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }} + {{ trans($textAmount) }}