Skip to content

Commit

Permalink
add 4 oxford themes
Browse files Browse the repository at this point in the history
  • Loading branch information
ernestguevarra committed Feb 26, 2024
1 parent cba1f7a commit c86b8c1
Show file tree
Hide file tree
Showing 17 changed files with 438 additions and 42 deletions.
3 changes: 3 additions & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,6 @@
^\.github$
^codecov\.yml$
^data-raw$
^_pkgdown\.yml$
^docs$
^pkgdown$
126 changes: 126 additions & 0 deletions .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
# Contributor Covenant Code of Conduct

## Our Pledge

We as members, contributors, and leaders pledge to make participation in our
community a harassment-free experience for everyone, regardless of age, body
size, visible or invisible disability, ethnicity, sex characteristics, gender
identity and expression, level of experience, education, socio-economic status,
nationality, personal appearance, race, caste, color, religion, or sexual
identity and orientation.

We pledge to act and interact in ways that contribute to an open, welcoming,
diverse, inclusive, and healthy community.

## Our Standards

Examples of behavior that contributes to a positive environment for our
community include:

* Demonstrating empathy and kindness toward other people
* Being respectful of differing opinions, viewpoints, and experiences
* Giving and gracefully accepting constructive feedback
* Accepting responsibility and apologizing to those affected by our mistakes,
and learning from the experience
* Focusing on what is best not just for us as individuals, but for the overall
community

Examples of unacceptable behavior include:

* The use of sexualized language or imagery, and sexual attention or advances of
any kind
* Trolling, insulting or derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or email address,
without their explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Enforcement Responsibilities

Community leaders are responsible for clarifying and enforcing our standards of
acceptable behavior and will take appropriate and fair corrective action in
response to any behavior that they deem inappropriate, threatening, offensive,
or harmful.

Community leaders have the right and responsibility to remove, edit, or reject
comments, commits, code, wiki edits, issues, and other contributions that are
not aligned to this Code of Conduct, and will communicate reasons for moderation
decisions when appropriate.

## Scope

This Code of Conduct applies within all community spaces, and also applies when
an individual is officially representing the community in public spaces.
Examples of representing our community include using an official e-mail address,
posting via an official social media account, or acting as an appointed
representative at an online or offline event.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at Ernest Guevarra.
All complaints will be reviewed and investigated promptly and fairly.

All community leaders are obligated to respect the privacy and security of the
reporter of any incident.

## Enforcement Guidelines

Community leaders will follow these Community Impact Guidelines in determining
the consequences for any action they deem in violation of this Code of Conduct:

### 1. Correction

**Community Impact**: Use of inappropriate language or other behavior deemed
unprofessional or unwelcome in the community.

**Consequence**: A private, written warning from community leaders, providing
clarity around the nature of the violation and an explanation of why the
behavior was inappropriate. A public apology may be requested.

### 2. Warning

**Community Impact**: A violation through a single incident or series of
actions.

**Consequence**: A warning with consequences for continued behavior. No
interaction with the people involved, including unsolicited interaction with
those enforcing the Code of Conduct, for a specified period of time. This
includes avoiding interactions in community spaces as well as external channels
like social media. Violating these terms may lead to a temporary or permanent
ban.

### 3. Temporary Ban

**Community Impact**: A serious violation of community standards, including
sustained inappropriate behavior.

**Consequence**: A temporary ban from any sort of interaction or public
communication with the community for a specified period of time. No public or
private interaction with the people involved, including unsolicited interaction
with those enforcing the Code of Conduct, is allowed during this period.
Violating these terms may lead to a permanent ban.

### 4. Permanent Ban

**Community Impact**: Demonstrating a pattern of violation of community
standards, including sustained inappropriate behavior, harassment of an
individual, or aggression toward or disparagement of classes of individuals.

**Consequence**: A permanent ban from any sort of public interaction within the
community.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage],
version 2.1, available at
<https://www.contributor-covenant.org/version/2/1/code_of_conduct.html>.

Community Impact Guidelines were inspired by
[Mozilla's code of conduct enforcement ladder][https://github.com/mozilla/inclusion].

For answers to common questions about this code of conduct, see the FAQ at
<https://www.contributor-covenant.org/faq>. Translations are available at <https://www.contributor-covenant.org/translations>.

[homepage]: https://www.contributor-covenant.org
35 changes: 35 additions & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# Contributing

## Bugs

* Submit an issue on the [issues page](https://github.com/OxfordIHTM/icd/issues)

## Code contributions

* Fork this repository to your Github account

* Clone your version on your account down to your machine from your account

```
git clone https://github.com/<yourgithubusername>/icd.git
```

* Make sure to track progress upstream i.e., on our version of `icd`
at `OxfordIHTM/icd`, by doing

```
git remote add upstream https://github.com/OxfordIHTM/icd.git
```

* Before making changes make sure to pull changes in from `upstream` by doing
either `git fetch upstream` then merge later or `git pull upstream` to fetch
and merge in one step

* Make your changes on a new feature branch

* Please write a test or tests for your changes if they affect code and not just
documentation

* Push up changes to your account

* Submit a pull request at `OxfordIHTM/icd`
48 changes: 48 additions & 0 deletions .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [main, master]
pull_request:
branches: [main, master]
release:
types: [published]
workflow_dispatch:

name: pkgdown

jobs:
pkgdown:
runs-on: ubuntu-latest
# Only restrict concurrency for non-PR jobs
concurrency:
group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }}
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
permissions:
contents: write
steps:
- uses: actions/checkout@v4

- uses: r-lib/actions/setup-pandoc@v2

- uses: r-lib/actions/setup-r@v2
with:
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::pkgdown, local::.
needs: website

- name: Build site
run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE)
shell: Rscript {0}

- name: Deploy to GitHub pages 🚀
if: github.event_name != 'pull_request'
uses: JamesIves/[email protected]
with:
clean: false
branch: gh-pages
folder: docs
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
.Rhistory
.RData
.Ruserdata
docs
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ Authors@R: person(
role = c("aut", "cre")
)
Description: Theme and theme components based on University of Oxford's visual
identity guidelines
<https://www.ox.ac.uk/sites/files/oxford/media_wysiwyg/Oxford%20Blue%20LR.pdf>.
identity guidelines
<https://communications.web.ox.ac.uk/communications-resources/visual-identity/identity-guidelines>.
License: GPL (>= 3)
Depends:
R (>= 2.10)
Expand All @@ -22,4 +22,4 @@ Suggests:
Encoding: UTF-8
LazyData: true
RoxygenNote: 7.2.3

URL: http://oxford-ihtm.io/oxfordtheme/
2 changes: 2 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Generated by roxygen2: do not edit by hand

export(cmyk2rgb)
export(get_oxford_colour)
export(get_oxford_colours)
export(oxford_palettes)
importFrom(grDevices,col2rgb)
importFrom(stringr,str_pad)
37 changes: 29 additions & 8 deletions R/get_named_colours.R
Original file line number Diff line number Diff line change
@@ -1,32 +1,34 @@
#'
#' Get named Oxford colours vector
#'
#' @param df The `oxford_colours` data.frame.
#' @param pattern Optional. A character value or vector to use as a search term.
#' Default is NULL in which case all the Oxford colours are returned.
#' @param type A character vector of colour type. Can be "rgb", "cmyk", "hex",
#' or "pantone". Default is "hex".
#' @param pattern Optional. A character value or vector to use as a search term.
#' Default is NULL.
#'
#' @return A named vector of Oxford colour/s
#'
#' @examples
#' get_oxford_colours()
#' get_oxford_colours(type = "rgb")
#' get_oxford_colours(pattern = "lilac")
#' get_oxford_colours(pattern = c("lilac", "sage green"))
#'
#' @rdname get_oxford_colour
#' @export
#'
get_oxford_colours <- function(pattern = NULL,
df = oxford_colours,
type = c("hex", "rgb", "cmyk", "pantone")){
get_oxford_colour <- function(pattern = NULL,
type = c("hex", "rgb", "cmyk", "pantone")){
## Get type ----
type <- match.arg(type)

## Get df ----
df <- oxfordtheme::oxford_colours

## Determine if there is something specific to search for ----
if (!is.null(pattern)) {
pattern <- paste(pattern, collapse = "|")
## Get colours vector ----
ox_cols <- df[stringr::str_detect(df$name, pattern = pattern,), c("name", type)] |>
ox_cols <- df[stringr::str_detect(df$name, pattern = pattern), c("name", type)] |>
(\(x)
{
cols <- x[[type]]
Expand All @@ -48,3 +50,22 @@ get_oxford_colours <- function(pattern = NULL,

ox_cols
}

#'
#' @rdname get_oxford_colour
#' @export
#'

get_oxford_colours <- function(pattern = NULL,
type = c("hex", "rgb", "cmyk", "pantone")) {
## Return all or just specific colours ----
if (is.null(pattern)) {
ox_cols <- get_oxford_colour(pattern = pattern, type = type)
} else {
ox_cols <- lapply(X = pattern, FUN = get_oxford_colour, type = type) |>
unlist()
}

## Return ox_cols ----
ox_cols
}
38 changes: 30 additions & 8 deletions R/ox_palettes.R
Original file line number Diff line number Diff line change
@@ -1,16 +1,38 @@
#'
#' Complete list of Oxford colour palettes
#'
#' @examples
#' oxford_palettes()
#'
#' @export
#'
oxford_palettes <- list(
blues = c("#4891DC", "#9ECEEB", "#44687D", "#5F9BAF", "#A1C4D0", "#007770", "#7BA296", "#BCD2C3"),
greens = c("#69913B", "#B9CF96", "#CEDBAF", "#AAB300", "#DBDE72", "#E3E597"),
oranges = c("#CF7A30", "#F5CF47", "#F3DE74"),
reds = c("#872434", "#BE0F34", "#EBC4CB"),
grays = c("#A79D96", "#C7C2BC", "#E0DED9"),
heritage = get_oxford_colours(pattern = c("sienna", "peach", "pink", "sage green", "Oxford green", "Oxford blue"))
)
oxford_palettes <- function() {
list(
# blues = c("#4891DC", "#9ECEEB", "#44687D", "#5F9BAF", "#A1C4D0", "#007770", "#7BA296", "#BCD2C3"),
# greens = c("#69913B", "#B9CF96", "#CEDBAF", "#AAB300", "#DBDE72", "#E3E597"),
# oranges = c("#CF7A30", "#F5CF47", "#F3DE74"),
# reds = c("#872434", "#BE0F34", "#EBC4CB"),
# grays = c("#A79D96", "#C7C2BC", "#E0DED9"),
heritage = get_oxford_colours(
pattern = c(
"sienna", "peach", "dusk", "sage green", "Oxford green", "Oxford blue"
)
),
contemporary = get_oxford_colours(
pattern = c(
"coral", "potters pink", "cool grey", "ocean grey", "aqua", "Oxford blue"
)
),
celebratory = get_oxford_colours(
pattern = c(
"viridian", "mauve", "ochre", "lavender", "plum", "Oxford blue"
)
),
corporate = get_oxford_colours(
c("orange", "sky blue", "lime green", "cerulean", "royal blue", "Oxford blue")
)
)
}



Expand Down
3 changes: 1 addition & 2 deletions R/oxfordtheme.R
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
#' Oxford Theme and Theme Components
#'
#' Theme and theme components for 'ggplot2' based on University of Oxford's
#' visual identity guidelines
#' <https://www.ox.ac.uk/sites/files/oxford/media_wysiwyg/Oxford%20Blue%20LR.pdf>.
#' visual identity guidelines <https://communications.web.ox.ac.uk/communications-resources/visual-identity/identity-guidelines>
#'
#'
#' @md
Expand Down
Loading

0 comments on commit c86b8c1

Please sign in to comment.