Merge pull request #62 from daredloco/v2.x

Fixed navbar and margin for bootstrap 5
nascent-africa · Oct 8, 2021 · c5b027c · c5b027c
2 parents 8ed86bb + 0b90ed2
commit c5b027c
Show file tree

Hide file tree

Showing 78 changed files with 157 additions and 157 deletions.
diff --git a/breeze/inertia/resources/js/Layouts/Authenticated.vue b/breeze/inertia/resources/js/Layouts/Authenticated.vue
@@ -8,7 +8,7 @@
             <breeze-application-logo width="36" />
           </Link>
         </a>
-        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="{{ __('Toggle navigation') }}">
+        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="{{ __('Toggle navigation') }}">
           <span class="navbar-toggler-icon"></span>
         </button>
 

diff --git a/breeze/inertia/resources/js/Pages/Auth/Register.vue b/breeze/inertia/resources/js/Pages/Auth/Register.vue
@@ -28,7 +28,7 @@
 
       <div class="mb-0">
         <div class="d-flex justify-content-end align-items-baseline">
-          <Link :href="route('login')" class="text-muted mr-3 text-decoration-none">
+          <Link :href="route('login')" class="text-muted me-3 text-decoration-none">
             Already registered?
           </Link>
 

diff --git a/presets/AdminLte/breeze/inertia/resources/js/Layouts/Authenticated.vue b/presets/AdminLte/breeze/inertia/resources/js/Layouts/Authenticated.vue
@@ -14,11 +14,11 @@
       </ul>
 
       <!-- Right navbar links -->
-      <ul class="navbar-nav ml-auto">
+      <ul class="navbar-nav ms-auto">
         <breeze-dropdown id="settingsDropdown" classes="nav-item dropdown user-menu">
           <template #trigger>
             {{ $page.props.auth.user.name }}
-            <svg class="ml-2" width="18" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
+            <svg class="ms-2" width="18" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
               <path fill-rule="evenodd" d="M10 3a1 1 0 01.707.293l3 3a1 1 0 01-1.414 1.414L10 5.414 7.707 7.707a1 1 0 01-1.414-1.414l3-3A1 1 0 0110 3zm-3.707 9.293a1 1 0 011.414 0L10 14.586l2.293-2.293a1 1 0 011.414 1.414l-3 3a1 1 0 01-1.414 0l-3-3a1 1 0 010-1.414z" clip-rule="evenodd" />
             </svg>
           </template>

diff --git a/presets/AdminLte/breeze/resources/views/layouts/navigation.blade.php b/presets/AdminLte/breeze/resources/views/layouts/navigation.blade.php
@@ -16,7 +16,7 @@
     </ul>
 
     <!-- Right navbar links -->
-    <ul class="navbar-nav ml-auto">
+    <ul class="navbar-nav ms-auto">
         <!-- Authentication Links -->
         @auth
             <x-dropdown id="navbarDropdown" class="user-menu">

diff --git a/presets/AdminLte/inertia/resources/js/Jetstream/Dropdown.vue b/presets/AdminLte/inertia/resources/js/Jetstream/Dropdown.vue
@@ -1,6 +1,6 @@
 <template>
   <li :class="classes">
-    <a :id="id" href="#" class="nav-link" role="button" data-toggle="dropdown" aria-expanded="false">
+    <a :id="id" href="#" class="nav-link" role="button" data-bs-toggle="dropdown" aria-expanded="false">
       <slot name="trigger"></slot>
     </a>
 

diff --git a/presets/AdminLte/inertia/resources/js/Jetstream/Welcome.vue b/presets/AdminLte/inertia/resources/js/Jetstream/Welcome.vue
@@ -36,7 +36,7 @@
                     <div class="mt-3 d-flex align-content-center font-weight-bold text-primary">
                       <div>Explore the documentation</div>
 
-                      <div class="ml-1 text-primary">
+                      <div class="ms-1 text-primary">
                         <svg viewBox="0 0 20 20" fill="currentColor" width="16" class="arrow-right w-4 h-4"><path fill-rule="evenodd" d="M10.293 3.293a1 1 0 011.414 0l6 6a1 1 0 010 1.414l-6 6a1 1 0 01-1.414-1.414L14.586 11H3a1 1 0 110-2h11.586l-4.293-4.293a1 1 0 010-1.414z" clip-rule="evenodd"></path></svg>
                       </div>
                     </div>
@@ -63,7 +63,7 @@
                     <div class="mt-3 d-flex align-content-center font-weight-bold text-primary">
                       <div>Start watching Laracasts</div>
 
-                      <div class="ml-1 text-primary">
+                      <div class="ms-1 text-primary">
                         <svg viewBox="0 0 20 20" fill="currentColor" width="16" class="arrow-right w-4 h-4"><path fill-rule="evenodd" d="M10.293 3.293a1 1 0 011.414 0l6 6a1 1 0 010 1.414l-6 6a1 1 0 01-1.414-1.414L14.586 11H3a1 1 0 110-2h11.586l-4.293-4.293a1 1 0 010-1.414z" clip-rule="evenodd"></path></svg>
                       </div>
                     </div>

diff --git a/presets/AdminLte/inertia/resources/js/Layouts/AppLayout.vue b/presets/AdminLte/inertia/resources/js/Layouts/AppLayout.vue
@@ -17,13 +17,13 @@
       </ul>
 
       <!-- Right navbar links -->
-      <ul class="navbar-nav ml-auto">
+      <ul class="navbar-nav ms-auto">
         <!-- Team Management -->
         <jet-dropdown id="teamManagementDropdown" classes="nav-item dropdown user-menu">
           <template #trigger>
             {{ $page.props.user.current_team.name }}
 
-            <svg class="ml-2" width="18" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
+            <svg class="ms-2" width="18" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
               <path fill-rule="evenodd" d="M10 3a1 1 0 01.707.293l3 3a1 1 0 01-1.414 1.414L10 5.414 7.707 7.707a1 1 0 01-1.414-1.414l3-3A1 1 0 0110 3zm-3.707 9.293a1 1 0 011.414 0L10 14.586l2.293-2.293a1 1 0 011.414 1.414l-3 3a1 1 0 01-1.414 0l-3-3a1 1 0 010-1.414z" clip-rule="evenodd" />
             </svg>
           </template>
@@ -55,7 +55,7 @@
                 <form @submit.prevent="switchToTeam(team)">
                   <jet-dropdown-link as="button">
                     <div class="d-flex">
-                      <svg v-if="team.id == $page.props.user.current_team_id" class="mr-1 text-success" width="20" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" stroke="currentColor" viewBox="0 0 24 24">
+                      <svg v-if="team.id == $page.props.user.current_team_id" class="me-1 text-success" width="20" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" stroke="currentColor" viewBox="0 0 24 24">
                         <path d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z"></path>
                       </svg>
                       <span class="text-truncate" style="width: 12rem;">{{ team.name }}</span>
@@ -70,9 +70,9 @@
         <jet-dropdown id="settingsDropdown" classes="nav-item dropdown user-menu">
           <template #trigger>
             <img v-if="$page.props.jetstream.managesProfilePhotos" class="user-image img-circle elevation-1" width="32" height="32" :src="$page.props.user.profile_photo_url" :alt="$page.props.user.name" />
-            <span v-else class="d-none d-md-inline ml-2">{{ $page.props.user.name }}</span>
+            <span v-else class="d-none d-md-inline ms-2">{{ $page.props.user.name }}</span>
 
-            <svg class="ml-2" width="18" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
+            <svg class="ms-2" width="18" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
               <path fill-rule="evenodd" d="M10 3a1 1 0 01.707.293l3 3a1 1 0 01-1.414 1.414L10 5.414 7.707 7.707a1 1 0 01-1.414-1.414l3-3A1 1 0 0110 3zm-3.707 9.293a1 1 0 011.414 0L10 14.586l2.293-2.293a1 1 0 011.414 1.414l-3 3a1 1 0 01-1.414 0l-3-3a1 1 0 010-1.414z" clip-rule="evenodd" />
             </svg>
           </template>

diff --git a/presets/AdminLte/resources/views/components/dropdown.blade.php b/presets/AdminLte/resources/views/components/dropdown.blade.php
@@ -1,7 +1,7 @@
 @props(['id' => 'navbarDropdown'])
 
 <li {!! $attributes->merge(['class' => 'nav-item dropdown']) !!}>
-    <a id="{{ $id }}" href="#" class="nav-link" role="button" data-toggle="dropdown" aria-expanded="false">
+    <a id="{{ $id }}" href="#" class="nav-link" role="button" data-bs-toggle="dropdown" aria-expanded="false">
         {{ $trigger }}
     </a>
 

diff --git a/presets/AdminLte/resources/views/components/welcome.blade.php b/presets/AdminLte/resources/views/components/welcome.blade.php
@@ -35,7 +35,7 @@
                                     <div class="mt-3 d-flex align-content-center font-weight-bold text-primary">
                                         <div>Explore the documentation</div>
 
-                                        <div class="ml-1 text-primary">
+                                        <div class="ms-1 text-primary">
                                             <svg viewBox="0 0 20 20" fill="currentColor" width="16" class="arrow-right w-4 h-4"><path fill-rule="evenodd" d="M10.293 3.293a1 1 0 011.414 0l6 6a1 1 0 010 1.414l-6 6a1 1 0 01-1.414-1.414L14.586 11H3a1 1 0 110-2h11.586l-4.293-4.293a1 1 0 010-1.414z" clip-rule="evenodd"></path></svg>
                                         </div>
                                     </div>
@@ -62,7 +62,7 @@
                                     <div class="mt-3 d-flex align-content-center font-weight-bold text-primary">
                                         <div>Start watching Laracasts</div>
 
-                                        <div class="ml-1 text-primary">
+                                        <div class="ms-1 text-primary">
                                             <svg viewBox="0 0 20 20" fill="currentColor" width="16" class="arrow-right w-4 h-4"><path fill-rule="evenodd" d="M10.293 3.293a1 1 0 011.414 0l6 6a1 1 0 010 1.414l-6 6a1 1 0 01-1.414-1.414L14.586 11H3a1 1 0 110-2h11.586l-4.293-4.293a1 1 0 010-1.414z" clip-rule="evenodd"></path></svg>
                                         </div>
                                     </div>

diff --git a/presets/AdminLte/resources/views/navigation-menu.blade.php b/presets/AdminLte/resources/views/navigation-menu.blade.php
@@ -11,14 +11,14 @@
     </ul>
 
     <!-- Right navbar links -->
-    <ul class="navbar-nav ml-auto">
+    <ul class="navbar-nav ms-auto">
         <!-- Teams Dropdown -->
         @if (Laravel\Jetstream\Jetstream::hasTeamFeatures())
             <x-jet-dropdown id="teamManagementDropdown">
                 <x-slot name="trigger">
                     {{ Auth::user()->currentTeam->name }}
 
-                    <svg class="ml-2" width="18" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
+                    <svg class="ms-2" width="18" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
                         <path fill-rule="evenodd" d="M10 3a1 1 0 01.707.293l3 3a1 1 0 01-1.414 1.414L10 5.414 7.707 7.707a1 1 0 01-1.414-1.414l3-3A1 1 0 0110 3zm-3.707 9.293a1 1 0 011.414 0L10 14.586l2.293-2.293a1 1 0 011.414 1.414l-3 3a1 1 0 01-1.414 0l-3-3a1 1 0 010-1.414z" clip-rule="evenodd" />
                     </svg>
                 </x-slot>
@@ -63,7 +63,7 @@
                     @endif
                     <span class="d-none d-md-inline">{{ Auth::user()->name }}</span>
 
-                    <svg class="ml-2" width="18" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
+                    <svg class="ms-2" width="18" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
                         <path fill-rule="evenodd" d="M10 3a1 1 0 01.707.293l3 3a1 1 0 01-1.414 1.414L10 5.414 7.707 7.707a1 1 0 01-1.414-1.414l3-3A1 1 0 0110 3zm-3.707 9.293a1 1 0 011.414 0L10 14.586l2.293-2.293a1 1 0 011.414 1.414l-3 3a1 1 0 01-1.414 0l-3-3a1 1 0 010-1.414z" clip-rule="evenodd" />
                     </svg>
                 </x-slot>

diff --git a/presets/Common/breeze/inertia/resources/js/Layouts/Authenticated.vue b/presets/Common/breeze/inertia/resources/js/Layouts/Authenticated.vue
@@ -8,26 +8,26 @@
             <breeze-application-logo width="36" />
           </Link>
         </a>
-        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="{{ __('Toggle navigation') }}">
+        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="{{ __('Toggle navigation') }}">
           <span class="navbar-toggler-icon"></span>
         </button>
 
         <div class="collapse navbar-collapse" id="navbarSupportedContent">
           <!-- Left Side Of Navbar -->
-          <ul class="navbar-nav mr-auto">
+          <ul class="navbar-nav me-auto">
             <breeze-nav-link :href="route('dashboard')" :active="route().current('dashboard')">
               Dashboard
             </breeze-nav-link>
           </ul>
 
           <!-- Right Side Of Navbar -->
-          <ul class="navbar-nav ml-auto align-items-baseline">
+          <ul class="navbar-nav ms-auto align-items-baseline">
             <!-- Authentication Links -->
             <breeze-dropdown id="settingsDropdown">
               <template #trigger>
                 {{ $page.props.auth.user.name }}
 
-                <svg class="ml-2" width="18" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
+                <svg class="ms-2" width="18" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
                   <path fill-rule="evenodd" d="M10 3a1 1 0 01.707.293l3 3a1 1 0 01-1.414 1.414L10 5.414 7.707 7.707a1 1 0 01-1.414-1.414l3-3A1 1 0 0110 3zm-3.707 9.293a1 1 0 011.414 0L10 14.586l2.293-2.293a1 1 0 011.414 1.414l-3 3a1 1 0 01-1.414 0l-3-3a1 1 0 010-1.414z" clip-rule="evenodd" />
                 </svg>
               </template>

diff --git a/presets/Common/breeze/inertia/resources/js/Pages/Auth/ConfirmPassword.vue b/presets/Common/breeze/inertia/resources/js/Pages/Auth/ConfirmPassword.vue
@@ -16,7 +16,7 @@
       </div>
 
       <div class="d-flex justify-content-end mt-2">
-        <breeze-button class="ml-4" :class="{ 'text-white-50': form.processing }" :disabled="form.processing">
+        <breeze-button class="ms-4" :class="{ 'text-white-50': form.processing }" :disabled="form.processing">
           Confirm
         </breeze-button>
       </div>

diff --git a/presets/Common/breeze/inertia/resources/js/Pages/Auth/Login.vue b/presets/Common/breeze/inertia/resources/js/Pages/Auth/Login.vue
@@ -32,11 +32,11 @@
 
       <div class="mb-0">
         <div class="d-flex justify-content-end align-items-baseline">
-          <Link v-if="canResetPassword" :href="route('password.request')" class="text-muted mr-3">
+          <Link v-if="canResetPassword" :href="route('password.request')" class="text-muted me-3">
             Forgot your password?
           </Link>
 
-          <breeze-button class="ml-4" :class="{ 'text-white-50': form.processing }" :disabled="form.processing">
+          <breeze-button class="ms-4" :class="{ 'text-white-50': form.processing }" :disabled="form.processing">
             Log in
           </breeze-button>
         </div>

diff --git a/presets/Common/breeze/inertia/resources/js/Pages/Auth/Register.vue b/presets/Common/breeze/inertia/resources/js/Pages/Auth/Register.vue
@@ -38,11 +38,11 @@
 
       <div class="mb-0">
         <div class="d-flex justify-content-end align-items-baseline">
-          <Link :href="route('login')" class="text-muted mr-3 text-decoration-none">
+          <Link :href="route('login')" class="text-muted me-3 text-decoration-none">
             Already registered?
           </Link>
 
-          <breeze-button class="ml-4" :class="{ 'text-white-50': form.processing }" :disabled="form.processing">
+          <breeze-button class="ms-4" :class="{ 'text-white-50': form.processing }" :disabled="form.processing">
             Register
           </breeze-button>
         </div>

diff --git a/presets/Common/breeze/inertia/resources/js/Pages/Welcome.vue b/presets/Common/breeze/inertia/resources/js/Pages/Welcome.vue
@@ -22,7 +22,7 @@
               <Link
                 v-if="canRegister"
                 :href="route('register')"
-                class="ml-4 text-muted"
+                class="ms-4 text-muted"
               >
                 Register
               </Link>
@@ -273,7 +273,7 @@
                   stroke-linejoin="round"
                   stroke-width="2"
                   viewBox="0 0 24 24"
-                  class="ml-4 text-muted"
+                  class="ms-4 text-muted"
                   style="width: 18px"
                 >
                   <path

diff --git a/presets/Common/breeze/resources/views/auth/confirm-password.blade.php b/presets/Common/breeze/resources/views/auth/confirm-password.blade.php
@@ -27,7 +27,7 @@
             </div>
 
             <div class="d-flex justify-content-end mt-4">
-                <x-button class="ml-4">
+                <x-button class="ms-4">
                     {{ __('Confirm') }}
                 </x-button>
             </div>

diff --git a/presets/Common/breeze/resources/views/auth/login.blade.php b/presets/Common/breeze/resources/views/auth/login.blade.php
@@ -46,7 +46,7 @@
                 <div class="mb-0">
                     <div class="d-flex justify-content-end align-items-baseline">
                         @if (Route::has('password.request'))
-                            <a class="text-muted mr-3" href="{{ route('password.request') }}">
+                            <a class="text-muted me-3" href="{{ route('password.request') }}">
                                 {{ __('Forgot your password?') }}
                             </a>
                         @endif

diff --git a/presets/Common/breeze/resources/views/auth/register.blade.php b/presets/Common/breeze/resources/views/auth/register.blade.php
@@ -46,7 +46,7 @@
 
                 <div class="mb-0">
                     <div class="d-flex justify-content-end align-items-baseline">
-                        <a class="text-muted mr-3 text-decoration-none" href="{{ route('login') }}">
+                        <a class="text-muted me-3 text-decoration-none" href="{{ route('login') }}">
                             {{ __('Already registered?') }}
                         </a>
 

diff --git a/presets/Common/breeze/resources/views/layouts/navigation.blade.php b/presets/Common/breeze/resources/views/layouts/navigation.blade.php
@@ -4,20 +4,20 @@
         <a class="navbar-brand" href="/">
             <x-application-logo width="36" />
         </a>
-        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="{{ __('Toggle navigation') }}">
+        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="{{ __('Toggle navigation') }}">
             <span class="navbar-toggler-icon"></span>
         </button>
 
         <div class="collapse navbar-collapse" id="navbarSupportedContent">
             <!-- Left Side Of Navbar -->
-            <ul class="navbar-nav mr-auto">
+            <ul class="navbar-nav me-auto">
                 <x-nav-link href="{{ route('dashboard') }}" :active="request()->routeIs('dashboard')">
                     {{ __('Dashboard') }}
                 </x-nav-link>
             </ul>
 
             <!-- Right Side Of Navbar -->
-            <ul class="navbar-nav ml-auto">
+            <ul class="navbar-nav ms-auto">
 
                 <!-- Settings Dropdown -->
                 @auth

diff --git a/presets/Common/components/confirmation-modal.blade.php b/presets/Common/components/confirmation-modal.blade.php
@@ -4,7 +4,7 @@
     <div class="modal-content">
         <div class="modal-body">
             <div class="d-flex justify-content-start">
-                <div class="mr-3">
+                <div class="me-3">
                     <div class="bg-warning p-2 rounded-circle">
                         <svg stroke="currentColor" fill="none" viewBox="0 0 24 24" width="24">
                             <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z"/>

diff --git a/presets/Common/components/confirms-password.blade.php b/presets/Common/components/confirms-password.blade.php
@@ -38,7 +38,7 @@
             {{ __('Cancel') }}
         </x-jet-secondary-button>
 
-        <x-jet-button class="ml-2" wire:click="confirmPassword" wire:loading.attr="disabled">
+        <x-jet-button class="ms-2" wire:click="confirmPassword" wire:loading.attr="disabled">
             {{ $button }}
         </x-jet-button>
     </x-slot>

diff --git a/presets/Common/components/dropdown.blade.php b/presets/Common/components/dropdown.blade.php
@@ -1,7 +1,7 @@
 @props(['id' => 'navbarDropdown'])
 
 <li class="nav-item dropdown">
-    <a id="{{ $id }}" {!! $attributes->merge(['class' => 'nav-link']) !!} role="button" data-toggle="dropdown" aria-expanded="false">
+    <a id="{{ $id }}" {!! $attributes->merge(['class' => 'nav-link']) !!} role="button" data-bs-toggle="dropdown" aria-expanded="false">
         {{ $trigger }}
     </a>
 

diff --git a/presets/Common/components/switchable-team.blade.php b/presets/Common/components/switchable-team.blade.php
@@ -4,7 +4,7 @@
                                                  document.getElementById('switch-team-form-{{ $team->id }}').submit();">
     <div class="d-flex align-content-center">
         @if (Auth::user()->isCurrentTeam($team))
-            <svg class="mr-1 text-success" width="20" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" stroke="currentColor" viewBox="0 0 24 24"><path d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z"></path></svg>
+            <svg class="me-1 text-success" width="20" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" stroke="currentColor" viewBox="0 0 24 24"><path d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z"></path></svg>
         @endif
 
         <div class="text-truncate" style="width: 12rem;">{{ $team->name }}</div>