Skip to content

Commit 6e725c2

Browse files
murrantmurrant
authored
Merge pull request #496 from laf/rbac
Tweaks to visuals
2 parents dbf85b0 + 49c1ca0 commit 6e725c2

4 files changed

Lines changed: 18 additions & 18 deletions

File tree

‎resources/views/roles/create.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class="tw:inline-flex tw:items-center tw:justify-center tw:w-9 tw:h-9 tw:mt-1 tw
1818
</div>
1919
</div>
2020
<button type="submit" form="role-form"
21-
class="tw:inline-flex tw:items-center tw:gap-2 tw:px-5 tw:py-2.5 tw:rounded-lg tw:bg-indigo-600 tw:hover:bg-indigo-700 tw:text-white tw:font-semibold tw:shadow-sm tw:transition-all tw:duration-150">
21+
class="tw:inline-flex tw:items-center tw:gap-2 tw:px-5 tw:py-2.5 tw:rounded-lg tw:bg-sky-700 tw:hover:bg-sky-800 tw:text-white tw:font-semibold tw:shadow-sm tw:transition-all tw:duration-150">
2222
<i class="fas fa-save tw:text-indigo-200"></i>
2323
{{ __('permissions.rbac.save_role') }}
2424
</button>

‎resources/views/roles/edit.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class="tw:inline-flex tw:items-center tw:justify-center tw:w-9 tw:h-9 tw:mt-1 tw
1818
</div>
1919
</div>
2020
<button type="submit" form="role-form"
21-
class="tw:inline-flex tw:items-center tw:gap-2 tw:px-5 tw:py-2.5 tw:rounded-lg tw:bg-indigo-600 tw:hover:bg-indigo-700 tw:text-white tw:font-semibold tw:shadow-sm tw:transition-all tw:duration-150">
21+
class="tw:inline-flex tw:items-center tw:gap-2 tw:px-5 tw:py-2.5 tw:rounded-lg tw:bg-sky-700 tw:hover:bg-sky-800 tw:text-white tw:font-semibold tw:shadow-sm tw:transition-all tw:duration-150">
2222
<i class="fas fa-save tw:text-indigo-200"></i>
2323
{{ __('permissions.rbac.update_role') }}
2424
</button>

‎resources/views/roles/form-fields.blade.php‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{{-- Role Name --}}
22
<div class="tw:mb-8">
3-
<label for="name" class="tw:block tw:font-semibold tw:tracking-wider tw:text-slate-500 tw:dark:text-dark-white-400 tw:mb-2">
3+
<label for="name" class="tw:block tw:text-2xl tw:font-semibold tw:tracking-wider tw:text-slate-500 tw:dark:text-dark-white-400 tw:mb-2">
44
{{ __('permissions.rbac.role_name') }}
55
</label>
66
<input type="text" name="name" id="name" required
7-
class="tw:w-full tw:px-4 tw:py-2.5 tw:rounded-lg tw:border tw:border-slate-200 tw:dark:border-dark-gray-100 tw:bg-white tw:dark:bg-dark-gray-500 tw:text-slate-800 tw:dark:text-dark-white-100 tw:placeholder-slate-400 tw:dark:placeholder-dark-white-400 tw:focus:outline-none tw:focus:ring-2 tw:focus:ring-indigo-500 tw:dark:focus:ring-dark-gray-100 tw:focus:border-transparent tw:transition tw:duration-150 tw:text-base"
7+
class="tw:w-full tw:px-4 tw:py-2.5 tw:rounded-lg tw:border tw:border-slate-200 tw:dark:border-dark-gray-100 tw:bg-white tw:dark:bg-dark-gray-500 tw:text-slate-800 tw:dark:text-dark-white-100 tw:placeholder-slate-400 tw:dark:placeholder-dark-white-400 tw:focus:outline-none tw:focus:ring-2 tw:focus:ring-indigo-500 tw:dark:focus:ring-dark-gray-100 tw:focus:border-transparent tw:transition tw:duration-150 tw:text-lg"
88
placeholder="{{ __('permissions.rbac.role_name_placeholder') }}"
99
value="{{ old('name', $role->name ?? '') }}"
1010
@if(isset($role) && in_array(strtolower($role->name), ['admin', 'global-read'])) readonly @endif>
@@ -18,7 +18,7 @@ class="tw:w-full tw:px-4 tw:py-2.5 tw:rounded-lg tw:border tw:border-slate-200 t
1818
{{-- Section header --}}
1919
<div class="tw:flex tw:items-center tw:justify-between tw:mb-5 tw:pb-3 tw:border-b tw:border-slate-100 tw:dark:border-dark-gray-200">
2020
<div class="tw:flex tw:items-center tw:gap-4">
21-
<span class="tw:text-lg tw:font-bold tw:text-slate-800 tw:dark:text-dark-white-100">
21+
<span class="tw:text-xl tw:font-bold tw:text-slate-800 tw:dark:text-dark-white-100">
2222
{{ __('permissions.rbac.permissions') }}
2323
</span>
2424
{{-- Search --}}
@@ -28,19 +28,19 @@ class="tw:w-full tw:px-4 tw:py-2.5 tw:rounded-lg tw:border tw:border-slate-200 t
2828
</span>
2929
<input type="text" x-model="search"
3030
placeholder="{{ __('permissions.rbac.search_permissions') }}"
31-
class="tw:pl-8 tw:pr-4 tw:py-1.5 tw:border tw:border-slate-200 tw:dark:border-dark-gray-100 tw:rounded-lg tw:bg-white tw:dark:bg-dark-gray-500 tw:text-slate-800 tw:dark:text-dark-white-200 tw:placeholder-slate-400 tw:dark:placeholder-dark-white-400 tw:focus:outline-none tw:focus:ring-2 tw:focus:ring-indigo-500 tw:dark:focus:ring-dark-gray-100 tw:focus:border-transparent tw:text-sm tw:transition tw:duration-150">
31+
class="tw:pl-8 tw:pr-4 tw:py-1.5 tw:border tw:border-slate-200 tw:dark:border-dark-gray-100 tw:rounded-lg tw:bg-white tw:dark:bg-dark-gray-500 tw:text-slate-800 tw:dark:text-dark-white-200 tw:placeholder-slate-400 tw:dark:placeholder-dark-white-400 tw:focus:outline-none tw:focus:ring-2 tw:focus:ring-indigo-500 tw:dark:focus:ring-dark-gray-100 tw:focus:border-transparent tw:text-lg tw:transition tw:duration-150">
3232
</div>
3333
</div>
3434
<div class="tw:flex tw:items-center tw:gap-3 tw:text-sm">
3535
<button type="button"
3636
@click="permissions = Array.from(document.querySelectorAll('input[name=\'permissions[]\']')).map(el => el.value)"
37-
class="tw:inline-flex tw:items-center tw:gap-1.5 tw:text-indigo-600 tw:dark:text-dark-white-300 tw:hover:text-indigo-800 tw:dark:hover:text-dark-white-100 tw:font-semibold tw:transition-colors tw:duration-150">
37+
class="tw:inline-flex tw:items-center tw:text-lg tw:gap-1.5 tw:text-indigo-600 tw:dark:text-dark-white-300 tw:hover:text-indigo-800 tw:dark:hover:text-dark-white-100 tw:font-semibold tw:transition-colors tw:duration-150">
3838
<i class="fas fa-check-square"></i>{{ __('permissions.rbac.select_all') }}
3939
</button>
4040
<span class="tw:text-slate-300 tw:dark:text-dark-gray-100">|</span>
4141
<button type="button"
4242
@click="permissions = []"
43-
class="tw:inline-flex tw:items-center tw:gap-1.5 tw:text-slate-500 tw:dark:text-dark-white-400 tw:hover:text-slate-700 tw:dark:hover:text-dark-white-200 tw:font-semibold tw:transition-colors tw:duration-150">
43+
class="tw:inline-flex tw:items-center tw:text-lg tw:gap-1.5 tw:text-slate-500 tw:dark:text-dark-white-400 tw:hover:text-slate-700 tw:dark:hover:text-dark-white-200 tw:font-semibold tw:transition-colors tw:duration-150">
4444
<i class="fas fa-square"></i>{{ __('permissions.rbac.clear_all') }}
4545
</button>
4646
</div>
@@ -74,17 +74,17 @@ class="tw:inline-flex tw:items-center tw:gap-1.5 tw:text-slate-500 tw:dark:text-
7474
@foreach($groupPerms as $p)
7575
<div class="tw:flex tw:items-start tw:gap-3"
7676
x-show="isPermMatch('{{ $p['label'] }}', '{{ $p['description'] }}', '{{ $group }}')">
77-
<div class="tw:flex-shrink-0">
77+
<div class="tw:flex tw:items-center tw:h-5">
7878
<input type="checkbox" name="permissions[]" value="{{ $p['name'] }}" id="perm-{{ $p['name'] }}"
7979
x-model="permissions"
80-
class="tw:h-4 tw:w-4 tw:text-indigo-600 tw:focus:ring-indigo-500 tw:border-slate-300 tw:dark:border-dark-gray-100 tw:rounded tw:cursor-pointer tw:bg-white tw:dark:bg-dark-gray-300 tw:transition tw:duration-150">
80+
class="tw:h-6 tw:w-6 tw:text-indigo-600 tw:focus:ring-indigo-500 tw:border-slate-300 tw:dark:border-dark-gray-100 tw:rounded tw:cursor-pointer tw:bg-white tw:dark:bg-dark-gray-300 tw:transition tw:duration-150">
8181
</div>
82-
<div>
83-
<label for="perm-{{ $p['name'] }}" class="tw:block tw:text-lg tw:font-semibold tw:text-slate-800 tw:dark:text-white tw:cursor-pointer tw:leading-7">
82+
<div class="tw:ms-2 tw:text-sm tw:select-none">
83+
<label for="perm-{{ $p['name'] }}" class="tw:block tw:text-xl tw:font-semibold tw:text-slate-800 tw:dark:text-white tw:cursor-pointer tw:leading-7">
8484
{{ $p['label'] }}
8585
</label>
8686
@if($p['description'])
87-
<p class="tw:text-sm tw:text-slate-500 tw:dark:text-dark-white-400 tw:mt-0.5 tw:leading-1">
87+
<p class="tw:text-lg tw:text-slate-500 tw:dark:text-dark-white-400 tw:mt-0.5 tw:leading-1">
8888
{{ $p['description'] }}
8989
</p>
9090
@endif

‎resources/views/roles/index.blade.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
<div class="tw:flex tw:items-center tw:gap-3">
1919
@can('viewAny', \App\Models\User::class)
2020
<a href="{{ route('users.index') }}"
21-
class="tw:inline-flex tw:items-center tw:gap-2 tw:px-4 tw:py-2.5 tw:rounded-lg tw:border tw:border-slate-200 tw:dark:border-dark-gray-100 tw:bg-white tw:dark:bg-dark-gray-400 tw:text-slate-700 tw:dark:text-dark-white-200 tw:font-semibold tw:shadow-sm tw:hover:bg-slate-50 tw:dark:hover:bg-dark-gray-300 tw:hover:border-slate-300 tw:dark:hover:border-dark-gray-100 tw:transition-all tw:duration-150">
21+
class="tw:inline-flex tw:items-center tw:gap-2 tw:px-4 tw:py-2.5 tw:rounded-lg tw:border tw:border-slate-200 tw:dark:border-dark-gray-100 tw:bg-white tw:dark:bg-dark-gray-400 tw:text-slate-700 tw:dark:text-dark-white-200 tw:font-semibold tw:shadow-sm tw:hover:bg-slate-50 tw:dark:hover:bg-dark-gray-300 tw:hover:border-slate-300 tw:dark:hover:border-dark-gray-100 tw:transition-all tw:duration-150 tw:no-underline">
2222
<i class="fas fa-users tw:text-slate-400 tw:dark:text-dark-white-400"></i>
2323
{{ __('permissions.rbac.manage_users') }}
2424
</a>
2525
@endcan
2626
<a href="{{ route('roles.create') }}"
27-
class="tw:inline-flex tw:items-center tw:gap-2 tw:px-5 tw:py-2.5 tw:rounded-lg tw:bg-indigo-600 tw:hover:bg-indigo-700 tw:text-white tw:font-semibold tw:shadow-sm tw:transition-all tw:duration-150">
28-
<i class="fas fa-plus tw:text-indigo-200"></i>
27+
class="tw:inline-flex tw:items-center tw:gap-2 tw:px-5 tw:py-2.5 tw:rounded-lg tw:bg-sky-700 tw:hover:bg-sky-800 tw:text-white tw:font-semibold tw:shadow-sm tw:transition-all tw:duration-150 tw:no-underline">
28+
<i class="fas fa-plus tw:text-white"></i>
2929
{{ __('permissions.rbac.add_role') }}
3030
</a>
3131
</div>
@@ -50,7 +50,7 @@ class="tw:inline-flex tw:items-center tw:gap-2 tw:px-5 tw:py-2.5 tw:rounded-lg t
5050
<div class="tw:text-xl tw:font-bold tw:text-slate-800 tw:dark:text-dark-white-100">
5151
{{ $role->name }}
5252
</div>
53-
<div class="tw:text-xs tw:text-slate-400 tw:dark:text-dark-white-400 tw:mt-1">
53+
<div class="tw:text-base tw:text-slate-400 tw:dark:text-dark-white-400 tw:mt-1">
5454
{{ $role->permissions->count() }} {{ Str::plural('permission', $role->permissions->count()) }}
5555
</div>
5656
</div>
@@ -101,7 +101,7 @@ class="tw:inline-flex">
101101
@method('DELETE')
102102
<button type="submit"
103103
title="{{ __('permissions.rbac.delete_role') }}"
104-
class="tw:inline-flex tw:items-center tw:justify-center tw:w-9 tw:h-9 tw:rounded-lg tw:text-slate-400 tw:dark:text-dark-white-400 tw:hover:text-red-600 tw:dark:hover:text-red-400 tw:hover:bg-red-50 tw:dark:hover:bg-red-900/20 tw:transition-all tw:duration-150">
104+
class="tw:inline-flex tw:items-center tw:justify-center tw:w-9 tw:h-9 tw:rounded-lg tw:text-slate-400 tw:dark:text-dark-red-400 tw:hover:text-red-600 tw:dark:hover:text-red-600 tw:transition-all tw:duration-150">
105105
<i class="fas fa-lg fa-trash"></i>
106106
</button>
107107
</form>

0 commit comments

Comments
 (0)