diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index db651c9..1f9896c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -12,7 +12,7 @@ repos: - id: end-of-file-fixer - repo: https://github.com/commitizen-tools/commitizen - rev: v4.6.0 + rev: v4.7.0 hooks: - id: commitizen diff --git a/_extensions/rostools/r3-theme/_brand.yml b/_extensions/rostools/r3-theme/_brand.yml new file mode 100644 index 0000000..8d45387 --- /dev/null +++ b/_extensions/rostools/r3-theme/_brand.yml @@ -0,0 +1,35 @@ +meta: + name: + full: rostools + link: + github: https://github.com/rostools + +typography: + fonts: + - family: quattrocento sans + source: "bunny" + - family: outfit + source: "bunny" + - family: source code pro + source: "bunny" + base: + family: quattrocento sans + size: 18px + headings: + family: outfit + weight: 400 + monospace: source code pro + +defaults: + bootstrap: + defaults: + mermaid-edge-color: "gray" + rules: | + .slide-deck { + border: 3px solid #203C6E; + width: 100%; + height: 425px; + } + kbd { + padding: .15rem .15rem; + } diff --git a/_extensions/rostools/r3-theme/_extension.yml b/_extensions/rostools/r3-theme/_extension.yml index dad8152..71211c1 100644 --- a/_extensions/rostools/r3-theme/_extension.yml +++ b/_extensions/rostools/r3-theme/_extension.yml @@ -18,8 +18,8 @@ contributes: code-overflow: scroll from: markdown+emoji theme: + - brand - yeti - - custom-site.scss revealjs: embed-resources: true @@ -40,8 +40,10 @@ contributes: navbar: logo: "favicon-white.ico" logo-alt: "Graphic of a capital R with a 3 as a superscript." - search: true pinned: true + search: + location: navbar + type: textbox favicon: "favicon.ico" repo-branch: main repo-actions: [edit, issue, source] @@ -57,3 +59,5 @@ contributes: opts_chunk: R.options: width: 72 + + brand: _brand.yml diff --git a/_extensions/rostools/r3-theme/custom-site.scss b/_extensions/rostools/r3-theme/custom-site.scss deleted file mode 100644 index 56f44aa..0000000 --- a/_extensions/rostools/r3-theme/custom-site.scss +++ /dev/null @@ -1,24 +0,0 @@ -/*-- scss:defaults --*/ - -@import url('https://fonts.googleapis.com/css2?family=Outfit'); -@import url('https://fonts.googleapis.com/css2?family=Quattrocento+Sans'); -@import url('https://fonts.googleapis.com/css2?family=Source+Code+Pro'); - -$font-family-monospace: "Source Code Pro", monospace !default; -$font-family-serif: "Quattrocento Sans", sans-serif !default; -$font-family-sans-serif: "Quattrocento Sans", sans-serif !default; -$headings-font-family: "Outfit", sans-serif !default; -$font-size-root: 18px !default; -$mermaid-edge-color: gray; - -/*-- scss:rules --*/ - -.slide-deck { - border: 3px solid #203C6E; - width: 100%; - height: 425px; -} - -kbd { - padding: .15rem .15rem; -} diff --git a/_extensions/rostools/r3-theme/includes/code-of-conduct.qmd b/_extensions/rostools/r3-theme/includes/code-of-conduct.qmd index acbd699..fc99817 100644 --- a/_extensions/rostools/r3-theme/includes/code-of-conduct.qmd +++ b/_extensions/rostools/r3-theme/includes/code-of-conduct.qmd @@ -82,7 +82,7 @@ organizers, teachers, or helpers may take any action they deem appropriate, including warning the offender or expulsion from the workshop. -Thank you for helping make this a welcoming, friendly event for all +Thank you for helping make this a welcoming, friendly workshop for all :smile: ::: {.callout-note appearance="default"} diff --git a/_extensions/rostools/r3-theme/includes/reading-website.qmd b/_extensions/rostools/r3-theme/includes/reading-website.qmd index 519ec11..64d0f4c 100644 --- a/_extensions/rostools/r3-theme/includes/reading-website.qmd +++ b/_extensions/rostools/r3-theme/includes/reading-website.qmd @@ -1,9 +1,8 @@ -We will explain this a bit during the lessons, but read this to start -learning how the website is structured and how to read certain things. -Specifically, there are a few "syntax" type formatting of the text in -this website to be aware of: +We try to be consistent with the way to present certain information in +this website. Specifically, there are a few "syntax" type formatting of +the text to know about: -- Folder names always end with `/`, for example `data/` means the - data folder. -- File names always end with their file extension, for example `content.md` - means the file is a Markdown file. +- Folder names always end with `/`, for example `data/` means the data + folder. +- File names always end with their file extension, for example + `content.md` means the file is a Markdown file.