diff --git a/app/View/Components/Form/Section.php b/app/View/Components/Form/Section.php new file mode 100644 index 000000000..bcff129fe --- /dev/null +++ b/app/View/Components/Form/Section.php @@ -0,0 +1,38 @@ +spacingVertical = $spacingVertical; + $this->spacingHorizontal = $spacingHorizontal; + $this->columnNumber = $columnNumber; + } + + /** + * Get the view / contents that represent the component. + * + * @return \Illuminate\Contracts\View\View|string + */ + public function render() + { + return view('components.form.section.index'); + } +} diff --git a/app/View/Components/Table/Td.php b/app/View/Components/Table/Td.php index 4ff483b7b..7335d9c66 100644 --- a/app/View/Components/Table/Td.php +++ b/app/View/Components/Table/Td.php @@ -11,6 +11,7 @@ class Td extends Component public $override; public $kind; + public $hiddenMobile; /** * Create a new component instance. @@ -18,11 +19,12 @@ class Td extends Component * @return void */ public function __construct( - string $class = '', string $override = '', string $kind = '' + string $class = '', string $override = '', string $kind = '', bool $hiddenMobile = false, ) { $this->override = $this->getOverride($override); $this->kind = $kind; + $this->hiddenMobile = $hiddenMobile; $this->class = $this->getClass($class); } @@ -47,6 +49,10 @@ class Td extends Component return $class; } + if ($this->hiddenMobile) { + $class = $class . ' ' . 'hidden sm:table-cell'; + } + $default = 'py-4 whitespace-nowrap text-sm font-normal text-black truncate'; switch ($this->kind) { @@ -56,6 +62,9 @@ class Td extends Component case 'right': $default = $class . ' ltr:pl-6 rtl:pr-6 ltr:text-right rtl:text-left ' . $default; break; + case 'bulkaction': + $default = $class . 'ltr:pr-6 rtl:pl-6 hidden sm:table-cell'; + break; case 'action': $default = 'p-0'; break; diff --git a/app/View/Components/Table/Th.php b/app/View/Components/Table/Th.php index a46be84dd..570301f29 100644 --- a/app/View/Components/Table/Th.php +++ b/app/View/Components/Table/Th.php @@ -12,17 +12,20 @@ class Th extends Component public $kind; + public $hiddenMobile; + /** * Create a new component instance. * * @return void */ public function __construct( - string $class = '', string $override = '', string $kind = '' + string $class = '', string $override = '', string $kind = '', bool $hiddenMobile = false, ) { $this->override = $this->getOverride($override); $this->kind = $kind; + $this->hiddenMobile = $hiddenMobile; $this->class = $this->getClass($class); } @@ -47,6 +50,10 @@ class Th extends Component return $class; } + if ($this->hiddenMobile) { + $class = $class . ' ' . 'hidden sm:table-cell'; + } + $default = 'py-3 text-xs font-medium text-black tracking-wider'; switch ($this->kind) { @@ -56,6 +63,9 @@ class Th extends Component case 'right': $default = $class . ' ltr:pl-6 rtl:pr-6 ltr:text-right rtl:text-left' . $default; break; + case 'bulkaction': + $default = $class . 'ltr:pr-6 rtl:pl-6 hidden sm:table-cell'; + break; default: $default = $class . ' ltr:pr-6 rtl:pl-6 ltr:text-left rtl:text-right ' . $default; } diff --git a/app/View/Components/Table/Tr.php b/app/View/Components/Table/Tr.php index 29fc3ebf0..a781b208f 100644 --- a/app/View/Components/Table/Tr.php +++ b/app/View/Components/Table/Tr.php @@ -45,6 +45,10 @@ class Tr extends Component return 'relative flex items-center px-1 group border-b hover:bg-gray-100'; } + else if (array_key_exists('App\View\Components\Table\Thead', $values)) { + return 'flex items-center px-1'; + } + return ''; } } diff --git a/public/css/app.css b/public/css/app.css index 150baf2bf..9832fdae6 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -47697,10 +47697,6 @@ body{ border-color: rgb(85 88 139 / var(--tw-border-opacity)); } -.focus\:border-transparent:focus{ - border-color: transparent; -} - .focus\:border-blue-300:focus{ --tw-border-opacity: 1; border-color: rgb(153 197 219 / var(--tw-border-opacity)); @@ -47791,11 +47787,6 @@ body{ transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y)); } -.group:hover .group-hover\:border-black{ - --tw-border-opacity: 1; - border-color: rgb(66 66 66 / var(--tw-border-opacity)); -} - .group:hover .group-hover\:bg-gray-900{ --tw-bg-opacity: 1; background-color: rgb(17 24 39 / var(--tw-bg-opacity)); @@ -47947,18 +47938,14 @@ body{ padding-right: 1.5rem; } -[dir="ltr"] .ltr\:pl-0{ - padding-left: 0px; +[dir="ltr"] .ltr\:pr-0{ + padding-right: 0px; } [dir="ltr"] .ltr\:pl-6{ padding-left: 1.5rem; } -[dir="ltr"] .ltr\:pr-0{ - padding-right: 0px; -} - [dir="ltr"] .ltr\:pl-3{ padding-left: 0.75rem; } @@ -48126,18 +48113,14 @@ body{ padding-left: 1.5rem; } -[dir="rtl"] .rtl\:pr-0{ - padding-right: 0px; -} - -[dir="rtl"] .rtl\:pr-6{ - padding-right: 1.5rem; -} - [dir="rtl"] .rtl\:pl-0{ padding-left: 0px; } +[dir="rtl"] .rtl\:pr-0{ + padding-right: 0px; +} + [dir="rtl"] .rtl\:pr-3{ padding-right: 0.75rem; } @@ -48484,6 +48467,10 @@ body{ width: 25%; } + .lg\:w-2\/12{ + width: 16.666667%; + } + .lg\:w-80{ width: 20rem; } @@ -48504,10 +48491,6 @@ body{ width: 60%; } - .lg\:w-2\/12{ - width: 16.666667%; - } - .lg\:w-7\/12{ width: 58.333333%; } @@ -48716,14 +48699,14 @@ body{ padding-left: 3rem; } - [dir="ltr"] .lg\:ltr\:pl-24{ - padding-left: 6rem; - } - [dir="ltr"] .ltr\:lg\:pl-8{ padding-left: 2rem; } + [dir="ltr"] .lg\:ltr\:pl-24{ + padding-left: 6rem; + } + [dir="rtl"] .lg\:rtl\:left-0{ left: 0px; } @@ -48736,13 +48719,13 @@ body{ padding-right: 3rem; } - [dir="rtl"] .lg\:rtl\:pr-24{ - padding-right: 6rem; - } - [dir="rtl"] .rtl\:lg\:pr-8{ padding-right: 2rem; } + + [dir="rtl"] .lg\:rtl\:pr-24{ + padding-right: 6rem; + } } @media (min-width: 1280px){ diff --git a/resources/lang/en-GB/transfers.php b/resources/lang/en-GB/transfers.php index 93be947e6..becce0773 100644 --- a/resources/lang/en-GB/transfers.php +++ b/resources/lang/en-GB/transfers.php @@ -28,6 +28,7 @@ return [ 'create' => ':user created this transfer on :date', 'transactions' => 'List of transactions related to this transfer', 'transactions_desc' => ':number transaction for :account', + 'attachments' => 'Download the files attached to this transfer', ], ]; diff --git a/resources/views/auth/login/create.blade.php b/resources/views/auth/login/create.blade.php index 7b0eb2802..816af196c 100644 --- a/resources/views/auth/login/create.blade.php +++ b/resources/views/auth/login/create.blade.php @@ -57,9 +57,9 @@ @stack('remember_input_end') @stack('forgotten-password-start') - + {{ trans('auth.forgot_password') }} - + @stack('forgotten-password-end') diff --git a/resources/views/auth/users/index.blade.php b/resources/views/auth/users/index.blade.php index fce1e7877..a05162575 100644 --- a/resources/views/auth/users/index.blade.php +++ b/resources/views/auth/users/index.blade.php @@ -25,8 +25,8 @@ - - - + @@ -47,7 +47,7 @@ @foreach($users as $item) -