Skip to content

Commit

Permalink
Merge branch 'l2d' into milanmlft/single-episode-pdfs
Browse files Browse the repository at this point in the history
  • Loading branch information
milanmlft authored Jun 3, 2024
2 parents d62a4d2 + b98f859 commit bb3f33b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions inst/rmarkdown/lua/lesson.lua
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ function overview_card()
local objectives_div = pandoc.Div({}, {class='inner bordered'});
local qbody = pandoc.Div({}, {class="card-body"})
local obody = pandoc.Div({}, {class="card-body"})
local qcol = pandoc.Div({}, {class="col-md-4"})
local ocol = pandoc.Div({}, {class="col-md-8"})
local qcol = pandoc.Div({}, {class="col-md-5"})
local ocol = pandoc.Div({}, {class="col-md-7"})
local row = pandoc.Div({}, {class="row g-0"})
local overview = pandoc.Div({}, {class="overview card"})
-- create headers. Note because of --section-divs, we have to insert raw
Expand Down
6 changes: 3 additions & 3 deletions tests/testthat/test-render_html.R
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,8 @@ test_that("render_html applies the internal lua filter", {

# Metadata blocks are parsed
expect_match(res, "div class=\"overview card\"", fixed = TRUE)
expect_match(res, "div class=\"col-md-4\"", fixed = TRUE)
expect_match(res, "div class=\"col-md-8\"", fixed = TRUE)
expect_match(res, "div class=\"col-md-5\"", fixed = TRUE)
expect_match(res, "div class=\"col-md-7\"", fixed = TRUE)
expect_match(res, "div class=\"card-body\"", fixed = TRUE)
expect_match(res, "Questions", fixed = TRUE)
expect_match(res, "Objectives", fixed = TRUE)
Expand Down Expand Up @@ -149,7 +149,7 @@ test_that("render_html applies the internal lua filter", {
ver <- as.character(rmarkdown::pandoc_version())
non_utf8_windows <- tolower(Sys.info()[["sysname"]]) == "windows" &&
getRversion() < package_version("4.2.0")
skip_if(non_utf8_windows,
skip_if(non_utf8_windows,
message = "This version of Windows cannot handle UTF-8 strings")
expect_snapshot(cat(res), transform = formation, variant = ver)
})
Expand Down

0 comments on commit bb3f33b

Please sign in to comment.