Skip to content

chore(sync): 🔨 synced file(s) with rostools/r3-theme #260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .air.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[format]
line-width = 80
indent-width = 2
indent-style = "space"
line-ending = "auto"
persistent-line-breaks = true
exclude = []
default-exclude = true
2 changes: 1 addition & 1 deletion .github/workflows/build-website.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build website for R-based educational material
name: Build website for R-based educational material

on:
push:
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,5 @@ public
site
slides/*.html
_freeze

*.html
*_files
22 changes: 22 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# See https://pre-commit.com for more information
# See https://pre-commit.com/hooks.html for more hooks
ci:
autofix_commit_msg: "chore(pre-commit): :pencil2: automatic fixes"
autoupdate_commit_msg: "ci(pre-commit): :construction_worker: update pre-commit CI version"

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v5.0.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer

- repo: https://github.com/commitizen-tools/commitizen
rev: v4.6.1
hooks:
- id: commitizen

- repo: https://github.com/crate-ci/typos
rev: v1.32.0
hooks:
- id: typos
18 changes: 18 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"recommendations": [
"Posit.air-vscode",
"tekumara.typos-vscode",
"pshaddel.conventional-branch",
"vivaxy.vscode-conventional-commits",
"EditorConfig.EditorConfig",
"donjayamanne.githistory",
"felipecaputo.git-project-manager",
"GitHub.vscode-pull-request-github",
"pshaddel.conventional-branch",
"quarto.quarto",
"github.vscode-github-actions",
"redhat.vscode-yaml",
"eamodio.gitlens"
],
"unwantedRecommendations": []
}
8 changes: 4 additions & 4 deletions .vscode/json.code-snippets
Original file line number Diff line number Diff line change
Expand Up @@ -69,16 +69,16 @@
],
"description": "Insert reading task section."
},
"Insert instructor note": {
"Insert teacher note": {
"scope": "quarto,markdown",
"prefix": "instructor_note",
"prefix": "teacher_note",
"body": [
"::: {.callout-note collapse=\"true\"}",
"## :teacher: Instructor note",
"## :teacher: Teacher note",
"",
"${0:Text body}",
":::",
],
"description": "Insert instructor note that is a Quarto callout note block."
"description": "Insert teacher note that is a Quarto callout note block."
}
}
20 changes: 6 additions & 14 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,15 @@
],
"conventional-branch.format": "{Type}/{Branch}",
"files.insertFinalNewline": true,
"cSpell.enabledFileTypes": {
"quarto": true
},
"cSpell.language": "en,en-GB",
"conventionalCommits.scopes": [
"preamble",
"sessions",
"appendix"
],
"cSpell.customDictionaries": {
"project-words": {
"name": "repo-words",
"path": "${workspaceRoot}/includes/dictionary.txt",
"description": "Words used in this repository.",
"addWords": true
},
"custom": true, // Enable the `custom` dictionary
"internal-terms": false // Disable the `internal-terms` dictionary
}
"[r]": {
"editor.formatOnSave": true
},
"[quarto]": {
"editor.formatOnSave": true
},
}
12 changes: 6 additions & 6 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Contributor Code of Conduct

As contributors and maintainers of this project, we pledge to respect all people who
As contributors and maintainers of this project, we pledge to respect all people who
contribute through reporting issues, posting suggestions, updating any material,
submitting pull requests, and other activities.

Expand All @@ -13,13 +13,13 @@ imagery, derogatory comments or personal attacks, trolling, public or private ha
insults, or other unprofessional conduct.

Project maintainers have the right and responsibility to remove, edit, or reject comments,
commits, code, wiki edits, issues, and other contributions that are not aligned to this
Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed
commits, code, wiki edits, issues, and other contributions that are not aligned to this
Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed
from the project team.

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by
opening an issue or contacting one or more of the project maintainers.

This Code of Conduct is adapted from the Contributor Covenant
(https://contributor-covenant.org), version 1.0.0, available at
This Code of Conduct is adapted from the Contributor Covenant
(https://contributor-covenant.org), version 1.0.0, available at
https://contributor-covenant.org/version/1/0/0/
1 change: 0 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@
Check out the [Contributing
Guide](https://guides.rostools.org/contributing) for more details on how
to contribute.

8 changes: 4 additions & 4 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ Type: Website
Title: "Advanced Course for Reproducible Research in R"
Version: 2024.12.10
URL: https://github.com/rostools/r-cubed-advanced
Depends:
Depends:
R (>= 4.0.0),
tidymodels,
tidyverse
Imports:
Imports:
broom,
cli,
commonmark,
Expand All @@ -34,14 +34,14 @@ Imports:
tidyr,
workflows,
xml2
Suggests:
Suggests:
gert,
gitcreds,
rmarkdown,
tarchetypes,
usethis
Encoding: UTF-8
LazyData: true
Remotes:
Remotes:
rostools/r3admin
License: CC BY 4.0
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ For Linux users (and maybe Mac?), you will probably need to install
extra dependencies:

``` bash
sudo apt install libglpk-dev libpoppler-cpp-dev
sudo apt install libglpk-dev libpoppler-cpp-dev
```

## Contributing
Expand Down
7 changes: 3 additions & 4 deletions _extensions/quarto-ext/fontawesome/assets/css/all.css
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
.fa-regular,
.fab,
.fa-brands,
.fal,
.fal,
.fa-light,
.fat,
.fa-thin,
Expand Down Expand Up @@ -6694,7 +6694,7 @@ readers do not read off random characters that represent icons */
.fa-centos:before {
content: "\f789"; }

.fa-adn:before {
.fa-and:before {
content: "\f170"; }

.fa-cloudsmith:before {
Expand Down Expand Up @@ -7258,7 +7258,7 @@ readers do not read off random characters that represent icons */
.fa-spotify:before {
content: "\f1bc"; }

.fa-optin-monster:before {
.fa-option-monster:before {
content: "\f23c"; }

.fa-fly:before {
Expand Down Expand Up @@ -7968,4 +7968,3 @@ readers do not read off random characters that represent icons */
font-display: block;
src: url("../webfonts/FontAwesome6Free-Regular-400.woff2") format("woff2"), url("../../webfonts/FontAwesome6Free-Regular-400.ttf") format("truetype");
unicode-range: U+F003,U+F006,U+F014,U+F016-F017,U+F01A-F01B,U+F01D,U+F022,U+F03E,U+F044,U+F046,U+F05C-F05D,U+F06E,U+F070,U+F087-F088,U+F08A,U+F094,U+F096-F097,U+F09D,U+F0A0,U+F0A2,U+F0A4-F0A7,U+F0C5,U+F0C7,U+F0E5-F0E6,U+F0EB,U+F0F6-F0F8,U+F10C,U+F114-F115,U+F118-F11A,U+F11C-F11D,U+F133,U+F147,U+F14E,U+F150-F152,U+F185-F186,U+F18E,U+F190-F192,U+F196,U+F1C1-F1C9,U+F1D9,U+F1DB,U+F1E3,U+F1EA,U+F1F7,U+F1F9,U+F20A,U+F247-F248,U+F24A,U+F24D,U+F255-F25B,U+F25D,U+F271-F274,U+F278,U+F27B,U+F28C,U+F28E,U+F29C,U+F2B5,U+F2B7,U+F2BA,U+F2BC,U+F2BE,U+F2C0-F2C1,U+F2C3,U+F2D0,U+F2D2,U+F2D4,U+F2DC; }

4 changes: 2 additions & 2 deletions _extensions/quarto-ext/fontawesome/fontawesome.lua
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ return {
group = icon
icon = pandoc.utils.stringify(args[2])
end

local title = pandoc.utils.stringify(kwargs["title"])
if not isEmpty(title) then
title = " title=\"" .. title .. "\""
Expand All @@ -58,7 +58,7 @@ return {
end

local size = pandoc.utils.stringify(kwargs["size"])

-- detect html (excluding epub which won't handle fa)
if quarto.doc.is_format("html:js") then
ensureHtmlDeps()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6700,7 +6700,7 @@ readers do not read off random characters that represent icons */
.fa-centos:before {
content: "\f789"; }

.fa-adn:before {
.fa-and:before {
content: "\f170"; }

.fa-cloudsmith:before {
Expand Down Expand Up @@ -7291,7 +7291,7 @@ readers do not read off random characters that represent icons */
.fa-spotify:before {
content: "\f1bc"; }

.fa-optin-monster:before {
.fa-option-monster:before {
content: "\f23c"; }

.fa-fly:before {
Expand Down
Loading