Skip to content

Commit

Permalink
0.5.1 release candidate (#735)
Browse files Browse the repository at this point in the history
Co-authored-by: cpsievert <[email protected]>
  • Loading branch information
cpsievert and cpsievert authored Aug 11, 2023
1 parent a076e72 commit dba137f
Show file tree
Hide file tree
Showing 24 changed files with 96 additions and 33 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
.DS_Store
docs/
sandbox/
revdep/
inst/themer-demo/deploy/rsconnect
inst/examples/*/rsconnect/

Expand Down
9 changes: 5 additions & 4 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Package: bslib
Title: Custom 'Bootstrap' 'Sass' Themes for 'shiny' and 'rmarkdown'
Version: 0.5.0.9000
Version: 0.5.1
Authors@R: c(
person("Carson", "Sievert", role = c("aut", "cre"), email = "carson@rstudio.com", comment = c(ORCID = "0000-0002-4958-2844")),
person("Joe", "Cheng", role = "aut", email = "joe@rstudio.com"),
person("Carson", "Sievert", role = c("aut", "cre"), email = "carson@posit.co", comment = c(ORCID = "0000-0002-4958-2844")),
person("Joe", "Cheng", role = "aut", email = "joe@posit.co"),
person("Garrick", "Aden-Buie", role = "aut", email = "[email protected]", comment = c(ORCID = "0000-0002-7111-0077")),
person(given = "Posit Software, PBC", role = c("cph", "fnd")),
person("Posit Software, PBC", role = c("cph", "fnd")),
person(family = "Bootstrap contributors", role = "ctb",
comment = "Bootstrap library"),
person(family = "Twitter, Inc", role = "cph",
Expand Down Expand Up @@ -68,6 +68,7 @@ Collate:
'bs-theme-preview.R'
'bs-theme-update.R'
'bs-theme.R'
'bslib-package.R'
'card.R'
'deprecated.R'
'files.R'
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
YEAR: 2021
YEAR: 2021-2023
COPYRIGHT HOLDER: bslib contributors
4 changes: 2 additions & 2 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# bslib 0.5.0.9000
# bslib 0.5.1

## New features

Expand All @@ -10,7 +10,7 @@
## Improvements

* Closed quarto-dev/quarto-cli#6081: `{bslib}`'s components (e.g., `card()`, `sidebar()`, etc.) now work more sensibly in Quarto docs. (#664)
* `sidebar()` gains `gap` and `padding` arguments to control the vertical gap between items in the sidebar and the padding around the sidebar's content. (#725)
* Closed #672: `sidebar()` gains `gap` and `padding` arguments to control the vertical gap between items in the sidebar and the padding around the sidebar's content. (#725)

## Bug fixes

Expand Down
17 changes: 17 additions & 0 deletions R/bslib-package.R
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
utils::globalVariables("!!")

#' @keywords internal
"_PACKAGE"

## usethis namespace: start
#' @import htmltools
#' @import sass
#' @importFrom utils modifyList packageVersion download.file URLencode getFromNamespace head
#' @importFrom stats setNames na.omit
#' @importFrom grDevices col2rgb
#' @importFrom tools file_path_sans_ext
#' @importFrom jquerylib jquery_core
#' @importFrom jsonlite fromJSON
#' @importFrom rlang := list2 abort
## usethis namespace: end
NULL
14 changes: 0 additions & 14 deletions R/imports.R
Original file line number Diff line number Diff line change
@@ -1,17 +1,3 @@
utils::globalVariables("!!")

#' @import htmltools
#' @import sass
#' @importFrom utils modifyList packageVersion download.file URLencode getFromNamespace head
#' @importFrom stats setNames na.omit
#' @importFrom grDevices col2rgb
#' @importFrom tools file_path_sans_ext
#' @importFrom jquerylib jquery_core
#' @importFrom jsonlite fromJSON
#' @importFrom rlang := list2 abort
NULL


#' Helpers for importing web fonts
#'
#' `font_google()`, `font_link()`, and `font_face()` are all re-exported from
Expand Down
2 changes: 1 addition & 1 deletion inst/components/dist/accordion/accordion.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion inst/components/dist/accordion/accordion.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion inst/components/dist/bslibShiny/bslibShiny.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion inst/components/dist/bslibShiny/bslibShiny.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion inst/components/dist/card/card.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion inst/components/dist/card/card.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion inst/components/dist/sidebar/sidebar.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion inst/components/dist/sidebar/sidebar.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion inst/components/dist/webComponents/webComponents.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit dba137f

Please sign in to comment.