Fix a couple minor issues with whisker template

R/write_theme.R

@@ -153,6 +153,7 @@ write_xaringan_theme <- function(
   }
   
   # prepare variables for template
+  body_font_family <- paste(c(text_font_family, text_font_family_fallback, text_font_base), collapse = ', ')
   backround_size_fallback <- if (is.null(background_position)) "cover" else "100%"
   background_size <- background_image %??% (background_size %||% background_size_fallback)
   title_slide_background_size <- title_slide_background_size %||% (

inst/resources/template.css

@@ -153,7 +153,7 @@ th, td {
   padding: 5px;
 }
 .remark-slide thead, .remark-slide tfoot, .remark-slide tr:nth-child(even) {
-  background: {{table_row_even_background_color}}
+  background: {{table_row_even_background_color}};
 }
 table.dataTable tbody {
   background-color: {{background_color}};
@@ -163,7 +163,7 @@ table.dataTable.display tbody tr.odd {
   background-color: {{background_color}};
 }
 table.dataTable.display tbody tr.even {
-  background-color: {{table_row_even_background_color}}
+  background-color: {{table_row_even_background_color}};
 }
 table.dataTable.hover tbody tr:hover, table.dataTable.display tbody tr:hover {
   background-color: rgba(255, 255, 255, 0.5);

inst/scripts/write_xaringan_theme_body.R

@@ -39,6 +39,7 @@ for (var in f_args) {
 }
 
 # prepare variables for template
+body_font_family <- paste(c(text_font_family, text_font_family_fallback, text_font_base), collapse = ', ')
 backround_size_fallback <- if (is.null(background_position)) "cover" else "100%"
 background_size <- background_image %??% (background_size %||% background_size_fallback)
 title_slide_background_size <- title_slide_background_size %||% (

tests/testthat/css/duo.css

@@ -34,9 +34,6 @@ h1, h2, h3 {
 .remark-slide-content {
   background-color: #1F4257;
   font-size: 20px;
-  
-  
-  
   padding: 1em 4em 1em 4em;
 }
 .remark-slide-content h1 {
@@ -55,17 +52,15 @@ h1, h2, h3 {
   font-size: 0.9em;
 }
 .remark-inline-code {
-  font-size: 1em;
   color: #F97B64;
-  
-  
+  font-size: 1em;
 }
 .remark-slide-number {
   color: #FEFDFD;
   opacity: 1;
   font-size: 0.9em;
 }
-strong{color:#F97B64;}
+strong { color: #F97B64; }
 a, a > code {
   color: #F97B64;
   text-decoration: none;
@@ -140,9 +135,15 @@ blockquote {
   border-top: 1px solid #666;
   border-bottom: 1px solid #666;
 }
-.remark-slide table thead th { border-bottom: 1px solid #ddd; }
-th, td { padding: 5px; }
-.remark-slide thead, .remark-slide tfoot, .remark-slide tr:nth-child(even) { background: #627A89 }
+.remark-slide table thead th {
+  border-bottom: 1px solid #ddd;
+}
+th, td {
+  padding: 5px;
+}
+.remark-slide thead, .remark-slide tfoot, .remark-slide tr:nth-child(even) {
+  background: #627A89;
+}
 table.dataTable tbody {
   background-color: #1F4257;
   color: #FEFDFD;

tests/testthat/css/duo_accent.css

@@ -34,9 +34,6 @@ h1, h2, h3 {
 .remark-slide-content {
   background-color: #FFFFFF;
   font-size: 20px;
-  
-  
-  
   padding: 1em 4em 1em 4em;
 }
 .remark-slide-content h1 {
@@ -55,17 +52,15 @@ h1, h2, h3 {
   font-size: 0.9em;
 }
 .remark-inline-code {
-  font-size: 1em;
   color: #006747;
-  
-  
+  font-size: 1em;
 }
 .remark-slide-number {
   color: #006747;
   opacity: 1;
   font-size: 0.9em;
 }
-strong{color:#006747;}
+strong { color: #006747; }
 a, a > code {
   color: #006747;
   text-decoration: none;
@@ -140,9 +135,15 @@ blockquote {
   border-top: 1px solid #666;
   border-bottom: 1px solid #666;
 }
-.remark-slide table thead th { border-bottom: 1px solid #ddd; }
-th, td { padding: 5px; }
-.remark-slide thead, .remark-slide tfoot, .remark-slide tr:nth-child(even) { background: #DDD5B3 }
+.remark-slide table thead th {
+  border-bottom: 1px solid #ddd;
+}
+th, td {
+  padding: 5px;
+}
+.remark-slide thead, .remark-slide tfoot, .remark-slide tr:nth-child(even) {
+  background: #DDD5B3;
+}
 table.dataTable tbody {
   background-color: #FFFFFF;
   color: #000000;

tests/testthat/css/duo_accent_inverse.css

@@ -34,9 +34,6 @@ h1, h2, h3 {
 .remark-slide-content {
   background-color: #000000;
   font-size: 20px;
-  
-  
-  
   padding: 1em 4em 1em 4em;
 }
 .remark-slide-content h1 {
@@ -55,17 +52,15 @@ h1, h2, h3 {
   font-size: 0.9em;
 }
 .remark-inline-code {
-  font-size: 1em;
   color: #CFC493;
-  
-  
+  font-size: 1em;
 }
 .remark-slide-number {
   color: #006747;
   opacity: 1;
   font-size: 0.9em;
 }
-strong{color:#CFC493;}
+strong { color: #CFC493; }
 a, a > code {
   color: #CFC493;
   text-decoration: none;
@@ -140,9 +135,15 @@ blockquote {
   border-top: 1px solid #666;
   border-bottom: 1px solid #666;
 }
-.remark-slide table thead th { border-bottom: 1px solid #ddd; }
-th, td { padding: 5px; }
-.remark-slide thead, .remark-slide tfoot, .remark-slide tr:nth-child(even) { background: #004831 }
+.remark-slide table thead th {
+  border-bottom: 1px solid #ddd;
+}
+th, td {
+  padding: 5px;
+}
+.remark-slide thead, .remark-slide tfoot, .remark-slide tr:nth-child(even) {
+  background: #004831;
+}
 table.dataTable tbody {
   background-color: #000000;
   color: #FFFFFF;

tests/testthat/css/mono_accent.css

@@ -34,9 +34,6 @@ h1, h2, h3 {
 .remark-slide-content {
   background-color: #FFFFFF;
   font-size: 20px;
-  
-  
-  
   padding: 1em 4em 1em 4em;
 }
 .remark-slide-content h1 {
@@ -55,17 +52,15 @@ h1, h2, h3 {
   font-size: 0.9em;
 }
 .remark-inline-code {
-  font-size: 1em;
   color: #43418A;
-  
-  
+  font-size: 1em;
 }
 .remark-slide-number {
   color: #43418A;
   opacity: 1;
   font-size: 0.9em;
 }
-strong{color:#43418A;}
+strong { color: #43418A; }
 a, a > code {
   color: #43418A;
   text-decoration: none;
@@ -140,9 +135,15 @@ blockquote {
   border-top: 1px solid #666;
   border-bottom: 1px solid #666;
 }
-.remark-slide table thead th { border-bottom: 1px solid #ddd; }
-th, td { padding: 5px; }
-.remark-slide thead, .remark-slide tfoot, .remark-slide tr:nth-child(even) { background: #C6C6DB }
+.remark-slide table thead th {
+  border-bottom: 1px solid #ddd;
+}
+th, td {
+  padding: 5px;
+}
+.remark-slide thead, .remark-slide tfoot, .remark-slide tr:nth-child(even) {
+  background: #C6C6DB;
+}
 table.dataTable tbody {
   background-color: #FFFFFF;
   color: #272822;

tests/testthat/css/mono_accent_inverse.css

@@ -34,9 +34,6 @@ h1, h2, h3 {
 .remark-slide-content {
   background-color: #050F0F;
   font-size: 20px;
-  
-  
-  
   padding: 1em 4em 1em 4em;
 }
 .remark-slide-content h1 {
@@ -55,17 +52,15 @@ h1, h2, h3 {
   font-size: 0.9em;
 }
 .remark-inline-code {
-  font-size: 1em;
   color: #3C989E;
-  
-  
+  font-size: 1em;
 }
 .remark-slide-number {
   color: #3C989E;
   opacity: 1;
   font-size: 0.9em;
 }
-strong{color:#3C989E;}
+strong { color: #3C989E; }
 a, a > code {
   color: #3C989E;
   text-decoration: none;
@@ -140,9 +135,15 @@ blockquote {
   border-top: 1px solid #666;
   border-bottom: 1px solid #666;
 }
-.remark-slide table thead th { border-bottom: 1px solid #ddd; }
-th, td { padding: 5px; }
-.remark-slide thead, .remark-slide tfoot, .remark-slide tr:nth-child(even) { background: #122D2F }
+.remark-slide table thead th {
+  border-bottom: 1px solid #ddd;
+}
+th, td {
+  padding: 5px;
+}
+.remark-slide thead, .remark-slide tfoot, .remark-slide tr:nth-child(even) {
+  background: #122D2F;
+}
 table.dataTable tbody {
   background-color: #050F0F;
   color: #FFFFFF;

tests/testthat/css/mono_dark.css

@@ -34,9 +34,6 @@ h1, h2, h3 {
 .remark-slide-content {
   background-color: #1E2523;
   font-size: 20px;
-  
-  
-  
   padding: 1em 4em 1em 4em;
 }
 .remark-slide-content h1 {
@@ -55,17 +52,15 @@ h1, h2, h3 {
   font-size: 0.9em;
 }
 .remark-inline-code {
-  font-size: 1em;
   color: #cbf7ed;
-  
-  
+  font-size: 1em;
 }
 .remark-slide-number {
   color: #cbf7ed;
   opacity: 1;
   font-size: 0.9em;
 }
-strong{color:#cbf7ed;}
+strong { color: #cbf7ed; }
 a, a > code {
   color: #cbf7ed;
   text-decoration: none;
@@ -140,9 +135,15 @@ blockquote {
   border-top: 1px solid #666;
   border-bottom: 1px solid #666;
 }
-.remark-slide table thead th { border-bottom: 1px solid #ddd; }
-th, td { padding: 5px; }
-.remark-slide thead, .remark-slide tfoot, .remark-slide tr:nth-child(even) { background: #3C4A47 }
+.remark-slide table thead th {
+  border-bottom: 1px solid #ddd;
+}
+th, td {
+  padding: 5px;
+}
+.remark-slide thead, .remark-slide tfoot, .remark-slide tr:nth-child(even) {
+  background: #3C4A47;
+}
 table.dataTable tbody {
   background-color: #1E2523;
   color: #F4FDFB;

tests/testthat/css/mono_light.css

@@ -34,9 +34,6 @@ h1, h2, h3 {
 .remark-slide-content {
   background-color: #E9EBEE;
   font-size: 20px;
-  
-  
-  
   padding: 1em 4em 1em 4em;
 }
 .remark-slide-content h1 {
@@ -55,17 +52,15 @@ h1, h2, h3 {
   font-size: 0.9em;
 }
 .remark-inline-code {
-  font-size: 1em;
   color: #23395b;
-  
-  
+  font-size: 1em;
 }
 .remark-slide-number {
   color: #23395b;
   opacity: 1;
   font-size: 0.9em;
 }
-strong{color:#23395b;}
+strong { color: #23395b; }
 a, a > code {
   color: #23395b;
   text-decoration: none;
@@ -140,9 +135,15 @@ blockquote {
   border-top: 1px solid #666;
   border-bottom: 1px solid #666;
 }
-.remark-slide table thead th { border-bottom: 1px solid #ddd; }
-th, td { padding: 5px; }
-.remark-slide thead, .remark-slide tfoot, .remark-slide tr:nth-child(even) { background: #D3D7DE }
+.remark-slide table thead th {
+  border-bottom: 1px solid #ddd;
+}
+th, td {
+  padding: 5px;
+}
+.remark-slide thead, .remark-slide tfoot, .remark-slide tr:nth-child(even) {
+  background: #D3D7DE;
+}
 table.dataTable tbody {
   background-color: #E9EBEE;
   color: #18273F;

tests/testthat/css/solarized_dark.css

@@ -34,9 +34,6 @@ h1, h2, h3 {
 .remark-slide-content {
   background-color: #002b36;
   font-size: 20px;
-  
-  
-  
   padding: 1em 4em 1em 4em;
 }
 .remark-slide-content h1 {
@@ -55,17 +52,15 @@ h1, h2, h3 {
   font-size: 0.9em;
 }
 .remark-inline-code {
-  font-size: 1em;
   color: #6c71c4;
-  
-  
+  font-size: 1em;
 }
 .remark-slide-number {
   color: #586e75;
   opacity: 1;
   font-size: 0.9em;
 }
-strong{color:#d33682;}
+strong { color: #d33682; }
 a, a > code {
   color: #b58900;
   text-decoration: none;
@@ -140,9 +135,15 @@ blockquote {
   border-top: 1px solid #657b83;
   border-bottom: 1px solid #657b83;
 }
-.remark-slide table thead th { border-bottom: 1px solid #657b83; }
-th, td { padding: 5px; }
-.remark-slide thead, .remark-slide tfoot, .remark-slide tr:nth-child(even) { background: #073642 }
+.remark-slide table thead th {
+  border-bottom: 1px solid #657b83;
+}
+th, td {
+  padding: 5px;
+}
+.remark-slide thead, .remark-slide tfoot, .remark-slide tr:nth-child(even) {
+  background: #073642;
+}
 table.dataTable tbody {
   background-color: #002b36;
   color: #839496;

tests/testthat/css/solarized_light.css

@@ -34,9 +34,6 @@ h1, h2, h3 {
 .remark-slide-content {
   background-color: #fdf6e3;
   font-size: 20px;
-  
-  
-  
   padding: 1em 4em 1em 4em;
 }
 .remark-slide-content h1 {
@@ -55,17 +52,15 @@ h1, h2, h3 {
   font-size: 0.9em;
 }
 .remark-inline-code {
-  font-size: 1em;
   color: #6c71c4;
-  
-  
+  font-size: 1em;
 }
 .remark-slide-number {
   color: #93a1a1;
   opacity: 1;
   font-size: 0.9em;
 }
-strong{color:#d33682;}
+strong { color: #d33682; }
 a, a > code {
   color: #b58900;
   text-decoration: none;
@@ -140,9 +135,15 @@ blockquote {
   border-top: 1px solid #839496;
   border-bottom: 1px solid #839496;
 }
-.remark-slide table thead th { border-bottom: 1px solid #839496; }
-th, td { padding: 5px; }
-.remark-slide thead, .remark-slide tfoot, .remark-slide tr:nth-child(even) { background: #eee8d5 }
+.remark-slide table thead th {
+  border-bottom: 1px solid #839496;
+}
+th, td {
+  padding: 5px;
+}
+.remark-slide thead, .remark-slide tfoot, .remark-slide tr:nth-child(even) {
+  background: #eee8d5;
+}
 table.dataTable tbody {
   background-color: #fdf6e3;
   color: #657b83;