Merge branch 'main' into feature/tab-admonition

carpentries · Apr 5, 2024 · 2fe1369 · 2fe1369
2 parents 5b4d3cc + a7e7e56
commit 2fe1369
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: varnish
 Title: Front-end for The Carpentries Lesson Infrastructure
-Version: 1.0.1.9000
+Version: 1.0.2.9000
 Authors@R: c(
     person(given = "Zhian N.",
            family = "Kamvar",
@@ -30,9 +30,6 @@ Authors@R: c(
            role = c("ctb"),
            email = "robertdavey@carpentries.org",
            comment = c(ORCID = "0000-0002-5589-7754")),
-    person(given = "Robert",
-           family = "Chisholm",
-           role = c("ctb")),
     person(given = "Joel H.",
            family = "Nitta",
            role = c("ctb"),

diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,10 @@
-# varnish 1.0.1.9000 (unreleased)
+# varnish 1.0.2.9000 (2023-03-21)
+
+## NEW FEATURES
+
+* The lesson page footer now supports either a CITATION or CITATION.cff file
+  (reported: @tobyhodges, implemented: @tobyhodges, #122;
+  @froggleston, https://github.com/carpentries/sandpaper/pull/572)
 
 # varnish 1.0.1 (2023-12-14)
 

diff --git a/inst/pkgdown/assets/assets/styles.css b/inst/pkgdown/assets/assets/styles.css
diff --git a/inst/pkgdown/templates/footer.html b/inst/pkgdown/templates/footer.html
@@ -18,7 +18,7 @@
         {{/yaml}}
         | <a href="{{#yaml}}{{source}}/blob/{{branch}}/{{/yaml}}CONTRIBUTING.md">{{ translate.Contributing }}</a>
         | <a href="{{#yaml}}{{source}}/{{/yaml}}">{{ translate.Source }}</a></p>
-				<p><a href="{{#yaml}}{{source}}/blob/{{branch}}/{{/yaml}}CITATION">{{ translate.Cite }}</a> | <a href="mailto:{{#yaml}}{{contact}}{{/yaml}}">{{ translate.Contact }}</a> | <a href="https://carpentries.org/about/">{{ translate.About }}</a></p>
+				<p><a href="{{#yaml}}{{source}}/blob/{{branch}}/{{/yaml}}{{citation}}">{{ translate.Cite }}</a> | <a href="mailto:{{#yaml}}{{contact}}{{/yaml}}">{{ translate.Contact }}</a> | <a href="https://carpentries.org/about/">{{ translate.About }}</a></p>
 			</div>
 			<div class="col-md-6">
         {{#yaml}}{{#license}}

diff --git a/source/stylesheets/styles.css.scss b/source/stylesheets/styles.css.scss
@@ -209,7 +209,7 @@ dt > * {
   max-width: 100%;
 }
 
-figcaption {
+.figcaption {
   border-top: 1px solid $black;
   background: $light-gray;
   margin-bottom: 25px;