diff --git a/newspack-joseph/inc/child-typography.php b/newspack-joseph/inc/child-typography.php index 77c400437..80a0e4623 100644 --- a/newspack-joseph/inc/child-typography.php +++ b/newspack-joseph/inc/child-typography.php @@ -51,7 +51,7 @@ function newspack_joseph_custom_typography_css() { font-family: ' . wp_kses( $font_header, null ) . '; } .block-editor-block-list__layout .block-editor-block-list__block .article-section-title, - .block-editor-block-list__layout .block-editor-block-list__block .accent-header { + .block-editor-block-list__layout .block-editor-block-list__block.accent-header { font-family: inherit; }'; } @@ -76,7 +76,7 @@ function newspack_joseph_custom_typography_css() { } '; $editor_css_blocks .= ' - .block-editor-block-list__layout .block-editor-block-list__block .accent-header, + .block-editor-block-list__layout .block-editor-block-list__block.accent-header, .block-editor-block-list__layout .block-editor-block-list__block .article-section-title { text-transform: uppercase; } diff --git a/newspack-joseph/sass/style-editor.scss b/newspack-joseph/sass/style-editor.scss index d54ae1bc3..bc1edf50c 100644 --- a/newspack-joseph/sass/style-editor.scss +++ b/newspack-joseph/sass/style-editor.scss @@ -141,6 +141,7 @@ Newspack Sacha Editor Styles flex: 1 0 0.25rem; height: 1px; margin: 0 0 0 0.25rem; + position: relative !important; } } diff --git a/newspack-katharine/inc/child-color-patterns.php b/newspack-katharine/inc/child-color-patterns.php index ec2bcb789..842ab6d88 100644 --- a/newspack-katharine/inc/child-color-patterns.php +++ b/newspack-katharine/inc/child-color-patterns.php @@ -113,12 +113,12 @@ function newspack_katharine_custom_colors_css() { $editor_css = ' .block-editor-block-list__layout .block-editor-block-list__block .entry-meta .byline a, - .block-editor-block-list__layout .block-editor-block-list__block .accent-header, + .block-editor-block-list__layout .block-editor-block-list__block.accent-header, .block-editor-block-list__layout .block-editor-block-list__block .wp-block-newspack-blocks-homepage-articles:not(.has-text-color) .article-section-title { color: ' . esc_html( newspack_color_with_contrast( $primary_color ) ) . '; } - .block-editor-block-list__layout .block-editor-block-list__block .accent-header:before, + .block-editor-block-list__layout .block-editor-block-list__block.accent-header:before, .block-editor-block-list__layout .block-editor-block-list__block .article-section-title:before, .block-editor-block-list__layout .block-editor-block-list__block figcaption:after, .block-editor-block-list__layout .block-editor-block-list__block .wp-caption-text:after { diff --git a/newspack-katharine/inc/child-typography.php b/newspack-katharine/inc/child-typography.php index 3b932e250..46a565a4b 100644 --- a/newspack-katharine/inc/child-typography.php +++ b/newspack-katharine/inc/child-typography.php @@ -42,7 +42,7 @@ function newspack_katharine_custom_typography_css() { } '; $editor_css_blocks .= ' - .block-editor-block-list__layout .block-editor-block-list__block .accent-header, + .block-editor-block-list__layout .block-editor-block-list__block.accent-header, .block-editor-block-list__layout .block-editor-block-list__block .article-section-title, .block-editor-block-list__layout .block-editor-block-list__block .entry-meta .byline a, .block-editor-block-list__layout .block-editor-block-list__block .entry-meta .entry-date { diff --git a/newspack-katharine/sass/style-editor.scss b/newspack-katharine/sass/style-editor.scss index 375697d8f..b91d59443 100644 --- a/newspack-katharine/sass/style-editor.scss +++ b/newspack-katharine/sass/style-editor.scss @@ -11,7 +11,8 @@ Newspack Katharine Editor Styles .article-section-title { color: $color__primary; font-size: $font__size-xs; - margin: 0 0 #{1.5 * $size__spacing-unit}; + margin-bottom: #{1.5 * $size__spacing-unit}; + margin-top: 0; &::before { background-color: $color__primary; diff --git a/newspack-nelson/inc/child-typography.php b/newspack-nelson/inc/child-typography.php index 54a5536a2..b1ff226f2 100644 --- a/newspack-nelson/inc/child-typography.php +++ b/newspack-nelson/inc/child-typography.php @@ -48,7 +48,7 @@ function newspack_nelson_custom_typography_css() { } '; $editor_css_blocks .= ' - .block-editor-block-list__layout .block-editor-block-list__block .accent-header, + .block-editor-block-list__layout .block-editor-block-list__block.accent-header, .block-editor-block-list__layout .block-editor-block-list__block .article-section-title, .block-editor-block-list__layout .block-editor-block-list__block .entry-meta .byline a, .block-editor-block-list__layout .block-editor-block-list__block .cat-links { diff --git a/newspack-sacha/inc/child-color-patterns.php b/newspack-sacha/inc/child-color-patterns.php index 9ee6a7145..433d86dcf 100644 --- a/newspack-sacha/inc/child-color-patterns.php +++ b/newspack-sacha/inc/child-color-patterns.php @@ -77,7 +77,7 @@ function newspack_sacha_custom_colors_css() { $editor_css = ' .block-editor-block-list__layout .block-editor-block-list__block .entry-meta .byline a, - .block-editor-block-list__layout .block-editor-block-list__block .accent-header, + .block-editor-block-list__layout .block-editor-block-list__block.accent-header, .block-editor-block-list__layout .block-editor-block-list__block .wp-block-newspack-blocks-homepage-articles:not(.has-text-color) .article-section-title { color: ' . esc_html( newspack_color_with_contrast( $primary_color ) ) . '; } diff --git a/newspack-sacha/inc/child-typography.php b/newspack-sacha/inc/child-typography.php index d87c7642d..65ce481bd 100644 --- a/newspack-sacha/inc/child-typography.php +++ b/newspack-sacha/inc/child-typography.php @@ -43,7 +43,7 @@ function newspack_sacha_custom_typography_css() { } '; $editor_css_blocks .= ' - .block-editor-block-list__layout .block-editor-block-list__block .accent-header, + .block-editor-block-list__layout .block-editor-block-list__block.accent-header, .block-editor-block-list__layout .block-editor-block-list__block .article-section-title { text-transform: uppercase; } diff --git a/newspack-scott/inc/child-color-patterns.php b/newspack-scott/inc/child-color-patterns.php index 1e642214c..c7c907843 100644 --- a/newspack-scott/inc/child-color-patterns.php +++ b/newspack-scott/inc/child-color-patterns.php @@ -78,7 +78,7 @@ function newspack_scott_custom_colors_css() { } $editor_css = ' - .block-editor-block-list__layout .block-editor-block-list__block .accent-header:not(.widget-title):before, + .block-editor-block-list__layout .block-editor-block-list__block.accent-header:before, .block-editor-block-list__layout .block-editor-block-list__block .article-section-title:before { background-color: ' . esc_html( $primary_color ) . '; } diff --git a/newspack-scott/inc/child-typography.php b/newspack-scott/inc/child-typography.php index 6798fe25c..94d1a04bc 100644 --- a/newspack-scott/inc/child-typography.php +++ b/newspack-scott/inc/child-typography.php @@ -45,7 +45,7 @@ function newspack_scott_custom_typography_css() { } '; $editor_css_blocks .= ' - .block-editor-block-list__layout .block-editor-block-list__block .accent-header, + .block-editor-block-list__layout .block-editor-block-list__block.accent-header, .block-editor-block-list__layout .block-editor-block-list__block .article-section-title { text-transform: uppercase; } diff --git a/newspack-theme/inc/color-patterns.php b/newspack-theme/inc/color-patterns.php index f959a4a36..7e0f27240 100755 --- a/newspack-theme/inc/color-patterns.php +++ b/newspack-theme/inc/color-patterns.php @@ -457,7 +457,7 @@ function newspack_custom_colors_css() { $editor_css .= ' .block-editor-block-list__layout .block-editor-block-list__block .entry-meta .byline a, .block-editor-block-list__layout .block-editor-block-list__block .wp-block-newspack-blocks-homepage-articles:not(.has-text-color) .article-section-title, - .block-editor-block-list__layout .block-editor-block-list__block .accent-header { + .block-editor-block-list__layout .block-editor-block-list__block.accent-header { color: ' . esc_html( newspack_color_with_contrast( $primary_color ) ) . '; } '; diff --git a/newspack-theme/inc/typography.php b/newspack-theme/inc/typography.php index 3466c44c4..2dd2a0c1c 100644 --- a/newspack-theme/inc/typography.php +++ b/newspack-theme/inc/typography.php @@ -253,7 +253,7 @@ function newspack_custom_typography_css() { } '; $editor_css_blocks .= ' - .block-editor-block-list__layout .block-editor-block-list__block .accent-header, + .block-editor-block-list__layout .block-editor-block-list__block.accent-header, .block-editor-block-list__layout .block-editor-block-list__block .article-section-title { text-transform: uppercase; } diff --git a/newspack-theme/sass/styles/style-default/style-default-editor.scss b/newspack-theme/sass/styles/style-default/style-default-editor.scss index 00a0c326b..4ab8d534b 100644 --- a/newspack-theme/sass/styles/style-default/style-default-editor.scss +++ b/newspack-theme/sass/styles/style-default/style-default-editor.scss @@ -3,6 +3,7 @@ border-bottom: 4px solid $color__border; color: $color__primary; font-size: $font__size-sm; - margin: 0 0 #{$size__spacing-unit * 0.75}; + margin-top: 0; + margin-bottom: #{$size__spacing-unit * 0.75}; padding: 0 0 #{$size__spacing-unit * 0.33}; }