Merge remote-tracking branch 'origin/main' into rc-v0.8.1

gadenbuie · gadenbuie · commit 7d6a046a43e8 · 2024-03-06T18:17:57.000-05:00
diff --git a/shiny/www/shared/bootstrap/_version.json b/shiny/www/shared/bootstrap/_version.json
@@ -1,7 +1,7 @@
 {
   "note!": "This file is auto-generated by scripts/htmlDependencies.R",
   "shiny_version": "Github (rstudio/shiny@6760c318184535185e5050aefe29e658e8710ef0)",
-  "bslib_version": "Github (rstudio/bslib@fb94eba42c5d219350882420f49de25ebfebe698)",
+  "bslib_version": "Github (rstudio/bslib@1929f7e63197f6073085a03f926f11829b7292ea)",
   "htmltools_version": "CRAN (R 4.3.1)",
   "bootstrap_version": "5.3.1"
 }
diff --git a/shiny/www/shared/bslib/_version.json b/shiny/www/shared/bslib/_version.json
@@ -1,5 +1,5 @@
 {
   "note!": "This file is auto-generated by scripts/htmlDependencies.R",
   "package": "bslib",
-  "version": "Github (rstudio/bslib@fb94eba42c5d219350882420f49de25ebfebe698)"
+  "version": "Github (rstudio/bslib@1929f7e63197f6073085a03f926f11829b7292ea)"
 }
diff --git a/shiny/www/shared/bslib/components/components.css b/shiny/www/shared/bslib/components/components.css

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"note!": "This file is auto-generated by scripts/htmlDependencies.R",`
`3`	`3`	`"shiny_version": "Github (rstudio/shiny@6760c318184535185e5050aefe29e658e8710ef0)",`
`4`		`- "bslib_version": "Github (rstudio/bslib@fb94eba42c5d219350882420f49de25ebfebe698)",`
	`4`	`+ "bslib_version": "Github (rstudio/bslib@1929f7e63197f6073085a03f926f11829b7292ea)",`
`5`	`5`	`"htmltools_version": "CRAN (R 4.3.1)",`
`6`	`6`	`"bootstrap_version": "5.3.1"`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"note!": "This file is auto-generated by scripts/htmlDependencies.R",`
`3`	`3`	`"package": "bslib",`
`4`		`- "version": "Github (rstudio/bslib@fb94eba42c5d219350882420f49de25ebfebe698)"`
	`4`	`+ "version": "Github (rstudio/bslib@1929f7e63197f6073085a03f926f11829b7292ea)"`
`5`	`5`	`}`