fixes downstream ggplot2 issue

jaredhuling · May 21, 2019 · eaa21c9 · eaa21c9
1 parent 1b836de
commit eaa21c9
Show file tree

Hide file tree

Showing 29 changed files with 10 additions and 2 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -16,7 +16,7 @@ Imports:
     grDevices,
     scales,
     ggplot2 (>= 3.0.0)
-RoxygenNote: 6.1.0
+RoxygenNote: 6.1.1
 Suggests: 
     knitr,
     rmarkdown,

diff --git a/NAMESPACE b/NAMESPACE
@@ -15,6 +15,7 @@ export(scale_fill_jcolors_contin)
 export(theme_dark_bg)
 export(theme_light_bg)
 import(ggplot2)
+importFrom(ggplot2,"%+replace%")
 importFrom(ggplot2,discrete_scale)
 importFrom(grDevices,colorRampPalette)
 importFrom(grDevices,rgb2hsv)

diff --git a/R/ggplot2_themes.R b/R/ggplot2_themes.R
@@ -1,4 +1,5 @@
 
+#' @importFrom ggplot2 %+replace%
 theme_dark_bg_base <- function(base_size = 12, base_family = "sans",
                                base_line_size = base_size / 22,
                                base_rect_size = base_size / 22)
@@ -9,7 +10,13 @@ theme_dark_bg_base <- function(base_size = 12, base_family = "sans",
 
     half_line <- base_size * 0.5
 
-    theme(line = element_line(size     = base_line_size,
+    ggplot2::theme_grey(
+        base_size = base_size,
+        base_family = base_family,
+        base_line_size = base_line_size,
+        base_rect_size = base_rect_size
+    ) %+replace%
+        ggplot2::theme(line = element_line(size     = base_line_size,
                               linetype = 1,
                               lineend  = "butt",
                               colour   = "grey80"),

diff --git a/vignettes/readme_figs/contin_example-1.png b/vignettes/readme_figs/contin_example-1.png
diff --git a/vignettes/readme_figs/contin_example_display-1.png b/vignettes/readme_figs/contin_example_display-1.png
diff --git a/vignettes/readme_figs/darkbg-1.png b/vignettes/readme_figs/darkbg-1.png
diff --git a/vignettes/readme_figs/diamonds_light_theme-1.png b/vignettes/readme_figs/diamonds_light_theme-1.png
diff --git a/vignettes/readme_figs/displayall-1.png b/vignettes/readme_figs/displayall-1.png
diff --git a/vignettes/readme_figs/jitterplot-1.png b/vignettes/readme_figs/jitterplot-1.png
diff --git a/vignettes/readme_figs/moreplots-1.png b/vignettes/readme_figs/moreplots-1.png
diff --git a/vignettes/readme_figs/moreplots-2.png b/vignettes/readme_figs/moreplots-2.png
diff --git a/vignettes/readme_figs/moreplots-3.png b/vignettes/readme_figs/moreplots-3.png
diff --git a/vignettes/readme_figs/moreplots-4.png b/vignettes/readme_figs/moreplots-4.png
diff --git a/vignettes/readme_figs/mountain_ex-1.png b/vignettes/readme_figs/mountain_ex-1.png
diff --git a/vignettes/readme_figs/unnamed-chunk-10-1.png b/vignettes/readme_figs/unnamed-chunk-10-1.png
diff --git a/vignettes/readme_figs/unnamed-chunk-11-1.png b/vignettes/readme_figs/unnamed-chunk-11-1.png
diff --git a/vignettes/readme_figs/unnamed-chunk-12-1.png b/vignettes/readme_figs/unnamed-chunk-12-1.png
diff --git a/vignettes/readme_figs/unnamed-chunk-13-1.png b/vignettes/readme_figs/unnamed-chunk-13-1.png
diff --git a/vignettes/readme_figs/unnamed-chunk-14-1.png b/vignettes/readme_figs/unnamed-chunk-14-1.png
diff --git a/vignettes/readme_figs/unnamed-chunk-15-1.png b/vignettes/readme_figs/unnamed-chunk-15-1.png
diff --git a/vignettes/readme_figs/unnamed-chunk-16-1.png b/vignettes/readme_figs/unnamed-chunk-16-1.png
diff --git a/vignettes/readme_figs/unnamed-chunk-3-1.png b/vignettes/readme_figs/unnamed-chunk-3-1.png
diff --git a/vignettes/readme_figs/unnamed-chunk-3-2.png b/vignettes/readme_figs/unnamed-chunk-3-2.png
diff --git a/vignettes/readme_figs/unnamed-chunk-4-1.png b/vignettes/readme_figs/unnamed-chunk-4-1.png
diff --git a/vignettes/readme_figs/unnamed-chunk-5-1.png b/vignettes/readme_figs/unnamed-chunk-5-1.png
diff --git a/vignettes/readme_figs/unnamed-chunk-6-1.png b/vignettes/readme_figs/unnamed-chunk-6-1.png
diff --git a/vignettes/readme_figs/unnamed-chunk-7-1.png b/vignettes/readme_figs/unnamed-chunk-7-1.png
diff --git a/vignettes/readme_figs/unnamed-chunk-8-1.png b/vignettes/readme_figs/unnamed-chunk-8-1.png
diff --git a/vignettes/readme_figs/unnamed-chunk-9-1.png b/vignettes/readme_figs/unnamed-chunk-9-1.png