Update to Bootstrap 5.3

EasyCorp · Nov 4, 2023 · 9417f49 · 9417f49
1 parent 4537990
commit 9417f49
Show file tree

Hide file tree

Showing 16 changed files with 90 additions and 76 deletions.
diff --git a/assets/css/app.scss b/assets/css/app.scss
@@ -1,3 +1,9 @@
+// The order of these imports is critical.
+// See https://getbootstrap.com/docs/5.3/customize/sass/
+@import "~bootstrap/scss/functions";
+@import "~bootstrap/scss/variables";
+@import "~bootstrap/scss/variables-dark";
+
 @import "./easyadmin-theme/variables-theme.scss";
 @import "./easyadmin-theme/variables-bootstrap.scss";
 

diff --git a/assets/css/easyadmin-theme/detail-page.scss b/assets/css/easyadmin-theme/detail-page.scss
@@ -44,6 +44,7 @@
   --bs-tooltip-padding-y: 10px;
 
   .tooltip-inner {
+    font-size: 13px;
     text-align: start;
   }
 }

diff --git a/assets/css/easyadmin-theme/fields.scss b/assets/css/easyadmin-theme/fields.scss
@@ -208,6 +208,7 @@
 .field-date input[type="date"].form-control,
 .field-time input[type="time"].form-control {
   width: auto;
+  max-width: 100%;
 }
 
 // Language field

diff --git a/assets/css/easyadmin-theme/forms.scss b/assets/css/easyadmin-theme/forms.scss
@@ -83,6 +83,7 @@ label.form-check-label {
     border: 1px solid var(--form-input-border-color);
     box-shadow: var(--form-input-shadow);
     color: var(--form-input-text-color);
+    font-size: .875rem;
     height: 30px;
     padding: 3px 7px 4px;
     white-space: nowrap;

diff --git a/assets/css/easyadmin-theme/variables-bootstrap.scss b/assets/css/easyadmin-theme/variables-bootstrap.scss
@@ -152,17 +152,4 @@ $pagination-disabled-color: var(--text-muted) !default;
 $pagination-disabled-bg: var(--white) !default;
 $pagination-disabled-border-color: transparent !default;
 
-$btn-transition: all .08s ease-in !default;
-$btn-font-weight: 400 !default;
-$btn-padding-y: 4px !default;
-$btn-padding-x: 8px !default;
-$btn-padding-y-lg: 7px !default;
-$btn-padding-x-lg: 12px !default;
-$btn-padding-y-sm: 3px !default;
-$btn-padding-x-sm: 5px !default;
-$btn-border-width: 0 !default;
-$btn-border-radius: var(--border-radius) !default;
-$btn-border-radius-lg: var(--border-radius) !default;
-$btn-border-radius-sm: var(--border-radius) !default;
-
 $custom-control-indicator-border-color: var(--gray-600) !default;
diff --git a/assets/css/easyadmin-theme/variables-theme.scss b/assets/css/easyadmin-theme/variables-theme.scss
@@ -675,3 +675,23 @@
 
     --border-color: hsl(213, 24%, 91%);
 }
+
+// Bootstrap variables
+.badge {
+    --bs-badge-font-weight: 500;
+}
+.btn {
+    --bs-btn-padding-x: 8px;
+    --bs-btn-padding-y: 4px;
+    --bs-btn-font-size: 0.875rem;
+    --bs-btn-font-weight: 400;
+    --bs-btn-border-width: 0;
+    --bs-btn-border-radius: var(--border-radius);
+}
+.dropdown-menu {
+    --bs-dropdown-font-size: 0.875rem;
+}
+.table {
+    --bs-table-color-state: var(--table-cell-color);
+    --bs-table-bg: var(--body-bg);
+}
diff --git a/src/Resources/public/app.00a7b690.js b/src/Resources/public/app.00a7b690.js
diff --git a/...ources/public/app.1357e916.js.LICENSE.txt → ...ources/public/app.00a7b690.js.LICENSE.txt b/...ources/public/app.1357e916.js.LICENSE.txt → ...ources/public/app.00a7b690.js.LICENSE.txt
@@ -1,5 +1,5 @@
 /*!
-  * Bootstrap v5.2.3 (https://getbootstrap.com/)
-  * Copyright 2011-2022 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
+  * Bootstrap v5.3.2 (https://getbootstrap.com/)
+  * Copyright 2011-2023 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
   * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
   */
diff --git a/src/Resources/public/app.1357e916.js b/src/Resources/public/app.1357e916.js
diff --git a/src/Resources/public/app.59076cd0.css b/src/Resources/public/app.59076cd0.css
diff --git a/src/Resources/public/app.59076cd0.rtl.css b/src/Resources/public/app.59076cd0.rtl.css
diff --git a/src/Resources/public/app.bb26af28.css b/src/Resources/public/app.bb26af28.css
diff --git a/src/Resources/public/app.bb26af28.rtl.css b/src/Resources/public/app.bb26af28.rtl.css
diff --git a/src/Resources/public/entrypoints.json b/src/Resources/public/entrypoints.json
@@ -2,11 +2,11 @@
   "entrypoints": {
     "app": {
       "css": [
-        "/app.bb26af28.css",
-        "/app.bb26af28.rtl.css"
+        "/app.59076cd0.css",
+        "/app.59076cd0.rtl.css"
       ],
       "js": [
-        "/app.1357e916.js"
+        "/app.00a7b690.js"
       ]
     },
     "form": {

diff --git a/src/Resources/public/manifest.json b/src/Resources/public/manifest.json
@@ -1,7 +1,7 @@
 {
-  "app.css": "app.bb26af28.css",
-  "app.rtl.css": "app.bb26af28.rtl.css",
-  "app.js": "app.1357e916.js",
+  "app.css": "app.59076cd0.css",
+  "app.rtl.css": "app.59076cd0.rtl.css",
+  "app.js": "app.00a7b690.js",
   "form.js": "form.fc39362b.js",
   "page-layout.js": "page-layout.3347892e.js",
   "page-color-scheme.js": "page-color-scheme.a1970567.js",

diff --git a/yarn.lock b/yarn.lock
@@ -1663,9 +1663,9 @@ boolbase@^1.0.0:
   integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==
 
 bootstrap@^5.1.0:
-  version "5.2.3"
-  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.2.3.tgz#54739f4414de121b9785c5da3c87b37ff008322b"
-  integrity sha512-cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ==
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.3.2.tgz#97226583f27aae93b2b28ab23f4c114757ff16ae"
+  integrity sha512-D32nmNWiQHo94BKHLmOrdjlL05q1c8oxbtBphQFb9Z5to6eGRDCm0QgeaZ4zFBHzfg2++rqa2JkqCcxDy0sH0g==
 
 brace-expansion@^1.1.7:
   version "1.1.11"