Upgrade to Bootstrap 5.3

Kovah · Jul 20, 2023 · 289bb1f · 289bb1f
1 parent af2fb24
commit 289bb1f
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 17 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
     "sass-loader": "^13.2.0"
   },
   "dependencies": {
-    "bootstrap": "~5.2.3",
+    "bootstrap": "^5.2.3",
     "tom-select": "^2.0.0"
   },
   "scripts": {

diff --git a/resources/assets/sass/_variables.scss b/resources/assets/sass/_variables.scss
@@ -87,14 +87,14 @@ $color-contrast-light: $white;
 
 
 // Options
+$enable-dark-mode: false;
 $enable-caret: false;
 
 
 // Body
-$body-bg: $white;
 $body-color: $black;
-$body-color-pale: $gray-600;
-$body-color-muted: $gray;
+$body-bg: $white;
+$body-secondary-color: $gray-600;
 
 
 // Links
@@ -106,6 +106,7 @@ $link-hover-decoration: none;
 
 
 // Components
+$border-width: 1px;
 $border-radius-xs: .2rem;
 
 $line-height-sm: 1.5;
@@ -115,13 +116,11 @@ $link-thumbnail-placeholder-color: $gray-200;
 
 // Typography
 $font-family-sans-serif: "IBM Plex Sans", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
-
+$font-weight-normal: 400;
 $font-size-base: 1rem;
 $font-size-xs: $font-size-base * .75;
 
-$font-weight-normal: 400;
-
-$text-muted: $body-color-muted;
+$text-muted: $body-secondary-color;
 
 
 // Tables
@@ -130,6 +129,7 @@ $table-dark-color: $white;
 
 
 // Buttons + Forms
+$input-color: $body-color;
 $input-border-color: $gray-300;
 $input-btn-focus-width: .15rem;
 $input-btn-padding-y-xs: .15rem;
@@ -139,6 +139,8 @@ $input-btn-line-height-xs: $line-height-sm;
 
 $input-placeholder-color: $text-muted;
 
+$input-btn-border-width: $border-width;
+
 
 // Buttons
 $btn-padding-y-xs: $input-btn-padding-y-xs;

diff --git a/resources/assets/sass/custom/_app.scss b/resources/assets/sass/custom/_app.scss
@@ -108,7 +108,7 @@ a.badge {
 }
 
 .text-pale {
-  color: $body-color-pale;
+  color: $body-secondary-color;
 }
 
 .btn-xs {

diff --git a/resources/assets/sass/third-party/bootstrap/bootstrap5.scss b/resources/assets/sass/third-party/bootstrap/bootstrap5.scss
@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v5.2.0 (https://getbootstrap.com/)
+ * Bootstrap v5.3.0 (https://getbootstrap.com/)
  * Copyright 2011-2022 The Bootstrap Authors
  * Copyright 2011-2022 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
@@ -9,6 +9,7 @@
 // Configuration
 //@import "~bootstrap/scss/functions";
 @import "~bootstrap/scss/variables";
+@import "~bootstrap/scss/variables-dark";
 @import "~bootstrap/scss/maps";
 @import "~bootstrap/scss/mixins";
 @import "~bootstrap/scss/utilities";

diff --git a/resources/assets/sass/third-party/tom-select/_variables.scss b/resources/assets/sass/third-party/tom-select/_variables.scss
@@ -19,10 +19,11 @@ $select-color-optgroup: $white;
 $select-color-optgroup-text: $dropdown-header-color;
 $select-color-optgroup-border: $dropdown-divider-bg;
 $select-color-dropdown: $white;
-$select-color-dropdown-border-top: mix($input-border-color, $input-bg, 0.8);
+$select-color-dropdown-border-top: color-mix($input-border-color, $input-bg, 80%);
 $select-color-dropdown-item-active: $dropdown-link-hover-bg;
 $select-color-dropdown-item-active-text: $dropdown-link-hover-color;
 $select-color-dropdown-item-create-active-text: $dropdown-link-hover-color;
+$select-color-dropdown-item-create-text: rgba(red($select-color-text), green($select-color-text), blue($select-color-text), 0.5);
 $select-opacity-disabled: 0.5;
 $select-shadow-input: none;
 $select-shadow-input-focus: inset 0 1px 2px rgba($black, 0.15);

diff --git a/resources/docker/dockerfiles/development.Dockerfile b/resources/docker/dockerfiles/development.Dockerfile
@@ -1,7 +1,7 @@
 # DOCKERFILE DEVELOPMENT
 # Installs MySQL Client for database exports, xDebug with PCov and Composer
 
-FROM php:8.0-fpm
+FROM php:8.0.29-fpm
 WORKDIR /app
 
 RUN apt-get update && apt-get install -y \