Skip to content

Upgrade to Bootstrap 5 #212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Upgrade to Bootstrap 5 #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
853ff4b
Upgrade to Bootstrap 5
madbob Nov 28, 2021
6846510
Update bootstrap.js
taylorotwell Nov 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/Auth/bootstrap-stubs/auth/login.stub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<form method="POST" action="{{ route('login') }}">
@csrf

<div class="form-group row">
<div class="row mb-3">
<label for="email" class="col-md-4 col-form-label text-md-right">{{ __('E-Mail Address') }}</label>

<div class="col-md-6">
Expand All @@ -25,7 +25,7 @@
</div>
</div>

<div class="form-group row">
<div class="row mb-3">
<label for="password" class="col-md-4 col-form-label text-md-right">{{ __('Password') }}</label>

<div class="col-md-6">
Expand All @@ -39,7 +39,7 @@
</div>
</div>

<div class="form-group row">
<div class="row mb-3">
<div class="col-md-6 offset-md-4">
<div class="form-check">
<input class="form-check-input" type="checkbox" name="remember" id="remember" {{ old('remember') ? 'checked' : '' }}>
Expand All @@ -51,7 +51,7 @@
</div>
</div>

<div class="form-group row mb-0">
<div class="row mb-0">
<div class="col-md-8 offset-md-4">
<button type="submit" class="btn btn-primary">
{{ __('Login') }}
Expand Down
4 changes: 2 additions & 2 deletions src/Auth/bootstrap-stubs/auth/passwords/confirm.stub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<form method="POST" action="{{ route('password.confirm') }}">
@csrf

<div class="form-group row">
<div class="row mb-3">
<label for="password" class="col-md-4 col-form-label text-md-right">{{ __('Password') }}</label>

<div class="col-md-6">
Expand All @@ -27,7 +27,7 @@
</div>
</div>

<div class="form-group row mb-0">
<div class="row mb-0">
<div class="col-md-8 offset-md-4">
<button type="submit" class="btn btn-primary">
{{ __('Confirm Password') }}
Expand Down
4 changes: 2 additions & 2 deletions src/Auth/bootstrap-stubs/auth/passwords/email.stub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<form method="POST" action="{{ route('password.email') }}">
@csrf

<div class="form-group row">
<div class="row mb-3">
<label for="email" class="col-md-4 col-form-label text-md-right">{{ __('E-Mail Address') }}</label>

<div class="col-md-6">
Expand All @@ -31,7 +31,7 @@
</div>
</div>

<div class="form-group row mb-0">
<div class="row mb-0">
<div class="col-md-6 offset-md-4">
<button type="submit" class="btn btn-primary">
{{ __('Send Password Reset Link') }}
Expand Down
8 changes: 4 additions & 4 deletions src/Auth/bootstrap-stubs/auth/passwords/reset.stub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<input type="hidden" name="token" value="{{ $token }}">

<div class="form-group row">
<div class="row mb-3">
<label for="email" class="col-md-4 col-form-label text-md-right">{{ __('E-Mail Address') }}</label>

<div class="col-md-6">
Expand All @@ -27,7 +27,7 @@
</div>
</div>

<div class="form-group row">
<div class="row mb-3">
<label for="password" class="col-md-4 col-form-label text-md-right">{{ __('Password') }}</label>

<div class="col-md-6">
Expand All @@ -41,15 +41,15 @@
</div>
</div>

<div class="form-group row">
<div class="row mb-3">
<label for="password-confirm" class="col-md-4 col-form-label text-md-right">{{ __('Confirm Password') }}</label>

<div class="col-md-6">
<input id="password-confirm" type="password" class="form-control" name="password_confirmation" required autocomplete="new-password">
</div>
</div>

<div class="form-group row mb-0">
<div class="row mb-0">
<div class="col-md-6 offset-md-4">
<button type="submit" class="btn btn-primary">
{{ __('Reset Password') }}
Expand Down
10 changes: 5 additions & 5 deletions src/Auth/bootstrap-stubs/auth/register.stub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<form method="POST" action="{{ route('register') }}">
@csrf

<div class="form-group row">
<div class="row mb-3">
<label for="name" class="col-md-4 col-form-label text-md-right">{{ __('Name') }}</label>

<div class="col-md-6">
Expand All @@ -25,7 +25,7 @@
</div>
</div>

<div class="form-group row">
<div class="row mb-3">
<label for="email" class="col-md-4 col-form-label text-md-right">{{ __('E-Mail Address') }}</label>

<div class="col-md-6">
Expand All @@ -39,7 +39,7 @@
</div>
</div>

<div class="form-group row">
<div class="row mb-3">
<label for="password" class="col-md-4 col-form-label text-md-right">{{ __('Password') }}</label>

<div class="col-md-6">
Expand All @@ -53,15 +53,15 @@
</div>
</div>

<div class="form-group row">
<div class="row mb-3">
<label for="password-confirm" class="col-md-4 col-form-label text-md-right">{{ __('Confirm Password') }}</label>

<div class="col-md-6">
<input id="password-confirm" type="password" class="form-control" name="password_confirmation" required autocomplete="new-password">
</div>
</div>

<div class="form-group row mb-0">
<div class="row mb-0">
<div class="col-md-6 offset-md-4">
<button type="submit" class="btn btn-primary">
{{ __('Register') }}
Expand Down
8 changes: 4 additions & 4 deletions src/Auth/bootstrap-stubs/layouts/app.stub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,18 @@
<a class="navbar-brand" href="{{ url('/') }}">
{{ config('app.name', 'Laravel') }}
</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">

</ul>

<!-- Right Side Of Navbar -->
<ul class="navbar-nav ml-auto">
<ul class="navbar-nav ms-auto">
<!-- Authentication Links -->
@guest
@if (Route::has('login'))
Expand All @@ -53,7 +53,7 @@
@endif
@else
<li class="nav-item dropdown">
<a id="navbarDropdown" class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
<a id="navbarDropdown" class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
{{ Auth::user()->name }}
</a>

Expand Down
5 changes: 2 additions & 3 deletions src/Presets/Bootstrap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,8 @@ public static function install()
protected static function updatePackageArray(array $packages)
{
return [
'bootstrap' => '^4.6.0',
'jquery' => '^3.6',
'popper.js' => '^1.16.1',
'bootstrap' => '^5.1.3',
'@popperjs/core' => '^2.10.2',
'sass' => '^1.32.11',
'sass-loader' => '^11.0.1',
] + $packages;
Expand Down
9 changes: 0 additions & 9 deletions src/Presets/bootstrap-stubs/bootstrap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
window._ = require('lodash');

/**
* We'll load jQuery and the Bootstrap jQuery plugin which provides support
* for JavaScript based Bootstrap features such as modals and tabs. This
* code may be modified to fit the specific needs of your application.
*/

try {
window.Popper = require('popper.js').default;
window.$ = window.jQuery = require('jquery');

require('bootstrap');
} catch (e) {}

Expand Down