Skip to content

Commit

Permalink
Merge pull request #32 from LearnToDiscover/sync-with-carpentries
Browse files Browse the repository at this point in the history
Sync with carpentries
  • Loading branch information
milanmlft authored Aug 5, 2024
2 parents 9cb4167 + 2de0870 commit ef687d4
Show file tree
Hide file tree
Showing 25 changed files with 1,109 additions and 167 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/compile-css.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ name: Render CSS and Javascript
jobs:
compress-everything:
name: Render css/javascript
runs-on: macOS-11
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Clean
run: rm -rf inst/pkgdown/assets/assets/
- uses: actions/setup-node@v2
- uses: actions/setup-node@v4
- run: npm install
- name: Comple js
run: bash squash-a-script.sh
Expand Down
21 changes: 15 additions & 6 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,19 @@ Package: varnish
Title: Front-end for The Carpentries Lesson Infrastructure
Version: 1.0.3.9000-1
Authors@R: c(
person(given = "Robert",
family = "Davey",
role = c("aut", "cre"),
email = "[email protected]",
comment = c(ORCID = "0000-0002-5589-7754")),
person(given = "Erin",
family = "Becker",
role = c("aut"),
email = "[email protected]",
comment = c(ORCID = "0000-0002-6832-0233")),
person(given = "Zhian N.",
family = "Kamvar",
role = c("aut", "cre"),
role = c("aut"),
email = "[email protected]",
comment = c(ORCID = "0000-0003-1458-7108")),
person(given = "Ben",
Expand All @@ -25,16 +35,15 @@ Authors@R: c(
role = c("ctb"),
email = "[email protected]",
comment = c(ORCID = "0000-0003-3379-9042")),
person(given = "Robert",
family = "Davey",
role = c("ctb"),
email = "[email protected]",
comment = c(ORCID = "0000-0002-5589-7754")),
person(given = "Joel H.",
family = "Nitta",
role = c("ctb"),
email = "[email protected]",
comment = c(ORCID = "0000-0003-4719-7472")),
person(given = "Dimitrios",
family = "Theodorakis",
role = c("ctb"),
email = "[email protected]"),
person()
)
Description: This package does nothing but contain template HTML CSS and JS files.
Expand Down
4 changes: 3 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# varnish 1.0.3.9000 (2023-05-28)
# varnish 1.0.3 (2023-06-18)

## NEW FEATURES

Expand All @@ -7,6 +7,8 @@
a user-supplied tracking script a la Google, or no option to turn
off tracking (reported: @fiveop https://github.com/carpentries/varnish/issues/37,
implemented @froggleston)
* Add a dark mode so users can switch between text and background colours
(implemented: @astroDimitrios https://github.com/carpentries/varnish/pull/124)


# varnish 1.0.2 (2023-04-10)
Expand Down
6 changes: 1 addition & 5 deletions inst/pkgdown/assets/assets/images/data-logo-sm.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 1 addition & 5 deletions inst/pkgdown/assets/assets/images/data-logo.svg
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 inst/pkgdown/assets/assets/scripts.js

Large diffs are not rendered by default.

7 changes: 3 additions & 4 deletions inst/pkgdown/assets/assets/styles.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion inst/pkgdown/assets/assets/styles.css.map

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions inst/pkgdown/assets/assets/themetoggle.js

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

4 changes: 3 additions & 1 deletion inst/pkgdown/templates/head.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<meta charset="utf-8">
<title>{{#site}}{{&title}}{{/site}}{{#pagetitle}}: {{&pagetitle}}{{/pagetitle}}</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<script src="{{#site}}{{root}}{{/site}}assets/themetoggle.js"></script>
<link rel="stylesheet" type="text/css" href="{{#site}}{{root}}{{/site}}assets/styles.css">
<script src="{{#site}}{{root}}{{/site}}assets/scripts.js" type="text/javascript"></script>
<!-- mathjax -->
Expand All @@ -27,4 +28,5 @@
<link rel="manifest" href="{{#site}}{{root}}{{/site}}site.webmanifest">
<link rel="mask-icon" href="{{#site}}{{root}}{{/site}}safari-pinned-tab.svg" color="#5bbad5">
<meta name="msapplication-TileColor" content="#da532c">
<meta name="theme-color" content="#ffffff">
<meta name="theme-color" media="(prefers-color-scheme: light)" content="white" />
<meta name="theme-color" media="(prefers-color-scheme: dark)" content="black" />
Loading

0 comments on commit ef687d4

Please sign in to comment.