Skip to content

Upgrade Bootstrap 4.5.3 → 5.3.8 in BFF and various samples #411

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

Merged
maartenba merged 2 commits into from
Oct 27, 2026
Merged

Upgrade Bootstrap 4.5.3 → 5.3.8 in BFF and various samples #411

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
1e10631
Upgrade Bootstrap 4.5.3 to 5.3.8 in BFF and various samples
damianh Oct 27, 2026
3fb25c1
Restore responsive wrapping in BFF TODO forms
damianh Oct 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 3 additions & 2 deletions BFF/v2/JsBffSample/FrontendHost/wwwroot/StyleSheet.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ pre:empty {
display: none;
}

.form-inline {
.todo-form {
margin-bottom: 30px;
}
.form-control{
Expand All @@ -30,8 +30,9 @@ pre:empty {
.buttons > div {
display:inline;
}
.form-inline label {
.todo-form label {
font-weight:bold;
white-space:nowrap;
margin-right:15px;
}
.banner{
Expand Down
11 changes: 5 additions & 6 deletions BFF/v2/JsBffSample/FrontendHost/wwwroot/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ <h1>TODOs</h1>
<div class="col">
<h3>Add New</h3>
</div>
<div class="form-inline">
<div class="col-auto todo-form d-flex flex-wrap align-items-center">
<label for="date">Todo Date</label>
<input class="form-control" id="date" type="datetime" value="2021-03-01" />
<input class="form-control w-auto" id="date" type="datetime" value="2021-03-01" />
<label for="name">Todo Name</label>
<input class="form-control" id="name" value="Do something" />
<button class="form-control btn-success" id="createNewButton">Create</button>
<input class="form-control w-auto" id="name" value="Do something" />
<button class="form-control w-auto btn btn-success" id="createNewButton">Create</button>
</div>
</div>

Expand Down Expand Up @@ -79,7 +79,7 @@ <h2 class="modal-title">Session Claims</h2>
</table>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
<button type="button" class="btn btn-primary" data-bs-dismiss="modal">Close</button>
</div>
</div>
</div>
Expand All @@ -88,7 +88,6 @@ <h2 class="modal-title">Session Claims</h2>
</div>


<script src="libs/jquery-3.6.0.min.js"></script>
<script src="libs/bootstrap.bundle.min.js"></script>
<script src="session.js"></script>
<script src="todo.js"></script>
Expand Down
6 changes: 3 additions & 3 deletions BFF/v2/JsBffSample/FrontendHost/wwwroot/libs/bootstrap.bundle.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion BFF/v2/JsBffSample/FrontendHost/wwwroot/libs/bootstrap.bundle.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 4 additions & 5 deletions BFF/v2/JsBffSample/FrontendHost/wwwroot/libs/bootstrap.min.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion BFF/v2/JsBffSample/FrontendHost/wwwroot/libs/bootstrap.min.css.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions BFF/v2/JsBffSample/FrontendHost/wwwroot/libs/jquery-3.6.0.min.js
View file
Open in desktop

This file was deleted.

5 changes: 3 additions & 2 deletions BFF/v2/JsBffYarpSample/FrontendHost/wwwroot/StyleSheet.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ pre:empty {
display: none;
}

.form-inline {
.todo-form {
margin-bottom: 30px;
}
.form-control{
Expand All @@ -30,8 +30,9 @@ pre:empty {
.buttons > div {
display:inline;
}
.form-inline label {
.todo-form label {
font-weight:bold;
white-space:nowrap;
margin-right:15px;
}
.banner{
Expand Down
11 changes: 5 additions & 6 deletions BFF/v2/JsBffYarpSample/FrontendHost/wwwroot/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ <h1>TODOs</h1>
<div class="col">
<h3>Add New</h3>
</div>
<div class="form-inline">
<div class="col-auto todo-form d-flex flex-wrap align-items-center">
<label for="date">Todo Date</label>
<input class="form-control" id="date" type="datetime" value="2021-03-01" />
<input class="form-control w-auto" id="date" type="datetime" value="2021-03-01" />
<label for="name">Todo Name</label>
<input class="form-control" id="name" value="Do something" />
<button class="form-control btn-success" id="createNewButton">Create</button>
<input class="form-control w-auto" id="name" value="Do something" />
<button class="form-control w-auto btn btn-success" id="createNewButton">Create</button>
</div>
</div>

Expand Down Expand Up @@ -79,7 +79,7 @@ <h2 class="modal-title">Session Claims</h2>
</table>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
<button type="button" class="btn btn-primary" data-bs-dismiss="modal">Close</button>
</div>
</div>
</div>
Expand All @@ -88,7 +88,6 @@ <h2 class="modal-title">Session Claims</h2>
</div>


<script src="libs/jquery-3.6.0.min.js"></script>
<script src="libs/bootstrap.bundle.min.js"></script>
<script src="session.js"></script>
<script src="todo.js"></script>
Expand Down
6 changes: 3 additions & 3 deletions BFF/v2/JsBffYarpSample/FrontendHost/wwwroot/libs/bootstrap.bundle.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion BFF/v2/JsBffYarpSample/FrontendHost/wwwroot/libs/bootstrap.bundle.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 4 additions & 5 deletions BFF/v2/JsBffYarpSample/FrontendHost/wwwroot/libs/bootstrap.min.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion BFF/v2/JsBffYarpSample/FrontendHost/wwwroot/libs/bootstrap.min.css.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions BFF/v2/JsBffYarpSample/FrontendHost/wwwroot/libs/jquery-3.6.0.min.js
View file
Open in desktop

This file was deleted.

5 changes: 3 additions & 2 deletions BFF/v2/SplitHosts/FrontendHost/wwwroot/StyleSheet.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ pre:empty {
display: none;
}

.form-inline {
.todo-form {
margin-bottom: 30px;
}
.form-control{
Expand All @@ -30,8 +30,9 @@ pre:empty {
.buttons > div {
display:inline;
}
.form-inline label {
.todo-form label {
font-weight:bold;
white-space:nowrap;
margin-right:15px;
}
.banner{
Expand Down
11 changes: 5 additions & 6 deletions BFF/v2/SplitHosts/FrontendHost/wwwroot/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ <h1>TODOs</h1>
<div class="col">
<h3>Add New</h3>
</div>
<div class="form-inline">
<div class="col-auto todo-form d-flex flex-wrap align-items-center">
<label for="date">Todo Date</label>
<input class="form-control" id="date" type="datetime" value="2021-03-01" />
<input class="form-control w-auto" id="date" type="datetime" value="2021-03-01" />
<label for="name">Todo Name</label>
<input class="form-control" id="name" value="Do something" />
<button class="form-control btn-success" id="createNewButton">Create</button>
<input class="form-control w-auto" id="name" value="Do something" />
<button class="form-control w-auto btn btn-success" id="createNewButton">Create</button>
</div>
</div>

Expand Down Expand Up @@ -79,7 +79,7 @@ <h2 class="modal-title">Session Claims</h2>
</table>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
<button type="button" class="btn btn-primary" data-bs-dismiss="modal">Close</button>
</div>
</div>
</div>
Expand All @@ -88,7 +88,6 @@ <h2 class="modal-title">Session Claims</h2>
</div>


<script src="libs/jquery-3.6.0.min.js"></script>
<script src="libs/bootstrap.bundle.min.js"></script>
<script src="session.js"></script>
<script src="todo.js"></script>
Expand Down
6 changes: 3 additions & 3 deletions BFF/v2/SplitHosts/FrontendHost/wwwroot/libs/bootstrap.bundle.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion BFF/v2/SplitHosts/FrontendHost/wwwroot/libs/bootstrap.bundle.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 4 additions & 5 deletions BFF/v2/SplitHosts/FrontendHost/wwwroot/libs/bootstrap.min.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion BFF/v2/SplitHosts/FrontendHost/wwwroot/libs/bootstrap.min.css.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions BFF/v2/SplitHosts/FrontendHost/wwwroot/libs/jquery-3.6.0.min.js
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions BFF/v2/TokenExchange/TokenExchange.IdentityServer/Pages/Account/Login/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,18 @@
<form asp-page="/Account/Login/Index">
<input type="hidden" asp-for="Input.ReturnUrl" />

<div class="form-group">
<label asp-for="Input.Username"></label>
<div class="mb-3">
<label class="form-label" asp-for="Input.Username"></label>
<input class="form-control" placeholder="Username" asp-for="Input.Username" autofocus>
</div>
<div class="form-group">
<label asp-for="Input.Password"></label>
<div class="mb-3">
<label class="form-label" asp-for="Input.Password"></label>
<input type="password" class="form-control" placeholder="Password" asp-for="Input.Password" autocomplete="off">
</div>

@if (Model.View.AllowRememberLogin)
{
<div class="form-group">
<div class="mb-3">
<div class="form-check">
<input class="form-check-input" asp-for="Input.RememberLogin">
<label class="form-check-label" asp-for="Input.RememberLogin">
Expand Down
2 changes: 1 addition & 1 deletion BFF/v2/TokenExchange/TokenExchange.IdentityServer/Pages/Account/Logout/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<form asp-page="/Account/Logout/Index">
<input type="hidden" name="logoutId" value="@Model.LogoutId" />

<div class="form-group">
<div class="mb-3">
<button class="btn btn-primary">Yes</button>
</div>
</form>
Expand Down
6 changes: 3 additions & 3 deletions BFF/v2/TokenExchange/TokenExchange.IdentityServer/Pages/Ciba/Consent.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<div class="col-sm-8">
@if (Model.View.IdentityScopes.Any())
{
<div class="form-group">
<div class="mb-3">
<div class="card">
<div class="card-header">
<span class="glyphicon glyphicon-user"></span>
Expand All @@ -49,7 +49,7 @@

@if (Model.View.ApiScopes.Any())
{
<div class="form-group">
<div class="mb-3">
<div class="card">
<div class="card-header">
<span class="glyphicon glyphicon-tasks"></span>
Expand All @@ -65,7 +65,7 @@
</div>
}

<div class="form-group">
<div class="mb-3">
<div class="card">
<div class="card-header">
<span class="glyphicon glyphicon-pencil"></span>
Expand Down
8 changes: 4 additions & 4 deletions BFF/v2/TokenExchange/TokenExchange.IdentityServer/Pages/Consent/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<div class="col-sm-8">
@if (Model.View.IdentityScopes.Any())
{
<div class="form-group">
<div class="mb-3">
<div class="card">
<div class="card-header">
<span class="glyphicon glyphicon-user"></span>
Expand All @@ -46,7 +46,7 @@

@if (Model.View.ApiScopes.Any())
{
<div class="form-group">
<div class="mb-3">
<div class="card">
<div class="card-header">
<span class="glyphicon glyphicon-tasks"></span>
Expand All @@ -62,7 +62,7 @@
</div>
}

<div class="form-group">
<div class="mb-3">
<div class="card">
<div class="card-header">
<span class="glyphicon glyphicon-pencil"></span>
Expand All @@ -76,7 +76,7 @@

@if (Model.View.AllowRememberConsent)
{
<div class="form-group">
<div class="mb-3">
<div class="form-check">
<input class="form-check-input" asp-for="Input.RememberConsent">
<label class="form-check-label" asp-for="Input.RememberConsent">
Expand Down
12 changes: 6 additions & 6 deletions BFF/v2/TokenExchange/TokenExchange.IdentityServer/Pages/Device/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
<div class="row">
<div class="col-sm-6">
<form asp-page="/Device/Index" method="get">
<div class="form-group">
<label for="userCode">User Code:</label>
<div class="mb-3">
<label class="form-label" for="userCode">User Code:</label>
<input class="form-control" for="userCode" name="userCode" autofocus />
</div>

Expand Down Expand Up @@ -61,7 +61,7 @@ else
<div class="col-sm-8">
@if (Model.View.IdentityScopes.Any())
{
<div class="form-group">
<div class="mb-3">
<div class="card">
<div class="card-header">
<span class="glyphicon glyphicon-user"></span>
Expand All @@ -79,7 +79,7 @@ else

@if (Model.View.ApiScopes.Any())
{
<div class="form-group">
<div class="mb-3">
<div class="card">
<div class="card-header">
<span class="glyphicon glyphicon-tasks"></span>
Expand All @@ -95,7 +95,7 @@ else
</div>
}

<div class="form-group">
<div class="mb-3">
<div class="card">
<div class="card-header">
<span class="glyphicon glyphicon-pencil"></span>
Expand All @@ -109,7 +109,7 @@ else

@if (Model.View.AllowRememberConsent)
{
<div class="form-group">
<div class="mb-3">
<div class="form-check">
<input class="form-check-input" asp-for="Input.RememberConsent">
<label class="form-check-label" asp-for="Input.RememberConsent">
Expand Down
1 change: 0 additions & 1 deletion BFF/v2/TokenExchange/TokenExchange.IdentityServer/Pages/Shared/_Layout.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
@RenderBody()
</div>

<script src="~/lib/jquery/dist/jquery.slim.min.js"></script>
<script src="~/lib/bootstrap/dist/js/bootstrap.bundle.min.js"></script>

@RenderSection("scripts", required: false)
Expand Down
32 changes: 17 additions & 15 deletions BFF/v2/TokenExchange/TokenExchange.IdentityServer/Pages/Shared/_Nav.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,26 @@

<div class="nav-page">
<nav class="navbar navbar-expand-lg navbar-dark bg-dark">
<div class="container-fluid">

<a href="~/" class="navbar-brand">
<img src="~/duende-logo.svg" class="icon-banner">
Duende IdentityServer
</a>
<a href="~/" class="navbar-brand">
<img src="~/duende-logo.svg" class="icon-banner">
Duende IdentityServer
</a>

@if (!string.IsNullOrWhiteSpace(name))
{
<ul class="navbar-nav mr-auto">
<li class="nav-item dropdown">
<a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">@name <b class="caret"></b></a>
@if (!string.IsNullOrWhiteSpace(name))
{
<ul class="navbar-nav me-auto">
<li class="nav-item dropdown">
<a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown" role="button" aria-expanded="false">@name</a>

<div class="dropdown-menu">
<a class="dropdown-item" asp-page="/Account/Logout/Index">Logout</a>
</div>
</li>
</ul>
}
<div class="dropdown-menu">
<a class="dropdown-item" asp-page="/Account/Logout/Index">Logout</a>
</div>
</li>
</ul>
}

</div>
</nav>
</div>
3 changes: 1 addition & 2 deletions BFF/v2/TokenExchange/TokenExchange.IdentityServer/wwwroot/lib/bootstrap/LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
The MIT License (MIT)

Copyright (c) 2011-2020 Twitter, Inc.
Copyright (c) 2011-2020 The Bootstrap Authors
Copyright (c) 2011-2025 The Bootstrap Authors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
Loading
Loading