Skip to content
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

document custom logo #197

Merged
merged 6 commits into from
Jul 26, 2024
Merged

document custom logo #197

merged 6 commits into from
Jul 26, 2024

Conversation

ErinBecker
Copy link
Contributor

This PR adds documentation for how to configure your lesson to use a custom logo (other than one of The Carpentries logos that are included in the template). This should be reviewed and merged along with carpentries/sandpaper#585.

I would particularly appreciate review of the clarity of the instructions, as well as whether I've used code formatting consistently with best practices (or at least consistently with the rest of our documentation!).

Screenshot showing new callout about adding a custom logo

Copy link

github-actions bot commented Jun 21, 2024

Thank you!

Thank you for your pull request 😃

🤖 This automated message can help you check the rendered files in your submission for clarity. If you have any questions, please feel free to open an issue in {sandpaper}.

If you have files that automatically render output (e.g. R Markdown), then you should check for the following:

  • 🎯 correct output
  • 🖼️ correct figures
  • ❓ new warnings
  • ‼️ new errors

Rendered Changes

🔍 Inspect the changes: https://github.com/carpentries/sandpaper-docs/compare/md-outputs..md-outputs-PR-197

The following changes were observed in the rendered markdown documents:

 editing.md | 20 +++++++++++++++++++-
 md5sum.txt |  2 +-
 2 files changed, 20 insertions(+), 2 deletions(-)
What does this mean?

If you have source files that require output and figures to be generated (e.g. R Markdown), then it is important to make sure the generated figures and output are reproducible.

This output provides a way for you to inspect the output in a diff-friendly manner so that it's easy to see the changes that occur due to new software versions or randomisation.

⏱️ Updated at 2024-07-26 10:14:25 +0000

@tobyhodges
Copy link
Member

Thanks @ErinBecker, looks good.

episodes/editing.md Outdated Show resolved Hide resolved
episodes/editing.md Outdated Show resolved Hide resolved
episodes/editing.md Outdated Show resolved Hide resolved
@tobyhodges
Copy link
Member

I would particularly appreciate review of the clarity of the instructions, as well as whether I've used code formatting consistently with best practices (or at least consistently with the rest of our documentation!).

Prompted by this, I have taken a closer look. There is some inconsistency already in how package names, filenames, and YAML variable names are formatted across the site, but I have suggested a few changes to try to keep things roughly in line.

ErinBecker and others added 3 commits June 24, 2024 08:42
Co-authored-by: Toby Hodges <tobyhodges@carpentries.org>
Co-authored-by: Toby Hodges <tobyhodges@carpentries.org>
Co-authored-by: Toby Hodges <tobyhodges@carpentries.org>
github-actions bot pushed a commit that referenced this pull request Jun 24, 2024
github-actions bot pushed a commit that referenced this pull request Jun 25, 2024
milanmlft added a commit to milanmlft/sandpaper that referenced this pull request Jun 25, 2024
Following updates in carpentries/sandpaper-docs#197

Co-authored-by: Erin Becker <ebecker@carpentries.org>
Copy link
Member

@tobyhodges tobyhodges left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

adding a couple of options missing from the list. These options should also be added to the list for the carpentry option.

Comment on lines 145 to 146
carpentry_description
: (Optional) Full organisation name. Not needed when carpentry is swc, dc, lc, or cp.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
carpentry_description
: (Optional) Full organisation name. Not needed when carpentry is swc, dc, lc, or cp.
carpentry_description
: (Optional) Full organisation name. Not needed when carpentry is swc, dc, lc, cp, incubator, or lab.

Copy link
Member

@tobyhodges tobyhodges left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have adjusted the lists and will merge this now. Thanks @ErinBecker! 🙌

github-actions bot pushed a commit that referenced this pull request Jul 26, 2024
@tobyhodges tobyhodges merged commit 2a7b850 into main Jul 26, 2024
3 checks passed
@tobyhodges tobyhodges deleted the custom-carpentry branch July 26, 2024 10:34
github-actions bot pushed a commit that referenced this pull request Jul 26, 2024
Auto-generated via {sandpaper}
Source  : 2a7b850
Branch  : main
Author  : Toby Hodges <tobyhodges@carpentries.org>
Time    : 2024-07-26 10:34:54 +0000
Message : Merge pull request #197 from carpentries/custom-carpentry

document custom logo
github-actions bot pushed a commit that referenced this pull request Jul 26, 2024
Auto-generated via {sandpaper}
Source  : 666e14a
Branch  : md-outputs
Author  : GitHub Actions <actions@github.com>
Time    : 2024-07-26 10:35:50 +0000
Message : markdown source builds

Auto-generated via {sandpaper}
Source  : 2a7b850
Branch  : main
Author  : Toby Hodges <tobyhodges@carpentries.org>
Time    : 2024-07-26 10:34:54 +0000
Message : Merge pull request #197 from carpentries/custom-carpentry

document custom logo
github-actions bot pushed a commit that referenced this pull request Jul 30, 2024
Auto-generated via {sandpaper}
Source  : 666e14a
Branch  : md-outputs
Author  : GitHub Actions <actions@github.com>
Time    : 2024-07-26 10:35:50 +0000
Message : markdown source builds

Auto-generated via {sandpaper}
Source  : 2a7b850
Branch  : main
Author  : Toby Hodges <tobyhodges@carpentries.org>
Time    : 2024-07-26 10:34:54 +0000
Message : Merge pull request #197 from carpentries/custom-carpentry

document custom logo
milanmlft added a commit to LearnToDiscover/sandpaper that referenced this pull request Aug 5, 2024
* Allow custom carpentry setting

* Add optional `carpentry_description`

* Add `carpentry_description` to the config template

* Test that `which_carpentry` works correctly

* Update documentation reference

Following updates in carpentries/sandpaper-docs#197

Co-authored-by: Erin Becker <ebecker@carpentries.org>

* Fix for pkgdown 2.1.0 adding anchors to sections

* Revert last commit, add pinned pkgdown version

* Update DESCRIPTION

Revert package pinning as it doesn't seem to be respected in dependency calculations from fresh installs - something I don't really understand with R. This means that sandpaper will continue to build but will have the duplicate anchors for h2 sections, and tests will fail.

---------

Co-authored-by: Erin Becker <ebecker@carpentries.org>
Co-authored-by: Robert Davey <robertdavey@carpentries.org>
github-actions bot pushed a commit that referenced this pull request Aug 6, 2024
Auto-generated via {sandpaper}
Source  : 666e14a
Branch  : md-outputs
Author  : GitHub Actions <actions@github.com>
Time    : 2024-07-26 10:35:50 +0000
Message : markdown source builds

Auto-generated via {sandpaper}
Source  : 2a7b850
Branch  : main
Author  : Toby Hodges <tobyhodges@carpentries.org>
Time    : 2024-07-26 10:34:54 +0000
Message : Merge pull request #197 from carpentries/custom-carpentry

document custom logo
github-actions bot pushed a commit that referenced this pull request Aug 13, 2024
Auto-generated via {sandpaper}
Source  : 666e14a
Branch  : md-outputs
Author  : GitHub Actions <actions@github.com>
Time    : 2024-07-26 10:35:50 +0000
Message : markdown source builds

Auto-generated via {sandpaper}
Source  : 2a7b850
Branch  : main
Author  : Toby Hodges <tobyhodges@carpentries.org>
Time    : 2024-07-26 10:34:54 +0000
Message : Merge pull request #197 from carpentries/custom-carpentry

document custom logo
github-actions bot pushed a commit that referenced this pull request Aug 20, 2024
Auto-generated via {sandpaper}
Source  : 666e14a
Branch  : md-outputs
Author  : GitHub Actions <actions@github.com>
Time    : 2024-07-26 10:35:50 +0000
Message : markdown source builds

Auto-generated via {sandpaper}
Source  : 2a7b850
Branch  : main
Author  : Toby Hodges <tobyhodges@carpentries.org>
Time    : 2024-07-26 10:34:54 +0000
Message : Merge pull request #197 from carpentries/custom-carpentry

document custom logo
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants