Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refresh repository #85

Merged
merged 2 commits into from
Apr 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions R/oxford_theme_ggplot2.R
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#' `base_family`.
#' @param strip_text_face Font face ("plain", "italic", "bold", "bold.italic")
#' for facet label. Default is "plain".
#' @param strip_text_size Facet label text size in pts. Default is 10.
#' @param strip_text_size Facet label text size in pts. Default is 12.
#' @param caption_family Font family to use for the caption text. Default is
#' `base_family`.
#' @param caption_face Font face ("plain", "italic", "bold", "bold.italic") for
Expand Down Expand Up @@ -89,7 +89,7 @@ theme_oxford <- function(base_family = "Roboto",
subtitle_colour = get_oxford_colour("ash"),
subtitle_margin = 15,
strip_text_family = base_family,
strip_text_size = 10,
strip_text_size = 12,
strip_text_face = "plain",
caption_family = base_family,
caption_size = 9,
Expand Down
4 changes: 2 additions & 2 deletions README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ knitr::opts_chunk$set(
# oxthema: Oxford Colours, Palettes, Fonts, and Themes <img src="man/figures/logo.png" width="200" align="right" />

<!-- badges: start -->
[![Project Status: WIPInitial development is in progress, but there has not yet been a stable, usable release suitable for the public.](https://www.repostatus.org/badges/latest/wip.svg)](https://www.repostatus.org/#wip)
[![Lifecycle: experimental](https://img.shields.io/badge/lifecycle-experimental-orange.svg)](https://lifecycle.r-lib.org/articles/stages.html#experimental)
[![Project Status: ActiveThe project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active)
[![Lifecycle: stable](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://lifecycle.r-lib.org/articles/stages.html#stable)
[![R-CMD-check](https://github.com/OxfordIHTM/oxthema/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/OxfordIHTM/oxthema/actions/workflows/R-CMD-check.yaml)
[![test-coverage](https://github.com/OxfordIHTM/oxthema/actions/workflows/test-coverage.yaml/badge.svg)](https://github.com/OxfordIHTM/oxthema/actions/workflows/test-coverage.yaml)
[![Codecov test coverage](https://codecov.io/gh/OxfordIHTM/oxthema/branch/main/graph/badge.svg)](https://app.codecov.io/gh/OxfordIHTM/oxthema?branch=main)
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@

<!-- badges: start -->

[![Project Status: WIPInitial development is in progress, but there
has not yet been a stable, usable release suitable for the
public.](https://www.repostatus.org/badges/latest/wip.svg)](https://www.repostatus.org/#wip)
[![Project Status: ActiveThe project has reached a stable, usable
state and is being actively
developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active)
[![Lifecycle:
experimental](https://img.shields.io/badge/lifecycle-experimental-orange.svg)](https://lifecycle.r-lib.org/articles/stages.html#experimental)
stable](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://lifecycle.r-lib.org/articles/stages.html#stable)
[![R-CMD-check](https://github.com/OxfordIHTM/oxthema/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/OxfordIHTM/oxthema/actions/workflows/R-CMD-check.yaml)
[![test-coverage](https://github.com/OxfordIHTM/oxthema/actions/workflows/test-coverage.yaml/badge.svg)](https://github.com/OxfordIHTM/oxthema/actions/workflows/test-coverage.yaml)
[![Codecov test
Expand Down
18 changes: 5 additions & 13 deletions inst/CITATION
Original file line number Diff line number Diff line change
@@ -1,18 +1,10 @@
citHeader("To cite oxfordtheme in publications use:")

citEntry(
entry = "Manual",
title = "oxfordtheme: Oxford Palette, Theme, and Theme Components.",
bibentry(
bibtype = "Manual",
header = "To cite oxfordtheme in publications use:",
title = "oxthema: Oxford Palette, Theme, and Theme Components.",
author = c(person("Ernest Guevarra"), person("Greco Malijan")),
year = "2024",
note = "R package version 0.0.9000",
url = "https://oxford-ihtm.io/oxfordtheme/",
doi = "https://zenodo.org/doi/10.5281/zenodo.10721129",
textVersion = paste(
paste("Ernest Guevarra and Greco Malijan (2024).",
"oxfordtheme: Oxford Palette, Theme, and Theme Components.",
"R package version 0.0.9000.",
"URL https://oxford-ihtm.io/oxfordtheme/",
"DOI https://zenodo.org/doi/10.5281/zenodo.10721129")
)
doi = "https://zenodo.org/doi/10.5281/zenodo.10721129"
)
Binary file modified man/figures/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions man/oxford_theme.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions pkgdown/_pkgdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ title: oxthema

url: https://oxford-ihtm.io/oxthema/

development:
mode: auto

template:
bootstrap: 5
bootswatch: litera
Expand Down
Binary file modified pkgdown/favicon/apple-touch-icon-120x120.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified pkgdown/favicon/apple-touch-icon-152x152.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified pkgdown/favicon/apple-touch-icon-180x180.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified pkgdown/favicon/apple-touch-icon-60x60.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified pkgdown/favicon/apple-touch-icon-76x76.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified pkgdown/favicon/apple-touch-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified pkgdown/favicon/favicon-16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified pkgdown/favicon/favicon-32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified pkgdown/favicon/favicon.ico
Binary file not shown.
4 changes: 1 addition & 3 deletions vignettes/oxford-forestploter-themes.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,7 @@ Using the example data in the `forestploter` and processing it in the same way a
# Read and process example data from forestploter package

## Read example data from forestploter package
dt <- read.csv(
system.file("extdata", "example_data.csv", package = "forestploter")
)
dt <- read.csv("https://raw.githubusercontent.com/adayim/forestploter/main/inst/extdata/example_data.csv")

## Indent the subgroup if there is a number in the placebo column
dt$Subgroup <- ifelse(
Expand Down