Skip to content

Commit

Permalink
feat : mise à jour du logo Aura + incrementation N° version
Browse files Browse the repository at this point in the history
  • Loading branch information
jengelaere committed Nov 20, 2023
2 parents d43ff2b + c5dbe10 commit 0d83b52
Show file tree
Hide file tree
Showing 18 changed files with 67 additions and 39 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ name: R-CMD-check
jobs:
R-CMD-check:
runs-on: macOS-latest

env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

steps:
- uses: r-lib/actions/setup-r@master
- uses: r-lib/actions/setup-r@v2

- uses: r-lib/actions/setup-pandoc@master
- uses: r-lib/actions/setup-pandoc@v2

- name: Install tools
run: |
Expand All @@ -28,7 +28,7 @@ jobs:
- uses: actions/checkout@v2

- name: Install dependencies
run: remotes::install_deps(dependencies = TRUE, type = "mac.binary")
run: remotes::install_deps(dependencies = TRUE)
shell: Rscript {0}

- name: Install gouvdown fonts to mac os
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ jobs:
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: r-lib/actions/setup-r@master
- uses: r-lib/actions/setup-r@v2

- uses: r-lib/actions/setup-pandoc@master
- uses: r-lib/actions/setup-pandoc@v2

- name: Install tools
run: |
Expand All @@ -37,7 +37,7 @@ jobs:

- name: Install dependencies
run: |
remotes::install_deps(dependencies = TRUE, type = "mac.binary")
remotes::install_deps(dependencies = TRUE)
remotes::install_dev("pkgdown")
shell: Rscript {0}

Expand Down
8 changes: 6 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Package: gouvdown
Title: French Government Design System for R Markdown
Version: 0.0.0.9000
Version: 0.0.0.9001
Authors@R:
c(person(given = "Maël",
family = "Theulière",
role = c("aut", "cre"),
role = c("aut"),
email = "mael.theuliere@gmail.com"),
person(given = "Romain",
family = "Lesur",
Expand All @@ -15,6 +15,10 @@ Authors@R:
family = "Vroylandt",
role = "aut",
email = "tvroylandt@gmail.com"),
person(given = "Juliette",
family = "Engelaere-Lefebvre",
role = c("aut", "cre"),
email = "juliette.engelaere@developpement-durable.gouv.fr"),
person(family = "République Française",
role = "cph"),
person(family = "ThinkR",
Expand Down
6 changes: 6 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# gouvdown 0.0.0.9001

* Update 4 logos for regional prefecture

* Add Word template for creating a docx letter (`lettre_word()`)

# gouvdown 0.0.0.9000

* Add new output_format and template for creating docx letter
Expand Down
2 changes: 1 addition & 1 deletion R/word.R
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#' \code{rmarkdown::\link{render}()}.
#' @export
#'
#' @examples

lettre_word <- function(reference_docx = pkg_resource("docx", "template_lettre.docx"), ...){
rmarkdown::word_document(reference_docx = reference_docx, ...)
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified inst/resources/blocs_marque/prefecture_r94/94-corse-RVB.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion man/add_plot_header.Rd

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

17 changes: 12 additions & 5 deletions man/check_fonts_in_r.Rd

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

2 changes: 1 addition & 1 deletion man/create_header_html_gouv.Rd

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

Binary file modified man/figures/palettes-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 4 additions & 2 deletions man/fonts-dependencies.Rd

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

5 changes: 3 additions & 2 deletions man/gglogo.Rd

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

1 change: 1 addition & 0 deletions man/gouv_colors.Rd

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

7 changes: 1 addition & 6 deletions man/gouv_palettes.Rd

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

13 changes: 9 additions & 4 deletions man/theme_gouv.Rd

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

8 changes: 5 additions & 3 deletions man/theme_gouv_map.Rd

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

13 changes: 9 additions & 4 deletions man/theme_grey_gouv.Rd

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

0 comments on commit 0d83b52

Please sign in to comment.