Merge branch 'sg-palettes' of github.com:DataScienceScotland/sgplot i…

…nto sg-palettes
ScotGovAnalysis · Aug 25, 2023 · 17ea1ec · 17ea1ec
2 parents 3a3460a + f2dc24f
commit 17ea1ec
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 42 deletions.
diff --git a/R/sg_palette.R b/R/sg_palette.R
@@ -29,12 +29,8 @@ sg_palette <- function(palette = "main",
     n_available <- length(palette_list[[palette]])
 
     # Use 'main2' if AF main palette used and only 2 colours required
-    if (
-      palette_type == "af" &&
-      n == 2 &&
-      palette != "main2" &&
-      grepl("main", palette)
-    ) {
+    if (palette_type == "af" && n == 2 &&
+        palette != "main2" && grepl("main", palette)) {
       palette <- "main2"
       cli::cli_warn(c(
         "!" = "Using `main2` as only two colours are required."

diff --git a/man/figures/README-ex2-1.svg b/man/figures/README-ex2-1.svg