Sfoglia il codice sorgente

only worry about spaces in google font family

tags/v0.3.0
Garrick Aden-Buie 6 anni fa
parent
commit
e6fa1328ee
15 ha cambiato i file con 30 aggiunte e 32 eliminazioni
  1. +2
    -3
      R/style_xaringan.R
  2. +2
    -3
      inst/scripts/style_xaringan_body.R
  3. +2
    -2
      tests/testthat/css/duo-header_bg.css
  4. +2
    -2
      tests/testthat/css/duo.css
  5. +2
    -2
      tests/testthat/css/duo_accent.css
  6. +2
    -2
      tests/testthat/css/duo_accent_inverse.css
  7. +2
    -2
      tests/testthat/css/mono_accent.css
  8. +2
    -2
      tests/testthat/css/mono_accent_inverse.css
  9. +2
    -2
      tests/testthat/css/mono_dark.css
  10. +2
    -2
      tests/testthat/css/mono_light-header_bg.css
  11. +2
    -2
      tests/testthat/css/mono_light.css
  12. +2
    -2
      tests/testthat/css/solarized_dark-header_bg.css
  13. +2
    -2
      tests/testthat/css/solarized_dark.css
  14. +2
    -2
      tests/testthat/css/solarized_light.css
  15. +2
    -2
      tests/testthat/css/xaringan.css

+ 2
- 3
R/style_xaringan.R Vedi File

@@ -173,9 +173,8 @@ style_xaringan <- function(
text_font_weight <- substr(text_font_weight, 1, regexpr(",", text_font_weight)[1] - 1)
text_font_url <- gf$url
} else {
for (thing in c("family", "url")) {
eval(parse(text = paste0(group, "_font_", thing, " <- quote_elements_w_spaces(gf$", thing, ")")))
}
eval(parse(text = paste0(group, "_font_family <- quote_elements_w_spaces(gf$family)")))
eval(parse(text = paste0(group, "_font_url <- gf$url")))
}
eval(parse(text = paste0(group, "_font_is_google <- 1")))
}

+ 2
- 3
inst/scripts/style_xaringan_body.R Vedi File

@@ -37,9 +37,8 @@ for (var in f_args[grepl("font_google$", f_args)]) {
text_font_weight <- substr(text_font_weight, 1, regexpr(",", text_font_weight)[1] - 1)
text_font_url <- gf$url
} else {
for (thing in c("family", "url")) {
eval(parse(text = paste0(group, "_font_", thing, " <- quote_elements_w_spaces(gf$", thing, ")")))
}
eval(parse(text = paste0(group, "_font_family <- quote_elements_w_spaces(gf$family)")))
eval(parse(text = paste0(group, "_font_url <- gf$url")))
}
eval(parse(text = paste0(group, "_font_is_google <- 1")))
}

+ 2
- 2
tests/testthat/css/duo-header_bg.css Vedi File

@@ -19,8 +19,8 @@
*
* ------------------------------------------------------- */
@import url(https://fonts.googleapis.com/css?family=Noto+Serif&display=swap);
@import url(https://fonts.googleapis.com/css?family=Cabin:600, 600i&display=swap);
@import url(https://fonts.googleapis.com/css?family=Source+Code+Pro:400, 700&display=swap);
@import url(https://fonts.googleapis.com/css?family=Cabin:600,600i&display=swap);
@import url(https://fonts.googleapis.com/css?family=Source+Code+Pro:400,700&display=swap);


:root {

+ 2
- 2
tests/testthat/css/duo.css Vedi File

@@ -19,8 +19,8 @@
*
* ------------------------------------------------------- */
@import url(https://fonts.googleapis.com/css?family=Noto+Serif&display=swap);
@import url(https://fonts.googleapis.com/css?family=Cabin:600, 600i&display=swap);
@import url(https://fonts.googleapis.com/css?family=Source+Code+Pro:400, 700&display=swap);
@import url(https://fonts.googleapis.com/css?family=Cabin:600,600i&display=swap);
@import url(https://fonts.googleapis.com/css?family=Source+Code+Pro:400,700&display=swap);


:root {

+ 2
- 2
tests/testthat/css/duo_accent.css Vedi File

@@ -19,8 +19,8 @@
*
* ------------------------------------------------------- */
@import url(https://fonts.googleapis.com/css?family=Noto+Serif&display=swap);
@import url(https://fonts.googleapis.com/css?family=Cabin:600, 600i&display=swap);
@import url(https://fonts.googleapis.com/css?family=Source+Code+Pro:400, 700&display=swap);
@import url(https://fonts.googleapis.com/css?family=Cabin:600,600i&display=swap);
@import url(https://fonts.googleapis.com/css?family=Source+Code+Pro:400,700&display=swap);


:root {

+ 2
- 2
tests/testthat/css/duo_accent_inverse.css Vedi File

@@ -19,8 +19,8 @@
*
* ------------------------------------------------------- */
@import url(https://fonts.googleapis.com/css?family=Noto+Serif&display=swap);
@import url(https://fonts.googleapis.com/css?family=Cabin:600, 600i&display=swap);
@import url(https://fonts.googleapis.com/css?family=Source+Code+Pro:400, 700&display=swap);
@import url(https://fonts.googleapis.com/css?family=Cabin:600,600i&display=swap);
@import url(https://fonts.googleapis.com/css?family=Source+Code+Pro:400,700&display=swap);


:root {

+ 2
- 2
tests/testthat/css/mono_accent.css Vedi File

@@ -19,8 +19,8 @@
*
* ------------------------------------------------------- */
@import url(https://fonts.googleapis.com/css?family=Noto+Serif&display=swap);
@import url(https://fonts.googleapis.com/css?family=Cabin:600, 600i&display=swap);
@import url(https://fonts.googleapis.com/css?family=Source+Code+Pro:400, 700&display=swap);
@import url(https://fonts.googleapis.com/css?family=Cabin:600,600i&display=swap);
@import url(https://fonts.googleapis.com/css?family=Source+Code+Pro:400,700&display=swap);


:root {

+ 2
- 2
tests/testthat/css/mono_accent_inverse.css Vedi File

@@ -19,8 +19,8 @@
*
* ------------------------------------------------------- */
@import url(https://fonts.googleapis.com/css?family=Noto+Serif&display=swap);
@import url(https://fonts.googleapis.com/css?family=Cabin:600, 600i&display=swap);
@import url(https://fonts.googleapis.com/css?family=Source+Code+Pro:400, 700&display=swap);
@import url(https://fonts.googleapis.com/css?family=Cabin:600,600i&display=swap);
@import url(https://fonts.googleapis.com/css?family=Source+Code+Pro:400,700&display=swap);


:root {

+ 2
- 2
tests/testthat/css/mono_dark.css Vedi File

@@ -19,8 +19,8 @@
*
* ------------------------------------------------------- */
@import url(https://fonts.googleapis.com/css?family=Noto+Serif&display=swap);
@import url(https://fonts.googleapis.com/css?family=Cabin:600, 600i&display=swap);
@import url(https://fonts.googleapis.com/css?family=Source+Code+Pro:400, 700&display=swap);
@import url(https://fonts.googleapis.com/css?family=Cabin:600,600i&display=swap);
@import url(https://fonts.googleapis.com/css?family=Source+Code+Pro:400,700&display=swap);


:root {

+ 2
- 2
tests/testthat/css/mono_light-header_bg.css Vedi File

@@ -19,8 +19,8 @@
*
* ------------------------------------------------------- */
@import url(https://fonts.googleapis.com/css?family=Noto+Serif&display=swap);
@import url(https://fonts.googleapis.com/css?family=Cabin:600, 600i&display=swap);
@import url(https://fonts.googleapis.com/css?family=Source+Code+Pro:400, 700&display=swap);
@import url(https://fonts.googleapis.com/css?family=Cabin:600,600i&display=swap);
@import url(https://fonts.googleapis.com/css?family=Source+Code+Pro:400,700&display=swap);


:root {

+ 2
- 2
tests/testthat/css/mono_light.css Vedi File

@@ -19,8 +19,8 @@
*
* ------------------------------------------------------- */
@import url(https://fonts.googleapis.com/css?family=Noto+Serif&display=swap);
@import url(https://fonts.googleapis.com/css?family=Cabin:600, 600i&display=swap);
@import url(https://fonts.googleapis.com/css?family=Source+Code+Pro:400, 700&display=swap);
@import url(https://fonts.googleapis.com/css?family=Cabin:600,600i&display=swap);
@import url(https://fonts.googleapis.com/css?family=Source+Code+Pro:400,700&display=swap);


:root {

+ 2
- 2
tests/testthat/css/solarized_dark-header_bg.css Vedi File

@@ -19,8 +19,8 @@
*
* ------------------------------------------------------- */
@import url(https://fonts.googleapis.com/css?family=Noto+Serif&display=swap);
@import url(https://fonts.googleapis.com/css?family=Cabin:600, 600i&display=swap);
@import url(https://fonts.googleapis.com/css?family=Source+Code+Pro:400, 700&display=swap);
@import url(https://fonts.googleapis.com/css?family=Cabin:600,600i&display=swap);
@import url(https://fonts.googleapis.com/css?family=Source+Code+Pro:400,700&display=swap);


:root {

+ 2
- 2
tests/testthat/css/solarized_dark.css Vedi File

@@ -19,8 +19,8 @@
*
* ------------------------------------------------------- */
@import url(https://fonts.googleapis.com/css?family=Noto+Serif&display=swap);
@import url(https://fonts.googleapis.com/css?family=Cabin:600, 600i&display=swap);
@import url(https://fonts.googleapis.com/css?family=Source+Code+Pro:400, 700&display=swap);
@import url(https://fonts.googleapis.com/css?family=Cabin:600,600i&display=swap);
@import url(https://fonts.googleapis.com/css?family=Source+Code+Pro:400,700&display=swap);


:root {

+ 2
- 2
tests/testthat/css/solarized_light.css Vedi File

@@ -19,8 +19,8 @@
*
* ------------------------------------------------------- */
@import url(https://fonts.googleapis.com/css?family=Noto+Serif&display=swap);
@import url(https://fonts.googleapis.com/css?family=Cabin:600, 600i&display=swap);
@import url(https://fonts.googleapis.com/css?family=Source+Code+Pro:400, 700&display=swap);
@import url(https://fonts.googleapis.com/css?family=Cabin:600,600i&display=swap);
@import url(https://fonts.googleapis.com/css?family=Source+Code+Pro:400,700&display=swap);


:root {

+ 2
- 2
tests/testthat/css/xaringan.css Vedi File

@@ -19,8 +19,8 @@
*
* ------------------------------------------------------- */
@import url(https://fonts.googleapis.com/css?family=Noto+Serif&display=swap);
@import url(https://fonts.googleapis.com/css?family=Cabin:600, 600i&display=swap);
@import url(https://fonts.googleapis.com/css?family=Source+Code+Pro:400, 700&display=swap);
@import url(https://fonts.googleapis.com/css?family=Cabin:600,600i&display=swap);
@import url(https://fonts.googleapis.com/css?family=Source+Code+Pro:400,700&display=swap);


:root {

Loading…
Annulla
Salva