Skip to content

Commit b0f10d0

Browse files
committed
Merge pull request #1557 from Katiedaisey/master
Updates theme-defaults.r (#1555)
2 parents a760ff6 + 94be279 commit b0f10d0

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

NEWS.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@
119119
* Fixed a compatibility issue with `ggproto` and R versions prior to 3.1.2.
120120
(#1444)
121121

122+
* All elements should now inherit correctly for all themes except theme_void(). (@Katiedaisey, #1555)
123+
122124
# ggplot2 2.0.0
123125

124126
## Major changes

R/theme-defaults.r

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,9 @@ theme_grey <- function(base_size = 11, base_family = "") {
7676
margin = margin(), debug = FALSE
7777
),
7878

79-
axis.line = element_blank(),
79+
axis.line = element_line(),
80+
axis.line.x = element_blank(),
81+
axis.line.y = element_blank(),
8082
axis.text = element_text(size = rel(0.8), colour = "grey30"),
8183
axis.text.x = element_text(margin = margin(t = 0.8 * half_line / 2), vjust = 1),
8284
axis.text.y = element_text(margin = margin(r = 0.8 * half_line / 2), hjust = 1),
@@ -218,8 +220,10 @@ theme_minimal <- function(base_size = 12, base_family = "") {
218220
panel.border = element_blank(),
219221
strip.background = element_blank(),
220222
plot.background = element_blank(),
221-
axis.ticks = element_blank(),
222-
axis.ticks.length = unit(0, "lines")
223+
axis.ticks = element_line(),
224+
axis.ticks.x = element_blank(),
225+
axis.ticks.y = element_blank(),
226+
axis.ticks.length = unit(1, "lines")
223227
)
224228
}
225229

@@ -230,8 +234,12 @@ theme_classic <- function(base_size = 12, base_family = ""){
230234
theme(
231235
panel.border = element_blank(),
232236
axis.line = element_line(colour = "black"),
233-
panel.grid.major = element_blank(),
234-
panel.grid.minor = element_blank(),
237+
panel.grid.major = element_line(),
238+
panel.grid.major.x = element_blank(),
239+
panel.grid.major.y = element_blank(),
240+
panel.grid.minor = element_line(),
241+
panel.grid.minor.x = element_blank(),
242+
panel.grid.minor.y = element_blank(),
235243
strip.background = element_rect(colour = "black", size = 0.5),
236244
legend.key = element_blank()
237245
)

0 commit comments

Comments
 (0)