From ecf2cafac00e64bdb027fe57dc4aa4319037f1df Mon Sep 17 00:00:00 2001 From: Carson Date: Fri, 1 Sep 2023 18:33:06 -0500 Subject: [PATCH 1/2] Close #781: Fix mistake in navbar-dark-contrast's default value --- tools/patches/021-add-navbar-bg-vars-bs5.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/patches/021-add-navbar-bg-vars-bs5.patch b/tools/patches/021-add-navbar-bg-vars-bs5.patch index cd1534081..79697b0a9 100644 --- a/tools/patches/021-add-navbar-bg-vars-bs5.patch +++ b/tools/patches/021-add-navbar-bg-vars-bs5.patch @@ -21,7 +21,7 @@ index 91bdbfdf..709feeb2 100644 + var(--#{$prefix}emphasis-color-rgb) +) !default; // Deepest contrasting color for navbarPage(inverse = FALSE). +$navbar-dark-contrast: if( -+ type-of($navbar-light-bg) == color, ++ type-of($navbar-dark-bg) == color, + color-contrast($navbar-dark-bg), + var(--#{$prefix}emphasis-color-rgb) +) !default; // Deepest contrasting color for navbarPage(inverse = TRUE). From 995662d22bc5dc11eb2d2f8b0ec808a374d90718 Mon Sep 17 00:00:00 2001 From: cpsievert Date: Fri, 1 Sep 2023 23:40:17 +0000 Subject: [PATCH 2/2] Resave distributed files (GitHub Action) --- inst/lib/bs5/scss/_variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inst/lib/bs5/scss/_variables.scss b/inst/lib/bs5/scss/_variables.scss index 709feeb2c..891b86bdb 100644 --- a/inst/lib/bs5/scss/_variables.scss +++ b/inst/lib/bs5/scss/_variables.scss @@ -1224,7 +1224,7 @@ $navbar-light-contrast: if( var(--#{$prefix}emphasis-color-rgb) ) !default; // Deepest contrasting color for navbarPage(inverse = FALSE). $navbar-dark-contrast: if( - type-of($navbar-light-bg) == color, + type-of($navbar-dark-bg) == color, color-contrast($navbar-dark-bg), var(--#{$prefix}emphasis-color-rgb) ) !default; // Deepest contrasting color for navbarPage(inverse = TRUE).