Skip to content

Commit 5eb0b76

Browse files
fix: default pullquote borders (#2630)
This PR overrides the default pullquote block styles coming from the block library to fix the pullquote styles for our various themes.
1 parent 3271616 commit 5eb0b76

11 files changed

Lines changed: 50 additions & 21 deletions

File tree

newspack-joseph/sass/style-editor.scss

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,17 @@ Newspack Joseph Editor Styles
4848

4949
/* Pullquote */
5050
.wp-block-pullquote {
51-
border: 0;
52-
border-bottom: 2px solid;
53-
border-top: 1px solid;
5451
font-family: var(--newspack-theme-font-heading);
5552
font-style: normal;
5653
font-weight: bold;
5754
text-align: center;
5855

56+
&:not([style*='border']) {
57+
border: 0;
58+
border-bottom: 2px solid;
59+
border-top: 1px solid;
60+
}
61+
5962
p {
6063
font-style: inherit;
6164

newspack-joseph/sass/style.scss

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -359,14 +359,17 @@ textarea {
359359

360360
//! Pullquote
361361
.wp-block-pullquote {
362-
border: 0;
363-
border-bottom: 2px solid;
364-
border-top: 1px solid;
365362
font-family: var(--newspack-theme-font-heading);
366363
font-style: normal;
367364
font-weight: bold;
368365
text-align: center;
369366

367+
&:not([style*='border']) {
368+
border: 0;
369+
border-bottom: 2px solid;
370+
border-top: 1px solid;
371+
}
372+
370373
p {
371374
font-style: inherit;
372375

newspack-katharine/sass/style-editor.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,15 +113,15 @@ figure.wp-block-pullquote {
113113
font-weight: bold;
114114
position: relative;
115115

116-
&:not(.is-style-solid-color):not(.has-background) {
116+
&:not(.is-style-solid-color):not(.has-background):not([style*="border-"]) {
117117
blockquote {
118118
padding-left: #{2 * structure.$size__spacing-unit};
119119
}
120120

121121
&::before {
122122
border-top: 8px solid;
123123
border-left: 8px solid;
124-
border-color: inherit;
124+
border-color: var(--newspack-theme-color-primary);
125125
content: "";
126126
display: block;
127127
height: 40px;

newspack-katharine/sass/style.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -357,15 +357,15 @@ figcaption,
357357
text-transform: uppercase;
358358
}
359359

360-
&:not(.is-style-solid-color):not(.has-background) {
360+
&:not(.is-style-solid-color):not(.has-background):not([style*="border-"]) {
361361
blockquote {
362362
padding-left: #{2 * structure.$size__spacing-unit};
363363
}
364364

365365
&::before {
366366
border-top: 8px solid;
367367
border-left: 8px solid;
368-
border-color: inherit;
368+
border-color: var(--newspack-theme-color-primary);
369369
content: "";
370370
display: block;
371371
height: 40px;

newspack-nelson/sass/style-editor.scss

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ blockquote {
8787
}
8888

8989
.wp-block-pullquote {
90-
border-width: 16px 0 4px;
9190
font-weight: bold;
9291

9392
blockquote {
@@ -117,6 +116,11 @@ blockquote {
117116
opacity: 0.9;
118117
text-transform: uppercase;
119118
}
119+
120+
&:not([style*="border-"]) {
121+
border-width: 16px 0 4px;
122+
border-color: currentcolor;
123+
}
120124
}
121125

122126
[data-align="left"] .wp-block-pullquote,
@@ -146,7 +150,7 @@ blockquote {
146150
}
147151

148152
&.is-style-solid-color::before,
149-
&[style*="border-width"]::before {
153+
&[style*="border-"]::before {
150154
display: none;
151155
}
152156
}

newspack-nelson/sass/style.scss

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -400,9 +400,13 @@ blockquote {
400400

401401
//! Pullquote
402402
.wp-block-pullquote {
403-
border-width: 16px 0 4px;
404403
font-weight: bold;
405404

405+
&:not([style*="border-"]) {
406+
border-width: 16px 0 4px;
407+
border-color: currentcolor;
408+
}
409+
406410
blockquote p,
407411
&.is-style-solid-color blockquote p {
408412
@include utilities.media( tablet ) {
@@ -469,7 +473,7 @@ blockquote {
469473
}
470474

471475
&.is-style-solid-color::before,
472-
&[style*="border-width"]::before {
476+
&[style*="border-"]::before {
473477
display: none;
474478
}
475479
}

newspack-scott/sass/style-editor.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ Newspack Scott Editor Styles
5656
border-width: 0;
5757
font-weight: bold;
5858
padding-top: #{3 * structure.$size__spacing-unit};
59+
padding-bottom: 0;
5960
position: relative;
6061
text-align: center;
6162

@@ -220,7 +221,7 @@ Newspack Scott Editor Styles
220221
}
221222
}
222223

223-
&[style*="border-width"] {
224+
&[style*="border-"] {
224225
blockquote {
225226
margin-top: 0;
226227
}

newspack-scott/sass/style.scss

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ div.wpnbha .article-section-title {
128128
font-family: var(--newspack-theme-font-heading);
129129
font-weight: bold;
130130
padding-top: #{4 * structure.$size__spacing-unit};
131+
padding-bottom: 0;
131132
position: relative;
132133
text-align: center;
133134

@@ -323,6 +324,10 @@ div.wpnbha .article-section-title {
323324
padding-top: #{3 * structure.$size__spacing-unit};
324325
}
325326

327+
&[style*="border-"] {
328+
padding-top: structure.$size__spacing-unit;
329+
}
330+
326331
p:first-of-type::before {
327332
font-size: calc(1rem * 5);
328333
left: 0;
@@ -342,8 +347,10 @@ div.wpnbha .article-section-title {
342347
}
343348
}
344349

345-
&[style*="border-width"] {
346-
padding-top: structure.$size__spacing-unit;
350+
&[style*="border-"] {
351+
blockquote {
352+
margin-top: 0;
353+
}
347354

348355
p:first-of-type::before,
349356
blockquote::before,

newspack-theme/sass/blocks/_blocks.scss

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -631,6 +631,13 @@ p.has-background {
631631
}
632632
}
633633

634+
// Override Gutenberg's default pullquote border color for themes that don't have a pullquote border defined.
635+
body:not(.wp-child-theme-newspack-joseph):not(.wp-child-theme-newspack-nelson) .wp-block-pullquote {
636+
&.wp-block-pullquote:not([style*='border']) {
637+
border-color: transparent !important;
638+
}
639+
}
640+
634641
//! Latest Comments
635642
.wp-block-latest-comments {
636643
padding-left: 0;

newspack-theme/sass/style-editor-base.scss

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -639,10 +639,6 @@ html :where(.wp-block)[data-align="right"] {
639639
max-width: 50%;
640640
width: 50%;
641641

642-
@include utilities.media( tablet ) {
643-
border-bottom: 0;
644-
}
645-
646642
&:not(.is-style-solid-color) {
647643
padding: 0;
648644
}

0 commit comments

Comments
 (0)