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.

Sign up for GitHub

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

removed redundant #' #5

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

removed redundant #' #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa07071
removed redundant #'
EdwinTh Dec 13, 2017
85a67f8
fixed copy paste error
EdwinTh Dec 13, 2017
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/scales.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ scale_color_ochre <- function(..., palette="namatjira_qual",
#' @export
scale_colour_ochre <- scale_color_ochre

#' #' Setup fill palette for ggplot2
#' Setup fill palette for ggplot2
#'
#' @param palette Choose from 'ochre_palettes' list
#'
Expand All @@ -78,7 +78,7 @@ scale_colour_ochre <- scale_color_ochre
#'
#' @param discrete whether to use a discrete colour palette
#'
#' @param ... additional arguments to pass to scale_color_gradientn
#' @param ... additional arguments to pass to scale_fill_gradientn
#'
#' @importFrom ggplot2 scale_fill_manual discrete_scale scale_fill_gradientn
#'
Expand Down
13 changes: 12 additions & 1 deletion man/ochre_palettes.Rd
View file
Open in desktop

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

8 changes: 4 additions & 4 deletions man/scale_fill_ochre.Rd
View file
Open in desktop

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

6 changes: 6 additions & 0 deletions vignettes/ochre.R
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
## ----setup, echo = FALSE, message = FALSE--------------------------------
knitr::opts_chunk$set(fig.width = 7,
echo = FALSE,
warning = FALSE,
message=FALSE)