From ec3d689ea19f6684bc57e78f7ff4e4346becb0a5 Mon Sep 17 00:00:00 2001
From: Daniel <50356015+danny007in@users.noreply.github.com>
Date: Wed, 29 Mar 2023 13:19:19 +0530
Subject: [PATCH] bump bootstrap from 5.3.0-alpha1 to 5.3.0-alpha2
---
src/html/components/_scripts.astro | 4 ++--
src/scss/_bootstrap-variables.scss | 33 ++++++++++++++++++++++--------
src/scss/adminlte.scss | 2 +-
3 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/src/html/components/_scripts.astro b/src/html/components/_scripts.astro
index c911676c3..aa5ddba6a 100644
--- a/src/html/components/_scripts.astro
+++ b/src/html/components/_scripts.astro
@@ -6,11 +6,11 @@ const distPath = (path != undefined) ? path : '../../../dist'
-
+
-
+
diff --git a/src/scss/_bootstrap-variables.scss b/src/scss/_bootstrap-variables.scss
index f61aa74cb..fceaa7422 100644
--- a/src/scss/_bootstrap-variables.scss
+++ b/src/scss/_bootstrap-variables.scss
@@ -384,7 +384,7 @@ $enable-cssgrid: false !default;
$enable-button-pointers: true !default;
$enable-rfs: true !default;
$enable-validation-icons: true !default;
-$enable-negative-margins: false !default;
+$enable-negative-margins: true !default;
$enable-deprecation-messages: true !default;
$enable-important-utilities: true !default;
@@ -463,6 +463,15 @@ $link-hover-decoration: null !default;
$stretched-link-pseudo-element: after !default;
$stretched-link-z-index: 1 !default;
+// Icon links
+// scss-docs-start icon-link-variables
+$icon-link-gap: .375rem !default;
+$icon-link-underline-offset: .25em !default;
+$icon-link-icon-size: 1em !default;
+$icon-link-icon-transition: .2s ease-in-out transform !default;
+$icon-link-icon-transform: translate3d(.25em, 0, 0) !default;
+// scss-docs-end icon-link-variables
+
// Paragraphs
//
// Style p element.
@@ -811,6 +820,7 @@ $input-btn-border-width: var(--#{$prefix}border-width) !default;
// For each of Bootstrap's buttons, define text, background, and border color.
// scss-docs-start btn-variables
+$btn-color: var(--#{$prefix}body-color) !default;
$btn-padding-y: $input-btn-padding-y !default;
$btn-padding-x: $input-btn-padding-x !default;
$btn-font-family: $input-btn-font-family !default;
@@ -1090,23 +1100,30 @@ $form-feedback-icon-invalid-color: $form-feedback-invalid-color !default;
$form-feedback-icon-invalid: url("data:image/svg+xml,") !default;
// scss-docs-end form-feedback-variables
+// scss-docs-start form-validation-colors
+$form-valid-color: $form-feedback-valid-color !default;
+$form-valid-border-color: $form-feedback-valid-color !default;
+$form-invalid-color: $form-feedback-invalid-color !default;
+$form-invalid-border-color: $form-feedback-invalid-color !default;
+// scss-docs-end form-validation-colors
+
// scss-docs-start form-validation-states
$form-validation-states: (
"valid": (
- "color": var(--#{$prefix}success-text),
+ "color": var(--#{$prefix}form-valid-color),
"icon": $form-feedback-icon-valid,
"tooltip-color": #fff,
"tooltip-bg-color": var(--#{$prefix}success),
"focus-box-shadow": 0 0 $input-btn-focus-blur $input-focus-width rgba(var(--#{$prefix}success-rgb), $input-btn-focus-color-opacity),
- "border-color": var(--#{$prefix}success),
+ "border-color": var(--#{$prefix}form-valid-border-color),
),
"invalid": (
- "color": var(--#{$prefix}danger-text),
+ "color": var(--#{$prefix}form-invalid-color),
"icon": $form-feedback-icon-invalid,
"tooltip-color": #fff,
"tooltip-bg-color": var(--#{$prefix}danger),
"focus-box-shadow": 0 0 $input-btn-focus-blur $input-focus-width rgba(var(--#{$prefix}danger-rgb), $input-btn-focus-color-opacity),
- "border-color": var(--#{$prefix}danger),
+ "border-color": var(--#{$prefix}form-invalid-border-color),
)
) !default;
// scss-docs-end form-validation-states
@@ -1151,7 +1168,6 @@ $nav-link-color: var(--#{$prefix}link-color) !default;
$nav-link-hover-color: var(--#{$prefix}link-hover-color) !default;
$nav-link-transition: color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out !default;
$nav-link-disabled-color: var(--#{$prefix}secondary-color) !default;
-$nav-link-disabled-color: $gray-600 !default;
$nav-link-focus-box-shadow: $focus-ring-box-shadow !default;
$nav-tabs-border-color: var(--#{$prefix}border-color) !default;
@@ -1244,7 +1260,7 @@ $dropdown-link-hover-bg: var(--#{$prefix}tertiary-bg) !default;
$dropdown-link-active-color: $component-active-color !default;
$dropdown-link-active-bg: $component-active-bg !default;
-$dropdown-link-disabled-color: $gray-500 !default;
+$dropdown-link-disabled-color: var(--#{$prefix}tertiary-color) !default;
$dropdown-item-padding-y: $spacer * .25 !default;
$dropdown-item-padding-x: $spacer !default;
@@ -1368,7 +1384,7 @@ $accordion-button-color: var(--#{$prefix}body-color) !default;
$accordion-button-bg: var(--#{$prefix}accordion-bg) !default;
$accordion-transition: $btn-transition, border-radius .15s ease !default;
$accordion-button-active-bg: var(--#{$prefix}primary-bg-subtle) !default;
-$accordion-button-active-color: var(--#{$prefix}primary-text) !default;
+$accordion-button-active-color: var(--#{$prefix}primary-text-emphasis) !default;
$accordion-button-focus-border-color: $input-focus-border-color !default;
$accordion-button-focus-box-shadow: $btn-focus-box-shadow !default;
@@ -1694,7 +1710,6 @@ $btn-close-height: $btn-close-width !default;
$btn-close-padding-x: .25em !default;
$btn-close-padding-y: $btn-close-padding-x !default;
$btn-close-color: $black !default;
-$btn-close-focus-shadow: $input-btn-focus-box-shadow !default;
$btn-close-bg: url("data:image/svg+xml,") !default;
$btn-close-focus-shadow: $focus-ring-box-shadow !default;
$btn-close-opacity: .5 !default;
diff --git a/src/scss/adminlte.scss b/src/scss/adminlte.scss
index 949c6dd42..129df6d20 100644
--- a/src/scss/adminlte.scss
+++ b/src/scss/adminlte.scss
@@ -1,5 +1,5 @@
/*!
- * AdminLTE v4.0.0-alpha.1
+ * AdminLTE v4.0.0-alpha1
* Author: Colorlib
* Website: AdminLTE.io
* License: Open source - MIT