From 289bb1fb8aa7c49205d50db8561775f592f72e41 Mon Sep 17 00:00:00 2001 From: Kovah Date: Thu, 20 Jul 2023 09:36:27 +0200 Subject: [PATCH] Upgrade to Bootstrap 5.3 --- package-lock.json | 10 +++++----- package.json | 2 +- resources/assets/sass/_variables.scss | 16 +++++++++------- resources/assets/sass/custom/_app.scss | 2 +- .../sass/third-party/bootstrap/bootstrap5.scss | 3 ++- .../sass/third-party/tom-select/_variables.scss | 3 ++- .../docker/dockerfiles/development.Dockerfile | 2 +- 7 files changed, 21 insertions(+), 17 deletions(-) diff --git a/package-lock.json b/package-lock.json index a4214e9c..77b38ce7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "1.12.1", "license": "GPL-3.0-or-later", "dependencies": { - "bootstrap": "~5.2.3", + "bootstrap": "^5.2.3", "tom-select": "^2.0.0" }, "devDependencies": { @@ -2950,9 +2950,9 @@ "dev": true }, "node_modules/bootstrap": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.3.tgz", - "integrity": "sha512-cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.0.tgz", + "integrity": "sha512-UnBV3E3v4STVNQdms6jSGO2CvOkjUMdDAVR2V5N4uCMdaIkaQjbcEAMqRimDHIs4uqBYzDAKCQwCB+97tJgHQw==", "funding": [ { "type": "github", @@ -2964,7 +2964,7 @@ } ], "peerDependencies": { - "@popperjs/core": "^2.11.6" + "@popperjs/core": "^2.11.7" } }, "node_modules/brace-expansion": { diff --git a/package.json b/package.json index 0337fae1..085f8805 100755 --- 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 index a459b3a8..109a08d5 100644 --- 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 index 3eca2ad1..8b109717 100644 --- 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 index 63ca973a..de65f82c 100644 --- 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 index eb18dac4..44e558ac 100644 --- 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 index 5df081ef..002f42c1 100644 --- 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 \