瀏覽代碼

Add footnote theme parameters

- Also reorder code params
tags/v0.1.1
Garrick Aden-Buie 8 年之前
父節點
當前提交
3bef06b3be
共有 12 個文件被更改,包括 108 次插入44 次删除
  1. +10
    -4
      R/duo.R
  2. +10
    -4
      R/duo_accent.R
  3. +10
    -4
      R/duo_accent_inverse.R
  4. +10
    -4
      R/mono_accent.R
  5. +10
    -4
      R/mono_accent_inverse.R
  6. +10
    -4
      R/mono_dark.R
  7. +10
    -4
      R/mono_light.R
  8. +10
    -4
      R/solarized_dark.R
  9. +10
    -4
      R/solarized_light.R
  10. +5
    -2
      R/theme_settings.R
  11. +10
    -4
      R/write_theme.R
  12. +3
    -2
      inst/resources/template.css

+ 10
- 4
R/duo.R 查看文件

@@ -9,6 +9,7 @@
#' @param code_highlight_color Code Line Highlight, defaults to rgba(255,255,0,0.5)
#' @param code_inline_color Inline Code Color, defaults to `secondary_color`
#' @param code_inline_background_color Inline Code Background Color, defaults to NA
#' @param code_inline_font_size Inline Code Text Font Size, defaults to 1em
#' @param inverse_background_color Inverse Background Color, defaults to `secondary_color`
#' @param inverse_text_color Inverse Text Color, defaults to `primary_color`
#' @param inverse_text_shadow Enables Shadow on text of inverse slides, defaults to `FALSE`
@@ -18,6 +19,9 @@
#' @param title_slide_background_image Title Slide Background Image URL, defaults to NA
#' @param title_slide_background_size Title Slide Background Image Size, defaults to "cover" if background image is set, defaults to NA
#' @param title_slide_background_position Title Slide Background Image Position, defaults to NA
#' @param footnote_color Footnote text color (if \code{NA}, then it will be the same color as \code{text_color}`), defaults to NA
#' @param footnote_font_size Footnote font size, defaults to 90%
#' @param footnote_position_bottom Footnote location from bottom of screen, defaults to 3em
#' @param left_column_subtle_color Left Column Text (not last), defaults to `apply_alpha(secondary_color, 0.6)`
#' @param left_column_selected_color Left Column Current Selection, defaults to `secondary_color`
#' @param blockquote_left_color Blockquote Left Border Color, defaults to `apply_alpha(secondary_color, 0.5)`
@@ -29,8 +33,6 @@
#' @param header_h2_font_size h2 Header Text Font Size, defaults to 45px
#' @param header_h3_font_size h3 Header Text Font Size, defaults to 35px
#' @param text_slide_number_font_size Slide Number Text Font Size, defaults to 0.9em
#' @param code_inline_font_size Inline Code Text Font Size, defaults to 1em
#' @param code_font_size Code Text Font Size, defaults to 0.9em
#' @param text_font_google Use `google_font()` to specify body font, defaults to `NULL`
#' @param text_font_family Body Text Font Family, defaults to 'Droid Serif'
#' @param text_font_weight Body Text Font Weight, defaults to normal
@@ -43,6 +45,7 @@
#' @param header_font_url Header Font URL, defaults to https://fonts.googleapis.com/css?family=Yanone+Kaffeesatz
#' @param code_font_google Use `google_font()` to specify code font, defaults to `NULL`
#' @param code_font_family Code Font Family, defaults to 'Source Code Pro'
#' @param code_font_size Code Text Font Size, defaults to 0.9em
#' @param code_font_url Code Font URL, defaults to https://fonts.googleapis.com/css?family=Source+Code+Pro:400,700
#' @param code_font_family_fallback Code Font Fallback, defaults to 'Lucida Console', Monaco
#' @template extra_css
@@ -62,6 +65,7 @@ duo <- function(
code_highlight_color = "rgba(255,255,0,0.5)",
code_inline_color = secondary_color,
code_inline_background_color = NA,
code_inline_font_size = "1em",
inverse_background_color = secondary_color,
inverse_text_color = primary_color,
inverse_text_shadow = FALSE,
@@ -71,6 +75,9 @@ duo <- function(
title_slide_background_image = NA,
title_slide_background_size = NA,
title_slide_background_position = NA,
footnote_color = NA,
footnote_font_size = "90%",
footnote_position_bottom = "3em",
left_column_subtle_color = apply_alpha(secondary_color, 0.6),
left_column_selected_color = secondary_color,
blockquote_left_color = apply_alpha(secondary_color, 0.5),
@@ -82,8 +89,6 @@ duo <- function(
header_h2_font_size = "45px",
header_h3_font_size = "35px",
text_slide_number_font_size = "0.9em",
code_inline_font_size = "1em",
code_font_size = "0.9em",
text_font_google = NULL,
text_font_family = "'Droid Serif'",
text_font_weight = "normal",
@@ -96,6 +101,7 @@ duo <- function(
header_font_url = "https://fonts.googleapis.com/css?family=Yanone+Kaffeesatz",
code_font_google = NULL,
code_font_family = "'Source Code Pro'",
code_font_size = "0.9em",
code_font_url = "https://fonts.googleapis.com/css?family=Source+Code+Pro:400,700",
code_font_family_fallback = "'Lucida Console', Monaco",
extra_css = NULL,

+ 10
- 4
R/duo_accent.R 查看文件

@@ -11,6 +11,7 @@
#' @param code_highlight_color Code Line Highlight, defaults to rgba(255,255,0,0.5)
#' @param code_inline_color Inline Code Color, defaults to `choose_dark_or_light(secondary_color, primary_color, secondary_color)`
#' @param code_inline_background_color Inline Code Background Color, defaults to NA
#' @param code_inline_font_size Inline Code Text Font Size, defaults to 1em
#' @param inverse_background_color Inverse Background Color, defaults to `secondary_color`
#' @param inverse_text_color Inverse Text Color, defaults to `choose_dark_or_light(secondary_color, black_color, white_color)`
#' @param inverse_text_shadow Enables Shadow on text of inverse slides, defaults to `FALSE`
@@ -20,6 +21,9 @@
#' @param title_slide_background_image Title Slide Background Image URL, defaults to NA
#' @param title_slide_background_size Title Slide Background Image Size, defaults to "cover" if background image is set, defaults to NA
#' @param title_slide_background_position Title Slide Background Image Position, defaults to NA
#' @param footnote_color Footnote text color (if \code{NA}, then it will be the same color as \code{text_color}`), defaults to NA
#' @param footnote_font_size Footnote font size, defaults to 90%
#' @param footnote_position_bottom Footnote location from bottom of screen, defaults to 3em
#' @param left_column_subtle_color Left Column Text (not last), defaults to `apply_alpha(primary_color, 0.6)`
#' @param left_column_selected_color Left Column Current Selection, defaults to `primary_color`
#' @param blockquote_left_color Blockquote Left Border Color, defaults to `apply_alpha(secondary_color, 0.5)`
@@ -31,8 +35,6 @@
#' @param header_h2_font_size h2 Header Text Font Size, defaults to 45px
#' @param header_h3_font_size h3 Header Text Font Size, defaults to 35px
#' @param text_slide_number_font_size Slide Number Text Font Size, defaults to 0.9em
#' @param code_inline_font_size Inline Code Text Font Size, defaults to 1em
#' @param code_font_size Code Text Font Size, defaults to 0.9em
#' @param text_font_google Use `google_font()` to specify body font, defaults to `NULL`
#' @param text_font_family Body Text Font Family, defaults to 'Droid Serif'
#' @param text_font_weight Body Text Font Weight, defaults to normal
@@ -45,6 +47,7 @@
#' @param header_font_url Header Font URL, defaults to https://fonts.googleapis.com/css?family=Yanone+Kaffeesatz
#' @param code_font_google Use `google_font()` to specify code font, defaults to `NULL`
#' @param code_font_family Code Font Family, defaults to 'Source Code Pro'
#' @param code_font_size Code Text Font Size, defaults to 0.9em
#' @param code_font_url Code Font URL, defaults to https://fonts.googleapis.com/css?family=Source+Code+Pro:400,700
#' @param code_font_family_fallback Code Font Fallback, defaults to 'Lucida Console', Monaco
#' @template extra_css
@@ -66,6 +69,7 @@ duo_accent <- function(
code_highlight_color = "rgba(255,255,0,0.5)",
code_inline_color = choose_dark_or_light(secondary_color, primary_color, secondary_color),
code_inline_background_color = NA,
code_inline_font_size = "1em",
inverse_background_color = secondary_color,
inverse_text_color = choose_dark_or_light(secondary_color, black_color, white_color),
inverse_text_shadow = FALSE,
@@ -75,6 +79,9 @@ duo_accent <- function(
title_slide_background_image = NA,
title_slide_background_size = NA,
title_slide_background_position = NA,
footnote_color = NA,
footnote_font_size = "90%",
footnote_position_bottom = "3em",
left_column_subtle_color = apply_alpha(primary_color, 0.6),
left_column_selected_color = primary_color,
blockquote_left_color = apply_alpha(secondary_color, 0.5),
@@ -86,8 +93,6 @@ duo_accent <- function(
header_h2_font_size = "45px",
header_h3_font_size = "35px",
text_slide_number_font_size = "0.9em",
code_inline_font_size = "1em",
code_font_size = "0.9em",
text_font_google = NULL,
text_font_family = "'Droid Serif'",
text_font_weight = "normal",
@@ -100,6 +105,7 @@ duo_accent <- function(
header_font_url = "https://fonts.googleapis.com/css?family=Yanone+Kaffeesatz",
code_font_google = NULL,
code_font_family = "'Source Code Pro'",
code_font_size = "0.9em",
code_font_url = "https://fonts.googleapis.com/css?family=Source+Code+Pro:400,700",
code_font_family_fallback = "'Lucida Console', Monaco",
extra_css = NULL,

+ 10
- 4
R/duo_accent_inverse.R 查看文件

@@ -11,6 +11,7 @@
#' @param code_highlight_color Code Line Highlight, defaults to rgba(255,255,0,0.5)
#' @param code_inline_color Inline Code Color, defaults to `choose_dark_or_light(secondary_color, secondary_color, primary_color)`
#' @param code_inline_background_color Inline Code Background Color, defaults to NA
#' @param code_inline_font_size Inline Code Text Font Size, defaults to 1em
#' @param inverse_background_color Inverse Background Color, defaults to `secondary_color`
#' @param inverse_text_color Inverse Text Color, defaults to `choose_dark_or_light(secondary_color, black_color, white_color)`
#' @param inverse_text_shadow Enables Shadow on text of inverse slides, defaults to `FALSE`
@@ -20,6 +21,9 @@
#' @param title_slide_background_image Title Slide Background Image URL, defaults to NA
#' @param title_slide_background_size Title Slide Background Image Size, defaults to "cover" if background image is set, defaults to NA
#' @param title_slide_background_position Title Slide Background Image Position, defaults to NA
#' @param footnote_color Footnote text color (if \code{NA}, then it will be the same color as \code{text_color}`), defaults to NA
#' @param footnote_font_size Footnote font size, defaults to 90%
#' @param footnote_position_bottom Footnote location from bottom of screen, defaults to 3em
#' @param left_column_subtle_color Left Column Text (not last), defaults to `apply_alpha(primary_color, 0.6)`
#' @param left_column_selected_color Left Column Current Selection, defaults to `primary_color`
#' @param blockquote_left_color Blockquote Left Border Color, defaults to `apply_alpha(secondary_color, 0.5)`
@@ -31,8 +35,6 @@
#' @param header_h2_font_size h2 Header Text Font Size, defaults to 45px
#' @param header_h3_font_size h3 Header Text Font Size, defaults to 35px
#' @param text_slide_number_font_size Slide Number Text Font Size, defaults to 0.9em
#' @param code_inline_font_size Inline Code Text Font Size, defaults to 1em
#' @param code_font_size Code Text Font Size, defaults to 0.9em
#' @param text_font_google Use `google_font()` to specify body font, defaults to `NULL`
#' @param text_font_family Body Text Font Family, defaults to 'Droid Serif'
#' @param text_font_weight Body Text Font Weight, defaults to normal
@@ -45,6 +47,7 @@
#' @param header_font_url Header Font URL, defaults to https://fonts.googleapis.com/css?family=Yanone+Kaffeesatz
#' @param code_font_google Use `google_font()` to specify code font, defaults to `NULL`
#' @param code_font_family Code Font Family, defaults to 'Source Code Pro'
#' @param code_font_size Code Text Font Size, defaults to 0.9em
#' @param code_font_url Code Font URL, defaults to https://fonts.googleapis.com/css?family=Source+Code+Pro:400,700
#' @param code_font_family_fallback Code Font Fallback, defaults to 'Lucida Console', Monaco
#' @template extra_css
@@ -66,6 +69,7 @@ duo_accent_inverse <- function(
code_highlight_color = "rgba(255,255,0,0.5)",
code_inline_color = choose_dark_or_light(secondary_color, secondary_color, primary_color),
code_inline_background_color = NA,
code_inline_font_size = "1em",
inverse_background_color = secondary_color,
inverse_text_color = choose_dark_or_light(secondary_color, black_color, white_color),
inverse_text_shadow = FALSE,
@@ -75,6 +79,9 @@ duo_accent_inverse <- function(
title_slide_background_image = NA,
title_slide_background_size = NA,
title_slide_background_position = NA,
footnote_color = NA,
footnote_font_size = "90%",
footnote_position_bottom = "3em",
left_column_subtle_color = apply_alpha(primary_color, 0.6),
left_column_selected_color = primary_color,
blockquote_left_color = apply_alpha(secondary_color, 0.5),
@@ -86,8 +93,6 @@ duo_accent_inverse <- function(
header_h2_font_size = "45px",
header_h3_font_size = "35px",
text_slide_number_font_size = "0.9em",
code_inline_font_size = "1em",
code_font_size = "0.9em",
text_font_google = NULL,
text_font_family = "'Droid Serif'",
text_font_weight = "normal",
@@ -100,6 +105,7 @@ duo_accent_inverse <- function(
header_font_url = "https://fonts.googleapis.com/css?family=Yanone+Kaffeesatz",
code_font_google = NULL,
code_font_family = "'Source Code Pro'",
code_font_size = "0.9em",
code_font_url = "https://fonts.googleapis.com/css?family=Source+Code+Pro:400,700",
code_font_family_fallback = "'Lucida Console', Monaco",
extra_css = NULL,

+ 10
- 4
R/mono_accent.R 查看文件

@@ -10,6 +10,7 @@
#' @param code_highlight_color Code Line Highlight, defaults to rgba(255,255,0,0.5)
#' @param code_inline_color Inline Code Color, defaults to `base_color`
#' @param code_inline_background_color Inline Code Background Color, defaults to NA
#' @param code_inline_font_size Inline Code Text Font Size, defaults to 1em
#' @param inverse_background_color Inverse Background Color, defaults to `base_color`
#' @param inverse_text_color Inverse Text Color, defaults to `white_color`
#' @param inverse_text_shadow Enables Shadow on text of inverse slides, defaults to `FALSE`
@@ -19,6 +20,9 @@
#' @param title_slide_background_image Title Slide Background Image URL, defaults to NA
#' @param title_slide_background_size Title Slide Background Image Size, defaults to "cover" if background image is set, defaults to NA
#' @param title_slide_background_position Title Slide Background Image Position, defaults to NA
#' @param footnote_color Footnote text color (if \code{NA}, then it will be the same color as \code{text_color}`), defaults to NA
#' @param footnote_font_size Footnote font size, defaults to 90%
#' @param footnote_position_bottom Footnote location from bottom of screen, defaults to 3em
#' @param left_column_subtle_color Left Column Text (not last), defaults to `apply_alpha(base_color, 0.6)`
#' @param left_column_selected_color Left Column Current Selection, defaults to `base_color`
#' @param blockquote_left_color Blockquote Left Border Color, defaults to `apply_alpha(base_color, 0.5)`
@@ -30,8 +34,6 @@
#' @param header_h2_font_size h2 Header Text Font Size, defaults to 45px
#' @param header_h3_font_size h3 Header Text Font Size, defaults to 35px
#' @param text_slide_number_font_size Slide Number Text Font Size, defaults to 0.9em
#' @param code_inline_font_size Inline Code Text Font Size, defaults to 1em
#' @param code_font_size Code Text Font Size, defaults to 0.9em
#' @param text_font_google Use `google_font()` to specify body font, defaults to `NULL`
#' @param text_font_family Body Text Font Family, defaults to 'Droid Serif'
#' @param text_font_weight Body Text Font Weight, defaults to normal
@@ -44,6 +46,7 @@
#' @param header_font_url Header Font URL, defaults to https://fonts.googleapis.com/css?family=Yanone+Kaffeesatz
#' @param code_font_google Use `google_font()` to specify code font, defaults to `NULL`
#' @param code_font_family Code Font Family, defaults to 'Source Code Pro'
#' @param code_font_size Code Text Font Size, defaults to 0.9em
#' @param code_font_url Code Font URL, defaults to https://fonts.googleapis.com/css?family=Source+Code+Pro:400,700
#' @param code_font_family_fallback Code Font Fallback, defaults to 'Lucida Console', Monaco
#' @template extra_css
@@ -64,6 +67,7 @@ mono_accent <- function(
code_highlight_color = "rgba(255,255,0,0.5)",
code_inline_color = base_color,
code_inline_background_color = NA,
code_inline_font_size = "1em",
inverse_background_color = base_color,
inverse_text_color = white_color,
inverse_text_shadow = FALSE,
@@ -73,6 +77,9 @@ mono_accent <- function(
title_slide_background_image = NA,
title_slide_background_size = NA,
title_slide_background_position = NA,
footnote_color = NA,
footnote_font_size = "90%",
footnote_position_bottom = "3em",
left_column_subtle_color = apply_alpha(base_color, 0.6),
left_column_selected_color = base_color,
blockquote_left_color = apply_alpha(base_color, 0.5),
@@ -84,8 +91,6 @@ mono_accent <- function(
header_h2_font_size = "45px",
header_h3_font_size = "35px",
text_slide_number_font_size = "0.9em",
code_inline_font_size = "1em",
code_font_size = "0.9em",
text_font_google = NULL,
text_font_family = "'Droid Serif'",
text_font_weight = "normal",
@@ -98,6 +103,7 @@ mono_accent <- function(
header_font_url = "https://fonts.googleapis.com/css?family=Yanone+Kaffeesatz",
code_font_google = NULL,
code_font_family = "'Source Code Pro'",
code_font_size = "0.9em",
code_font_url = "https://fonts.googleapis.com/css?family=Source+Code+Pro:400,700",
code_font_family_fallback = "'Lucida Console', Monaco",
extra_css = NULL,

+ 10
- 4
R/mono_accent_inverse.R 查看文件

@@ -10,6 +10,7 @@
#' @param code_highlight_color Code Line Highlight, defaults to rgba(255,255,0,0.5)
#' @param code_inline_color Inline Code Color, defaults to `base_color`
#' @param code_inline_background_color Inline Code Background Color, defaults to NA
#' @param code_inline_font_size Inline Code Text Font Size, defaults to 1em
#' @param inverse_background_color Inverse Background Color, defaults to `base_color`
#' @param inverse_text_color Inverse Text Color, defaults to `black_color`
#' @param inverse_text_shadow Enables Shadow on text of inverse slides, defaults to `FALSE`
@@ -19,6 +20,9 @@
#' @param title_slide_background_image Title Slide Background Image URL, defaults to NA
#' @param title_slide_background_size Title Slide Background Image Size, defaults to "cover" if background image is set, defaults to NA
#' @param title_slide_background_position Title Slide Background Image Position, defaults to NA
#' @param footnote_color Footnote text color (if \code{NA}, then it will be the same color as \code{text_color}`), defaults to NA
#' @param footnote_font_size Footnote font size, defaults to 90%
#' @param footnote_position_bottom Footnote location from bottom of screen, defaults to 3em
#' @param left_column_subtle_color Left Column Text (not last), defaults to `apply_alpha(base_color, 0.6)`
#' @param left_column_selected_color Left Column Current Selection, defaults to `base_color`
#' @param blockquote_left_color Blockquote Left Border Color, defaults to `apply_alpha(base_color, 0.5)`
@@ -30,8 +34,6 @@
#' @param header_h2_font_size h2 Header Text Font Size, defaults to 45px
#' @param header_h3_font_size h3 Header Text Font Size, defaults to 35px
#' @param text_slide_number_font_size Slide Number Text Font Size, defaults to 0.9em
#' @param code_inline_font_size Inline Code Text Font Size, defaults to 1em
#' @param code_font_size Code Text Font Size, defaults to 0.9em
#' @param text_font_google Use `google_font()` to specify body font, defaults to `NULL`
#' @param text_font_family Body Text Font Family, defaults to 'Droid Serif'
#' @param text_font_weight Body Text Font Weight, defaults to normal
@@ -44,6 +46,7 @@
#' @param header_font_url Header Font URL, defaults to https://fonts.googleapis.com/css?family=Yanone+Kaffeesatz
#' @param code_font_google Use `google_font()` to specify code font, defaults to `NULL`
#' @param code_font_family Code Font Family, defaults to 'Source Code Pro'
#' @param code_font_size Code Text Font Size, defaults to 0.9em
#' @param code_font_url Code Font URL, defaults to https://fonts.googleapis.com/css?family=Source+Code+Pro:400,700
#' @param code_font_family_fallback Code Font Fallback, defaults to 'Lucida Console', Monaco
#' @template extra_css
@@ -64,6 +67,7 @@ mono_accent_inverse <- function(
code_highlight_color = "rgba(255,255,0,0.5)",
code_inline_color = base_color,
code_inline_background_color = NA,
code_inline_font_size = "1em",
inverse_background_color = base_color,
inverse_text_color = black_color,
inverse_text_shadow = FALSE,
@@ -73,6 +77,9 @@ mono_accent_inverse <- function(
title_slide_background_image = NA,
title_slide_background_size = NA,
title_slide_background_position = NA,
footnote_color = NA,
footnote_font_size = "90%",
footnote_position_bottom = "3em",
left_column_subtle_color = apply_alpha(base_color, 0.6),
left_column_selected_color = base_color,
blockquote_left_color = apply_alpha(base_color, 0.5),
@@ -84,8 +91,6 @@ mono_accent_inverse <- function(
header_h2_font_size = "45px",
header_h3_font_size = "35px",
text_slide_number_font_size = "0.9em",
code_inline_font_size = "1em",
code_font_size = "0.9em",
text_font_google = NULL,
text_font_family = "'Droid Serif'",
text_font_weight = "normal",
@@ -98,6 +103,7 @@ mono_accent_inverse <- function(
header_font_url = "https://fonts.googleapis.com/css?family=Yanone+Kaffeesatz",
code_font_google = NULL,
code_font_family = "'Source Code Pro'",
code_font_size = "0.9em",
code_font_url = "https://fonts.googleapis.com/css?family=Source+Code+Pro:400,700",
code_font_family_fallback = "'Lucida Console', Monaco",
extra_css = NULL,

+ 10
- 4
R/mono_dark.R 查看文件

@@ -10,6 +10,7 @@
#' @param code_highlight_color Code Line Highlight, defaults to rgba(255,255,0,0.5)
#' @param code_inline_color Inline Code Color, defaults to `base_color`
#' @param code_inline_background_color Inline Code Background Color, defaults to NA
#' @param code_inline_font_size Inline Code Text Font Size, defaults to 1em
#' @param inverse_background_color Inverse Background Color, defaults to `base_color`
#' @param inverse_text_color Inverse Text Color, defaults to `black_color`
#' @param inverse_text_shadow Enables Shadow on text of inverse slides, defaults to `FALSE`
@@ -19,6 +20,9 @@
#' @param title_slide_background_image Title Slide Background Image URL, defaults to NA
#' @param title_slide_background_size Title Slide Background Image Size, defaults to "cover" if background image is set, defaults to NA
#' @param title_slide_background_position Title Slide Background Image Position, defaults to NA
#' @param footnote_color Footnote text color (if \code{NA}, then it will be the same color as \code{text_color}`), defaults to NA
#' @param footnote_font_size Footnote font size, defaults to 90%
#' @param footnote_position_bottom Footnote location from bottom of screen, defaults to 3em
#' @param left_column_subtle_color Left Column Text (not last), defaults to `apply_alpha(base_color, 0.6)`
#' @param left_column_selected_color Left Column Current Selection, defaults to `base_color`
#' @param blockquote_left_color Blockquote Left Border Color, defaults to `apply_alpha(base_color, 0.5)`
@@ -30,8 +34,6 @@
#' @param header_h2_font_size h2 Header Text Font Size, defaults to 45px
#' @param header_h3_font_size h3 Header Text Font Size, defaults to 35px
#' @param text_slide_number_font_size Slide Number Text Font Size, defaults to 0.9em
#' @param code_inline_font_size Inline Code Text Font Size, defaults to 1em
#' @param code_font_size Code Text Font Size, defaults to 0.9em
#' @param text_font_google Use `google_font()` to specify body font, defaults to `NULL`
#' @param text_font_family Body Text Font Family, defaults to 'Droid Serif'
#' @param text_font_weight Body Text Font Weight, defaults to normal
@@ -44,6 +46,7 @@
#' @param header_font_url Header Font URL, defaults to https://fonts.googleapis.com/css?family=Yanone+Kaffeesatz
#' @param code_font_google Use `google_font()` to specify code font, defaults to `NULL`
#' @param code_font_family Code Font Family, defaults to 'Source Code Pro'
#' @param code_font_size Code Text Font Size, defaults to 0.9em
#' @param code_font_url Code Font URL, defaults to https://fonts.googleapis.com/css?family=Source+Code+Pro:400,700
#' @param code_font_family_fallback Code Font Fallback, defaults to 'Lucida Console', Monaco
#' @template extra_css
@@ -64,6 +67,7 @@ mono_dark <- function(
code_highlight_color = "rgba(255,255,0,0.5)",
code_inline_color = base_color,
code_inline_background_color = NA,
code_inline_font_size = "1em",
inverse_background_color = base_color,
inverse_text_color = black_color,
inverse_text_shadow = FALSE,
@@ -73,6 +77,9 @@ mono_dark <- function(
title_slide_background_image = NA,
title_slide_background_size = NA,
title_slide_background_position = NA,
footnote_color = NA,
footnote_font_size = "90%",
footnote_position_bottom = "3em",
left_column_subtle_color = apply_alpha(base_color, 0.6),
left_column_selected_color = base_color,
blockquote_left_color = apply_alpha(base_color, 0.5),
@@ -84,8 +91,6 @@ mono_dark <- function(
header_h2_font_size = "45px",
header_h3_font_size = "35px",
text_slide_number_font_size = "0.9em",
code_inline_font_size = "1em",
code_font_size = "0.9em",
text_font_google = NULL,
text_font_family = "'Droid Serif'",
text_font_weight = "normal",
@@ -98,6 +103,7 @@ mono_dark <- function(
header_font_url = "https://fonts.googleapis.com/css?family=Yanone+Kaffeesatz",
code_font_google = NULL,
code_font_family = "'Source Code Pro'",
code_font_size = "0.9em",
code_font_url = "https://fonts.googleapis.com/css?family=Source+Code+Pro:400,700",
code_font_family_fallback = "'Lucida Console', Monaco",
extra_css = NULL,

+ 10
- 4
R/mono_light.R 查看文件

@@ -10,6 +10,7 @@
#' @param code_highlight_color Code Line Highlight, defaults to rgba(255,255,0,0.5)
#' @param code_inline_color Inline Code Color, defaults to `base_color`
#' @param code_inline_background_color Inline Code Background Color, defaults to NA
#' @param code_inline_font_size Inline Code Text Font Size, defaults to 1em
#' @param inverse_background_color Inverse Background Color, defaults to `base_color`
#' @param inverse_text_color Inverse Text Color, defaults to `white_color`
#' @param inverse_text_shadow Enables Shadow on text of inverse slides, defaults to `FALSE`
@@ -19,6 +20,9 @@
#' @param title_slide_background_image Title Slide Background Image URL, defaults to NA
#' @param title_slide_background_size Title Slide Background Image Size, defaults to "cover" if background image is set, defaults to NA
#' @param title_slide_background_position Title Slide Background Image Position, defaults to NA
#' @param footnote_color Footnote text color (if \code{NA}, then it will be the same color as \code{text_color}`), defaults to NA
#' @param footnote_font_size Footnote font size, defaults to 90%
#' @param footnote_position_bottom Footnote location from bottom of screen, defaults to 3em
#' @param left_column_subtle_color Left Column Text (not last), defaults to `apply_alpha(base_color, 0.6)`
#' @param left_column_selected_color Left Column Current Selection, defaults to `base_color`
#' @param blockquote_left_color Blockquote Left Border Color, defaults to `apply_alpha(base_color, 0.5)`
@@ -30,8 +34,6 @@
#' @param header_h2_font_size h2 Header Text Font Size, defaults to 45px
#' @param header_h3_font_size h3 Header Text Font Size, defaults to 35px
#' @param text_slide_number_font_size Slide Number Text Font Size, defaults to 0.9em
#' @param code_inline_font_size Inline Code Text Font Size, defaults to 1em
#' @param code_font_size Code Text Font Size, defaults to 0.9em
#' @param text_font_google Use `google_font()` to specify body font, defaults to `NULL`
#' @param text_font_family Body Text Font Family, defaults to 'Droid Serif'
#' @param text_font_weight Body Text Font Weight, defaults to normal
@@ -44,6 +46,7 @@
#' @param header_font_url Header Font URL, defaults to https://fonts.googleapis.com/css?family=Yanone+Kaffeesatz
#' @param code_font_google Use `google_font()` to specify code font, defaults to `NULL`
#' @param code_font_family Code Font Family, defaults to 'Source Code Pro'
#' @param code_font_size Code Text Font Size, defaults to 0.9em
#' @param code_font_url Code Font URL, defaults to https://fonts.googleapis.com/css?family=Source+Code+Pro:400,700
#' @param code_font_family_fallback Code Font Fallback, defaults to 'Lucida Console', Monaco
#' @template extra_css
@@ -64,6 +67,7 @@ mono_light <- function(
code_highlight_color = "rgba(255,255,0,0.5)",
code_inline_color = base_color,
code_inline_background_color = NA,
code_inline_font_size = "1em",
inverse_background_color = base_color,
inverse_text_color = white_color,
inverse_text_shadow = FALSE,
@@ -73,6 +77,9 @@ mono_light <- function(
title_slide_background_image = NA,
title_slide_background_size = NA,
title_slide_background_position = NA,
footnote_color = NA,
footnote_font_size = "90%",
footnote_position_bottom = "3em",
left_column_subtle_color = apply_alpha(base_color, 0.6),
left_column_selected_color = base_color,
blockquote_left_color = apply_alpha(base_color, 0.5),
@@ -84,8 +91,6 @@ mono_light <- function(
header_h2_font_size = "45px",
header_h3_font_size = "35px",
text_slide_number_font_size = "0.9em",
code_inline_font_size = "1em",
code_font_size = "0.9em",
text_font_google = NULL,
text_font_family = "'Droid Serif'",
text_font_weight = "normal",
@@ -98,6 +103,7 @@ mono_light <- function(
header_font_url = "https://fonts.googleapis.com/css?family=Yanone+Kaffeesatz",
code_font_google = NULL,
code_font_family = "'Source Code Pro'",
code_font_size = "0.9em",
code_font_url = "https://fonts.googleapis.com/css?family=Source+Code+Pro:400,700",
code_font_family_fallback = "'Lucida Console', Monaco",
extra_css = NULL,

+ 10
- 4
R/solarized_dark.R 查看文件

@@ -7,6 +7,7 @@
#' @param code_highlight_color Code Line Highlight, defaults to #268bd240
#' @param code_inline_color Inline Code Color, defaults to #6c71c4
#' @param code_inline_background_color Inline Code Background Color, defaults to NA
#' @param code_inline_font_size Inline Code Text Font Size, defaults to 1em
#' @param inverse_background_color Inverse Background Color, defaults to #fdf6e3
#' @param inverse_text_color Inverse Text Color, defaults to #002b36
#' @param inverse_text_shadow Enables Shadow on text of inverse slides, defaults to `FALSE`
@@ -16,6 +17,9 @@
#' @param title_slide_background_image Title Slide Background Image URL, defaults to NA
#' @param title_slide_background_size Title Slide Background Image Size, defaults to "cover" if background image is set, defaults to NA
#' @param title_slide_background_position Title Slide Background Image Position, defaults to NA
#' @param footnote_color Footnote text color (if \code{NA}, then it will be the same color as \code{text_color}`), defaults to NA
#' @param footnote_font_size Footnote font size, defaults to 90%
#' @param footnote_position_bottom Footnote location from bottom of screen, defaults to 3em
#' @param left_column_subtle_color Left Column Text (not last), defaults to #586e75
#' @param left_column_selected_color Left Column Current Selection, defaults to #93a1a1
#' @param blockquote_left_color Blockquote Left Border Color, defaults to #cb4b16
@@ -27,8 +31,6 @@
#' @param header_h2_font_size h2 Header Text Font Size, defaults to 45px
#' @param header_h3_font_size h3 Header Text Font Size, defaults to 35px
#' @param text_slide_number_font_size Slide Number Text Font Size, defaults to 0.9em
#' @param code_inline_font_size Inline Code Text Font Size, defaults to 1em
#' @param code_font_size Code Text Font Size, defaults to 0.9em
#' @param text_font_google Use `google_font()` to specify body font, defaults to `NULL`
#' @param text_font_family Body Text Font Family, defaults to 'Droid Serif'
#' @param text_font_weight Body Text Font Weight, defaults to normal
@@ -41,6 +43,7 @@
#' @param header_font_url Header Font URL, defaults to https://fonts.googleapis.com/css?family=Yanone+Kaffeesatz
#' @param code_font_google Use `google_font()` to specify code font, defaults to `NULL`
#' @param code_font_family Code Font Family, defaults to 'Source Code Pro'
#' @param code_font_size Code Text Font Size, defaults to 0.9em
#' @param code_font_url Code Font URL, defaults to https://fonts.googleapis.com/css?family=Source+Code+Pro:400,700
#' @param code_font_family_fallback Code Font Fallback, defaults to 'Lucida Console', Monaco
#' @template extra_css
@@ -58,6 +61,7 @@ solarized_dark <- function(
code_highlight_color = "#268bd240",
code_inline_color = "#6c71c4",
code_inline_background_color = NA,
code_inline_font_size = "1em",
inverse_background_color = "#fdf6e3",
inverse_text_color = "#002b36",
inverse_text_shadow = FALSE,
@@ -67,6 +71,9 @@ solarized_dark <- function(
title_slide_background_image = NA,
title_slide_background_size = NA,
title_slide_background_position = NA,
footnote_color = NA,
footnote_font_size = "90%",
footnote_position_bottom = "3em",
left_column_subtle_color = "#586e75",
left_column_selected_color = "#93a1a1",
blockquote_left_color = "#cb4b16",
@@ -78,8 +85,6 @@ solarized_dark <- function(
header_h2_font_size = "45px",
header_h3_font_size = "35px",
text_slide_number_font_size = "0.9em",
code_inline_font_size = "1em",
code_font_size = "0.9em",
text_font_google = NULL,
text_font_family = "'Droid Serif'",
text_font_weight = "normal",
@@ -92,6 +97,7 @@ solarized_dark <- function(
header_font_url = "https://fonts.googleapis.com/css?family=Yanone+Kaffeesatz",
code_font_google = NULL,
code_font_family = "'Source Code Pro'",
code_font_size = "0.9em",
code_font_url = "https://fonts.googleapis.com/css?family=Source+Code+Pro:400,700",
code_font_family_fallback = "'Lucida Console', Monaco",
extra_css = NULL,

+ 10
- 4
R/solarized_light.R 查看文件

@@ -7,6 +7,7 @@
#' @param code_highlight_color Code Line Highlight, defaults to #268bd240
#' @param code_inline_color Inline Code Color, defaults to #6c71c4
#' @param code_inline_background_color Inline Code Background Color, defaults to NA
#' @param code_inline_font_size Inline Code Text Font Size, defaults to 1em
#' @param inverse_background_color Inverse Background Color, defaults to #002b36
#' @param inverse_text_color Inverse Text Color, defaults to #fdf6e3
#' @param inverse_text_shadow Enables Shadow on text of inverse slides, defaults to `FALSE`
@@ -16,6 +17,9 @@
#' @param title_slide_background_image Title Slide Background Image URL, defaults to NA
#' @param title_slide_background_size Title Slide Background Image Size, defaults to "cover" if background image is set, defaults to NA
#' @param title_slide_background_position Title Slide Background Image Position, defaults to NA
#' @param footnote_color Footnote text color (if \code{NA}, then it will be the same color as \code{text_color}`), defaults to NA
#' @param footnote_font_size Footnote font size, defaults to 90%
#' @param footnote_position_bottom Footnote location from bottom of screen, defaults to 3em
#' @param left_column_subtle_color Left Column Text (not last), defaults to #93a1a1
#' @param left_column_selected_color Left Column Current Selection, defaults to #586e75
#' @param blockquote_left_color Blockquote Left Border Color, defaults to #cb4b16
@@ -27,8 +31,6 @@
#' @param header_h2_font_size h2 Header Text Font Size, defaults to 45px
#' @param header_h3_font_size h3 Header Text Font Size, defaults to 35px
#' @param text_slide_number_font_size Slide Number Text Font Size, defaults to 0.9em
#' @param code_inline_font_size Inline Code Text Font Size, defaults to 1em
#' @param code_font_size Code Text Font Size, defaults to 0.9em
#' @param text_font_google Use `google_font()` to specify body font, defaults to `NULL`
#' @param text_font_family Body Text Font Family, defaults to 'Droid Serif'
#' @param text_font_weight Body Text Font Weight, defaults to normal
@@ -41,6 +43,7 @@
#' @param header_font_url Header Font URL, defaults to https://fonts.googleapis.com/css?family=Yanone+Kaffeesatz
#' @param code_font_google Use `google_font()` to specify code font, defaults to `NULL`
#' @param code_font_family Code Font Family, defaults to 'Source Code Pro'
#' @param code_font_size Code Text Font Size, defaults to 0.9em
#' @param code_font_url Code Font URL, defaults to https://fonts.googleapis.com/css?family=Source+Code+Pro:400,700
#' @param code_font_family_fallback Code Font Fallback, defaults to 'Lucida Console', Monaco
#' @template extra_css
@@ -58,6 +61,7 @@ solarized_light <- function(
code_highlight_color = "#268bd240",
code_inline_color = "#6c71c4",
code_inline_background_color = NA,
code_inline_font_size = "1em",
inverse_background_color = "#002b36",
inverse_text_color = "#fdf6e3",
inverse_text_shadow = FALSE,
@@ -67,6 +71,9 @@ solarized_light <- function(
title_slide_background_image = NA,
title_slide_background_size = NA,
title_slide_background_position = NA,
footnote_color = NA,
footnote_font_size = "90%",
footnote_position_bottom = "3em",
left_column_subtle_color = "#93a1a1",
left_column_selected_color = "#586e75",
blockquote_left_color = "#cb4b16",
@@ -78,8 +85,6 @@ solarized_light <- function(
header_h2_font_size = "45px",
header_h3_font_size = "35px",
text_slide_number_font_size = "0.9em",
code_inline_font_size = "1em",
code_font_size = "0.9em",
text_font_google = NULL,
text_font_family = "'Droid Serif'",
text_font_weight = "normal",
@@ -92,6 +97,7 @@ solarized_light <- function(
header_font_url = "https://fonts.googleapis.com/css?family=Yanone+Kaffeesatz",
code_font_google = NULL,
code_font_family = "'Source Code Pro'",
code_font_size = "0.9em",
code_font_url = "https://fonts.googleapis.com/css?family=Source+Code+Pro:400,700",
code_font_family_fallback = "'Lucida Console', Monaco",
extra_css = NULL,

+ 5
- 2
R/theme_settings.R 查看文件

@@ -9,6 +9,7 @@ template_variables <- tibble::tribble(
, "code_highlight_color", "rgba(255,255,0,0.5)", ".remark-code-line-highlighted", "Code Line Highlight"
, "code_inline_color", "#000", ".remark-inline-code", "Inline Code Color"
, "code_inline_background_color", NA_character_, ".remark-inline-code", "Inline Code Background Color"
, "code_inline_font_size", "1em", ".remark-inline-code", "Inline Code Text Font Size"
, "inverse_background_color", "#272822", ".inverse", "Inverse Background Color"
, "inverse_text_color", "#d6d6d6", ".inverse", "Inverse Text Color"
, "inverse_text_shadow", "{FALSE}", ".inverse", "Enables Shadow on text of inverse slides"
@@ -18,6 +19,9 @@ template_variables <- tibble::tribble(
, "title_slide_background_image", NA_character_, ".title-slide", "Title Slide Background Image URL"
, "title_slide_background_size", NA_character_, ".title-slide", "Title Slide Background Image Size, defaults to \"cover\" if background image is set"
, "title_slide_background_position", NA_character_, ".title-slide", "Title Slide Background Image Position"
, "footnote_color", NA_character_, ".footnote", "Footnote text color (if \\code{NA}, then it will be the same color as \\code{text_color}`)"
, "footnote_font_size", "90%", ".footnote", "Footnote font size"
, "footnote_position_bottom", "3em", ".footnote", "Footnote location from bottom of screen"
, "left_column_subtle_color", "#777", ".left-column", "Left Column Text (not last)"
, "left_column_selected_color", "#000", ".left-column h2:last-of-type, .left-column h3:last-child", "Left Column Current Selection"
, "blockquote_left_color", "lightgray", "blockquote", "Blockquote Left Border Color"
@@ -29,8 +33,6 @@ template_variables <- tibble::tribble(
, "header_h2_font_size", "45px", ".remark-slide-content h2", "h2 Header Text Font Size"
, "header_h3_font_size", "35px", ".remark-slide-content h3", "h3 Header Text Font Size"
, "text_slide_number_font_size", "0.9em", ".remark-slide-number", "Slide Number Text Font Size"
, "code_inline_font_size", "1em", ".remark-inline-code", "Inline Code Text Font Size"
, "code_font_size", "0.9em", ".remark-inline", "Code Text Font Size"
, "text_font_google", NULL, "body", "Use `google_font()` to specify body font"
, "text_font_family", "'Droid Serif'", "body", "Body Text Font Family"
, "text_font_weight", "normal", "body", "Body Text Font Weight"
@@ -43,6 +45,7 @@ template_variables <- tibble::tribble(
, "header_font_url", "https://fonts.googleapis.com/css?family=Yanone+Kaffeesatz", "@import url", "Header Font URL"
, "code_font_google", NULL, "body", "Use `google_font()` to specify code font"
, "code_font_family", "'Source Code Pro'", ".remark-code, .remark-inline-code", "Code Font Family"
, "code_font_size", "0.9em", ".remark-inline", "Code Text Font Size"
, "code_font_url", "https://fonts.googleapis.com/css?family=Source+Code+Pro:400,700", "@import url", "Code Font URL"
, "code_font_family_fallback", "'Lucida Console', Monaco", ".remark-code, .remark-inline-code", "Code Font Fallback"
)

+ 10
- 4
R/write_theme.R 查看文件

@@ -7,6 +7,7 @@
#' @param code_highlight_color Code Line Highlight, defaults to rgba(255,255,0,0.5)
#' @param code_inline_color Inline Code Color, defaults to #000
#' @param code_inline_background_color Inline Code Background Color, defaults to NA
#' @param code_inline_font_size Inline Code Text Font Size, defaults to 1em
#' @param inverse_background_color Inverse Background Color, defaults to #272822
#' @param inverse_text_color Inverse Text Color, defaults to #d6d6d6
#' @param inverse_text_shadow Enables Shadow on text of inverse slides, defaults to `FALSE`
@@ -16,6 +17,9 @@
#' @param title_slide_background_image Title Slide Background Image URL, defaults to NA
#' @param title_slide_background_size Title Slide Background Image Size, defaults to "cover" if background image is set, defaults to NA
#' @param title_slide_background_position Title Slide Background Image Position, defaults to NA
#' @param footnote_color Footnote text color (if \code{NA}, then it will be the same color as \code{text_color}`), defaults to NA
#' @param footnote_font_size Footnote font size, defaults to 90%
#' @param footnote_position_bottom Footnote location from bottom of screen, defaults to 3em
#' @param left_column_subtle_color Left Column Text (not last), defaults to #777
#' @param left_column_selected_color Left Column Current Selection, defaults to #000
#' @param blockquote_left_color Blockquote Left Border Color, defaults to lightgray
@@ -27,8 +31,6 @@
#' @param header_h2_font_size h2 Header Text Font Size, defaults to 45px
#' @param header_h3_font_size h3 Header Text Font Size, defaults to 35px
#' @param text_slide_number_font_size Slide Number Text Font Size, defaults to 0.9em
#' @param code_inline_font_size Inline Code Text Font Size, defaults to 1em
#' @param code_font_size Code Text Font Size, defaults to 0.9em
#' @param text_font_google Use `google_font()` to specify body font, defaults to `NULL`
#' @param text_font_family Body Text Font Family, defaults to 'Droid Serif'
#' @param text_font_weight Body Text Font Weight, defaults to normal
@@ -41,6 +43,7 @@
#' @param header_font_url Header Font URL, defaults to https://fonts.googleapis.com/css?family=Yanone+Kaffeesatz
#' @param code_font_google Use `google_font()` to specify code font, defaults to `NULL`
#' @param code_font_family Code Font Family, defaults to 'Source Code Pro'
#' @param code_font_size Code Text Font Size, defaults to 0.9em
#' @param code_font_url Code Font URL, defaults to https://fonts.googleapis.com/css?family=Source+Code+Pro:400,700
#' @param code_font_family_fallback Code Font Fallback, defaults to 'Lucida Console', Monaco
#' @template extra_css
@@ -57,6 +60,7 @@ write_xaringan_theme <- function(
code_highlight_color = "rgba(255,255,0,0.5)",
code_inline_color = "#000",
code_inline_background_color = NA,
code_inline_font_size = "1em",
inverse_background_color = "#272822",
inverse_text_color = "#d6d6d6",
inverse_text_shadow = FALSE,
@@ -66,6 +70,9 @@ write_xaringan_theme <- function(
title_slide_background_image = NA,
title_slide_background_size = NA,
title_slide_background_position = NA,
footnote_color = NA,
footnote_font_size = "90%",
footnote_position_bottom = "3em",
left_column_subtle_color = "#777",
left_column_selected_color = "#000",
blockquote_left_color = "lightgray",
@@ -77,8 +84,6 @@ write_xaringan_theme <- function(
header_h2_font_size = "45px",
header_h3_font_size = "35px",
text_slide_number_font_size = "0.9em",
code_inline_font_size = "1em",
code_font_size = "0.9em",
text_font_google = NULL,
text_font_family = "'Droid Serif'",
text_font_weight = "normal",
@@ -91,6 +96,7 @@ write_xaringan_theme <- function(
header_font_url = "https://fonts.googleapis.com/css?family=Yanone+Kaffeesatz",
code_font_google = NULL,
code_font_family = "'Source Code Pro'",
code_font_size = "0.9em",
code_font_url = "https://fonts.googleapis.com/css?family=Source+Code+Pro:400,700",
code_font_family_fallback = "'Lucida Console', Monaco",
extra_css = NULL,

+ 3
- 2
inst/resources/template.css 查看文件

@@ -49,10 +49,11 @@ a, a > code {
text-decoration: none;
}
.footnote {
{{ifelse(!is.na(footnote_color), paste0("color: ", footnote_color, ";"), ""}}
position: absolute;
bottom: 3em;
bottom: {{footnote_position_bottom}};
padding-right: 4em;
font-size: 90%;
font-size: {{footnote_font_size}};
}
.remark-code-line-highlighted {
background-color: {{code_highlight_color}};

Loading…
取消
儲存