Skip to content

Commit f3696e4

Browse files
authored
Merge pull request #15 from idem-lab/add_scales
Add scales
2 parents 06b499f + 2eae0ca commit f3696e4

File tree

6 files changed

+61
-2
lines changed

6 files changed

+61
-2
lines changed

.Rbuildignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,6 @@
33
^README\.Rmd$
44
^LICENSE\.md$
55
^\.github$
6+
^_pkgdown\.yml$
7+
^docs$
8+
^pkgdown$

.github/workflows/pkgdown.yaml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
2+
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
3+
on:
4+
push:
5+
branches: [main, master]
6+
pull_request:
7+
release:
8+
types: [published]
9+
workflow_dispatch:
10+
11+
name: pkgdown.yaml
12+
13+
permissions: read-all
14+
15+
jobs:
16+
pkgdown:
17+
runs-on: ubuntu-latest
18+
# Only restrict concurrency for non-PR jobs
19+
concurrency:
20+
group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }}
21+
env:
22+
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
23+
permissions:
24+
contents: write
25+
steps:
26+
- uses: actions/checkout@v4
27+
28+
- uses: r-lib/actions/setup-pandoc@v2
29+
30+
- uses: r-lib/actions/setup-r@v2
31+
with:
32+
use-public-rspm: true
33+
34+
- uses: r-lib/actions/setup-r-dependencies@v2
35+
with:
36+
extra-packages: any::pkgdown, local::.
37+
needs: website
38+
39+
- name: Build site
40+
run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE)
41+
shell: Rscript {0}
42+
43+
- name: Deploy to GitHub pages 🚀
44+
if: github.event_name != 'pull_request'
45+
uses: JamesIves/[email protected]
46+
with:
47+
clean: false
48+
branch: gh-pages
49+
folder: docs

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
.Rhistory
33
.RData
44
.Ruserdata
5+
docs

DESCRIPTION

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ Imports:
1616
Suggests:
1717
testthat (>= 3.0.0)
1818
Config/testthat/edition: 3
19+
URL: https://idem-lab.github.io/idpalette/

R/scale_id_continuous.R

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131
scale_id_continuous <- function(
3232
cols,
3333
aesthetics = c("fill", "colour"),
34-
na.value = "transparent"
34+
na.value = "transparent",
35+
guide = "colourbar"
3536
){
3637

3738
aesthetics <- match.arg(aesthetics)
@@ -44,7 +45,7 @@ scale_id_continuous <- function(
4445
space = "Lab"
4546
),
4647
na.value = na.value,
47-
guide = "colourbar",
48+
guide = guide
4849
)
4950

5051
}

_pkgdown.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
url: https://idem-lab.github.io/idpalette/
2+
template:
3+
bootstrap: 5
4+

0 commit comments

Comments
 (0)