From 7f3d1ede3af5bf121e558eb1474dbf538b8af80b Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 29 Nov 2021 10:56:05 +0000
Subject: [PATCH] CSS: Upgrade to Bootstrap 5.1.3

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 src/bootstrap       |  2 +-
 src/scss/style.scss | 30 ++++++++++++++++++------------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/bootstrap b/src/bootstrap
index a716fb03..1a6fdfae 160000
--- a/src/bootstrap
+++ b/src/bootstrap
@@ -1 +1 @@
-Subproject commit a716fb03f965dc0846df479e14388b1b4b93d7ce
+Subproject commit 1a6fdfae6be09b09eaced8f0e442ca6f7680a61e
diff --git a/src/scss/style.scss b/src/scss/style.scss
index ce2adc50..147ad077 100644
--- a/src/scss/style.scss
+++ b/src/scss/style.scss
@@ -4,11 +4,13 @@
 @import "../bootstrap/scss/functions";
 @import "../bootstrap/scss/variables";
 @import "../bootstrap/scss/mixins";
+@import "../bootstrap/scss/utilities";
+
 @import "../bootstrap/scss/root";
 @import "../bootstrap/scss/reboot";
 @import "../bootstrap/scss/type";
 @import "../bootstrap/scss/images";
-@import "../bootstrap/scss/code";
+@import "../bootstrap/scss/containers";
 @import "../bootstrap/scss/grid";
 @import "../bootstrap/scss/tables";
 @import "../bootstrap/scss/forms";
@@ -16,23 +18,27 @@
 @import "../bootstrap/scss/transitions";
 @import "../bootstrap/scss/dropdown";
 @import "../bootstrap/scss/button-group";
-@import "../bootstrap/scss/input-group";
-@import "../bootstrap/scss/custom-forms";
 @import "../bootstrap/scss/nav";
 @import "../bootstrap/scss/navbar";
 @import "../bootstrap/scss/card";
-@import "../bootstrap/scss/pagination";
+@import "../bootstrap/scss/accordion";
 @import "../bootstrap/scss/breadcrumb";
+@import "../bootstrap/scss/pagination";
 @import "../bootstrap/scss/badge";
 @import "../bootstrap/scss/alert";
 @import "../bootstrap/scss/progress";
-@import "../bootstrap/scss/media";
 @import "../bootstrap/scss/list-group";
 @import "../bootstrap/scss/close";
 @import "../bootstrap/scss/modal";
+@import "../bootstrap/scss/tooltip";
+@import "../bootstrap/scss/popover";
+@import "../bootstrap/scss/carousel";
 @import "../bootstrap/scss/spinners";
-@import "../bootstrap/scss/utilities";
-@import "../bootstrap/scss/print";
+@import "../bootstrap/scss/offcanvas";
+@import "../bootstrap/scss/placeholders";
+
+@import "../bootstrap/scss/helpers";
+@import "../bootstrap/scss/utilities/api";
 
 // Include fonts
 @import "_fonts.scss";
@@ -185,7 +191,7 @@ section {
 		// Reset large headlines to normal size on mobile devices
 		h1 {
 			font-size: $display1-size;
-			font-weight: $display1-weight;
+			font-weight: $display-font-weight;
 			line-height: $display-line-height;
 		}
 	}
@@ -257,7 +263,7 @@ blockquote {
 			// Apply CSS classes for alignment
 			thead {
 				th[align="left"], td[align="left"] {
-					@extend .text-left;
+					@extend .text-start;
 				}
 
 				th[align="center"], td[align="center"] {
@@ -265,7 +271,7 @@ blockquote {
 				}
 
 				th[align="right"], td[align="right"] {
-					@extend .text-right;
+					@extend .text-end;
 				}
 			}
 		}
@@ -333,7 +339,7 @@ blockquote {
 		// Apply CSS classes for alignment
 		thead {
 			th[align="left"], td[align="left"] {
-				@extend .text-left;
+				@extend .text-start;
 			}
 
 			th[align="center"], td[align="center"] {
@@ -341,7 +347,7 @@ blockquote {
 			}
 
 			th[align="right"], td[align="right"] {
-				@extend .text-right;
+				@extend .text-end;
 			}
 		}
 	}
-- 
2.47.3