Merge pull request #35 from CDU-data-science-team/28-add-cdu-branding

28 add cdu branding
CDU-data-science-team · Sep 27, 2021 · 9eda7f3 · 9eda7f3
2 parents e66a3dc + 4074970
commit 9eda7f3
Show file tree

Hide file tree

Showing 11 changed files with 191 additions and 68 deletions.
diff --git a/README.Rmd b/README.Rmd
@@ -29,11 +29,11 @@ You can install the the development version from [GitHub](https://github.com/) w
 devtools::install_github("CDU-data-science-team/nottshcMethods")
 ```
 
-## Nottinghamshire Healthcare NHS Foundation Trust slides
+## Slide and distill post templates
 
-Once the package is installed, {xaringan} presentation slides with Nottinghamshire Healthcare NHS Foundation Trust branding can be access easily using the RStudio IDE, by selecting `File` -\> `R markdown ...` -\> `From Template`.
+Once the package is installed, {xaringan} presentation slides with branding and {distill} post templates can be access easily using the RStudio IDE, by selecting `File` -\> `R markdown ...` -\> `From Template`.
 
-```{r, echo = FALSE, out.width="50%"}
+```{r, echo = FALSE, out.width="50%", fig.alt="Screenshot of the templates wizard selection list with Nottshc Presentation Slides highlighted"}
 knitr::include_graphics("img/screen-capture-templates.png")
 ```
 

diff --git a/README.md b/README.md
@@ -19,14 +19,14 @@ You can install the the development version from
 devtools::install_github("CDU-data-science-team/nottshcMethods")
 ```
 
-## Nottinghamshire Healthcare NHS Foundation Trust slides
+## Slide and distill post templates
 
-Once the package is installed, xaringan presentation slides with
-Nottinghamshire Healthcare NHS Foundation Trust branding can be access
-easily using the RStudio IDE, by selecting `File` -&gt; `R markdown ...`
--&gt; `From Template`.
+Once the package is installed, {xaringan} presentation slides with
+branding and {distill} post templates can be access easily using the
+RStudio IDE, by selecting `File` -&gt; `R markdown ...` -&gt;
+`From Template`.
 
-<img src="img/screen-capture-templates.png" width="50%" />
+<img src="img/screen-capture-templates.png" title="Screenshot of the templates wizard selection list with Nottshc Presentation Slides highlighted" alt="Screenshot of the templates wizard selection list with Nottshc Presentation Slides highlighted" width="50%" />
 
 ## Code of Conduct
 

diff --git a/inst/rmarkdown/templates/CDU-Data-Science-Team/skeleton/css/nhsr.css b/inst/rmarkdown/templates/CDU-Data-Science-Team/skeleton/css/nhsr.css
@@ -1,12 +1,8 @@
 /*-- LINKS/ANCHORS --*/
-a {
-  color:              #005EB8;
-  border-bottom:      2px solid #005EB8;
-  line-height:        1.5em;
-}
-
-a:hover {
-  border-bottom:      0px;
+a,
+a>code {
+  color: #005EB8;
+  text-decoration: underline;
 }
 
 /*-- HEADINGS --*/
@@ -140,11 +136,7 @@ blockquote {
 /*-- Links/anchors (inverse) --*/
 .inverse a {
   color:              white;
-  border-bottom:      2px solid white;
-}
-
-.inverse a:hover {
-  border-bottom: none;
+  text-decoration:    underline;
 }
 
 /*-- Slide background and text (inverse-white) --*/

diff --git a/inst/rmarkdown/templates/CDU-Data-Science-Team/skeleton/skeleton.Rmd b/inst/rmarkdown/templates/CDU-Data-Science-Team/skeleton/skeleton.Rmd
@@ -30,9 +30,9 @@ library(tidyverse)
 ### Packages not on CRAN ###
 
 # install.packages("remotes")
-# remotes::install_github("mitchelloharawild/icon")
-library(icon) # icons need to be loaded to view so run following code if not already done
-# icon::download_fontawesome()
+# remotes::install_github("mitchelloharawild/icons")
+library(icons) # icons need to be loaded to view so run following code if not already done
+# icons::download_fontawesome()
 
 # install.packages("devtools")
 #devtools::install_github("gadenbuie/xaringanExtra")
@@ -68,6 +68,7 @@ opts_chunk$set(echo = FALSE,
 
 xaringanExtra::use_logo(
   image_url = "https://cdu-data-science-team.github.io/assets/logo/nottshc-cdu-data-science-logo-800.png",
+  link_url = "https://cdu-data-science-team.github.io/team-blog/",
   exclude_class = c("inverse", "hide-logo"),
   width = "300px",
   height = "200px",
@@ -164,19 +165,19 @@ An example of using the trailing comment `#<<` to highlight lines:
 
 ### Code
 
-````markdown
-`r ''````{r tidy=FALSE}
+```{r example, tidy=FALSE, eval=FALSE, echo=TRUE}
 library(ggplot2)
 ggplot(mtcars) + 
   aes(mpg, disp) + 
   geom_point() +   #<<
   geom_smooth()    #<<
 ```
-````
+
+---
 
 ### Output
 
-```{r tidy=FALSE, eval=FALSE, echo=TRUE}
+```{r ref.label="example", eval=TRUE, echo=FALSE}
 library(ggplot2)
 ggplot(mtcars) + 
   aes(mpg, disp) + 
@@ -192,7 +193,7 @@ class: inverse-white, hide-logo
 
 The logo can be removed from a slide where the title overruns by using class: hide-logo
 
-.footnote[The **nhsr theme** was designed by [Silvia Canelon](https://silvia.rbind.io) for, and with feedback from, the [NHS-R Community](https://github.com/nhs-r-community), following the [NHS identity guidelines](https://www.england.nhs.uk/nhsidentity/identity-guidelines/).]
+.footnote[The **nhsr theme** was designed by [Silvia Canelon](https://silvia.rbind.io) for, and with feedback from, the [NHS-R Community](https://github.com/nhs-r-community), following the [NHS identity guidelines](https://www.england.nhs.uk/nhsidentity/identity-guidelines/). Note that the xaringan share overlaps the footnotes if there are any hyperlinks.]
 
 ---
 class: inverse
@@ -201,9 +202,9 @@ name: acknowledgement
 
 # Acknowledgments
 
-Acknowledgements: the professional look of this presentation, using NHS and Nottinghamshire Healthcare NHS Foundation Trust colour branding, exists because of the amazing work of Silvia Canelón, details of the workshops she ran at the [NHS-R Community conference](https://spcanelon.github.io/xaringan-basics-and-beyond/index.html).
+Acknowledgements: the professional look of this presentation, using NHS and Nottinghamshire Healthcare NHS Foundation Trust colour branding, exists because of the amazing work of Silvia Canelón, details of the workshops she ran at the [NHS-R Community conference](https://spcanelon.github.io/xaringan-basics-and-beyond/index.html), Milan Wiedemann who created the CDU Data Science logo with the help of the team and Zoë Turner for putting together the slides.
 
-[`r icon::fontawesome("twitter")` @DataScienceNott](https://twitter.com/DataScienceNott)<br/>
-[`r icon::fontawesome("github")` Clinical Development Unit Data Science Team](https://github.com/CDU-data-science-team)<br/>
-[`r icon::fontawesome("paper-plane")` zoe.turner2@notthshc.nhs.uk](mailto:zoe.turner2@nottshc.nhs.uk)
+[`r icons::fontawesome("twitter")` @DataScienceNott](https://twitter.com/DataScienceNott)<br/>
+[`r icons::fontawesome("github")` Clinical Development Unit Data Science Team](https://github.com/CDU-data-science-team)<br/>
+[`r icons::fontawesome("paper-plane")` cdudatascience@nottshc.nhs.uk](mailto:cdudatascience@nottshc.nhs.uk)
 
diff --git a/inst/rmarkdown/templates/CDU-Data-Science-Team/skeleton/skeleton.html b/inst/rmarkdown/templates/CDU-Data-Science-Team/skeleton/skeleton.html
diff --git a/inst/rmarkdown/templates/CDU-Data-Science-Team/template.yaml b/inst/rmarkdown/templates/CDU-Data-Science-Team/template.yaml
@@ -1,4 +1,4 @@
-name: Nottshc Presentation template
+name: CDU Data Science Team Presentation template
 description: >
    Standard xaringan Nottshc template for presentations
 create_dir: TRUE
diff --git a/inst/rmarkdown/templates/Nottshc/skeleton/skeleton.Rmd b/inst/rmarkdown/templates/Nottshc/skeleton/skeleton.Rmd
@@ -33,9 +33,9 @@ library(tidyverse)
 ### Packages not on CRAN ###
 
 # install.packages("remotes")
-# remotes::install_github("mitchelloharawild/icon")
-library(icon) # icons need to be loaded to view so run following code if not already done
-# icon::download_fontawesome()
+# remotes::install_github("mitchelloharawild/icons")
+library(icons) # icons need to be loaded to view so run following code if not already done
+# icons::download_fontawesome()
 
 # install.packages("devtools")
 #devtools::install_github("gadenbuie/xaringanExtra")
@@ -213,9 +213,9 @@ name: acknowledgement
 
 # Acknowledgments
 
-Acknowledgements: the professional look of this presentation, using NHS and Nottinghamshire Healthcare NHS Foundation Trust colour branding, exists because of the amazing work of Silvia Canelón, details of the workshops she ran at the [NHS-R Community conference](https://spcanelon.github.io/xaringan-basics-and-beyond/index.html).
+Acknowledgements: the professional look of this presentation, using NHS and Nottinghamshire Healthcare NHS Foundation Trust colour branding, exists because of the amazing work of Silvia Canelón, details of the workshops she ran at the [NHS-R Community conference](https://spcanelon.github.io/xaringan-basics-and-beyond/index.html), Milan Wiedemann who created the CDU Data Science logo with the help of the team and Zoë Turner for putting together the slides.
 
-[`r icon::fontawesome("twitter")` @DataScienceNott](https://twitter.com/DataScienceNott)<br/>
-[`r icon::fontawesome("github")` Clinical Development Unit Data Science Team](https://github.com/CDU-data-science-team)<br/>
-[`r icon::fontawesome("paper-plane")` zoe.turner2@notthshc.nhs.uk](mailto:zoe.turner2@nottshc.nhs.uk)
+[`r icons::fontawesome("twitter")` @DataScienceNott](https://twitter.com/DataScienceNott)<br/>
+[`r icons::fontawesome("github")` Clinical Development Unit Data Science Team](https://github.com/CDU-data-science-team)<br/>
+[`r icons::fontawesome("paper-plane")` cdudatascience@nottshc.nhs.uk](mailto:cdudatascience@nottshc.nhs.uk)