Skip to content

Commit

Permalink
Syncing twentytwentyone
Browse files Browse the repository at this point in the history
  • Loading branch information
@mboynes
mboynes committed Jun 16, 2024
1 parent f875ec1 commit 254133b
Show file tree
Hide file tree
Showing 8 changed files with 217 additions and 74 deletions.
35 changes: 22 additions & 13 deletions themes/twentytwentyone/assets/css/ie-editor.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,6 @@ blockquote strong {

blockquote:before {
content: "“";
font-size: 1.25rem;
line-height: 1.7;
position: absolute;
left: -12px;
}
Expand All @@ -194,7 +192,6 @@ blockquote .wp-block-quote__citation,
blockquote cite,
blockquote footer {
color: #28303d;
font-size: 1rem;
font-style: normal;
}
@media only screen and (max-width: 481.98px) {
Expand Down Expand Up @@ -1428,31 +1425,38 @@ pre.wp-block-preformatted {
border-left: none;
margin: 30px auto 30px 25px;
padding-left: 1em;
}

.wp-block-quote p {
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
font-size: 1.25rem;
font-style: normal;
font-weight: 700;
line-height: 1.7;
}

.wp-block-quote p {
font-family: inherit;
font-size: inherit;
font-style: inherit;
font-weight: inherit;
line-height: inherit;
letter-spacing: inherit;
}

.wp-block-quote strong {
font-weight: bolder;
}

.wp-block-quote:before {
content: "“";
font-size: 1.25rem;
line-height: 1.7;
left: 8px;
}

.wp-block-quote .wp-block-quote__citation {
color: currentColor;
font-size: 1rem;
font-style: normal;
font-family: inherit;
font-style: inherit;
font-weight: inherit;
line-height: inherit;
letter-spacing: inherit;
}

.has-background .wp-block-quote .wp-block-quote__citation,
Expand All @@ -1462,6 +1466,14 @@ pre.wp-block-preformatted {
color: currentColor;
}

.wp-block-quote:where(:not([style*=font-style])) .wp-block-quote__citation {
font-style: normal;
}

.wp-block-quote:where(:not([style*=font-weight])) .wp-block-quote__citation {
font-weight: normal;
}

.wp-block-quote.has-text-align-right {
margin: 30px 25px 30px auto;
padding-right: 0;
Expand All @@ -1474,9 +1486,6 @@ pre.wp-block-preformatted {

.wp-block-quote.has-text-align-right p:before {
content: "”";
font-size: 1.25rem;
font-weight: normal;
line-height: 1.7;
margin-right: 5px;
}

Expand Down
50 changes: 42 additions & 8 deletions themes/twentytwentyone/assets/css/ie.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1210,8 +1210,6 @@ blockquote strong {

blockquote:before {
content: "“";
font-size: 1.25rem;
line-height: 1.7;
position: absolute;
left: -12px;
}
Expand All @@ -1220,7 +1218,6 @@ blockquote .wp-block-quote__citation,
blockquote cite,
blockquote footer {
color: #28303d;
font-size: 1rem;
font-style: normal;
}
@media only screen and (max-width: 481.98px) {
Expand Down Expand Up @@ -3128,19 +3125,41 @@ pre.wp-block-preformatted {

.wp-block-quote {
border-left: none;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
font-size: 1.25rem;
font-style: normal;
font-weight: 700;
line-height: 1.7;

/**
* Block Options
*/
}

.wp-block-quote p {
font-family: inherit;
font-size: inherit;
font-style: inherit;
font-weight: inherit;
line-height: inherit;
letter-spacing: inherit;
}

.wp-block-quote:before {
content: "“";
font-size: 1.25rem;
line-height: 1.7;
left: 8px;
}

.wp-block-quote .wp-block-quote__citation,
.wp-block-quote cite,
.wp-block-quote footer {
font-family: inherit;
font-style: inherit;
font-weight: inherit;
line-height: inherit;
letter-spacing: inherit;
}

.has-background .wp-block-quote .wp-block-quote__citation,
[class*=background-color] .wp-block-quote .wp-block-quote__citation,
[style*=background-color] .wp-block-quote .wp-block-quote__citation,
Expand All @@ -3156,6 +3175,24 @@ pre.wp-block-preformatted {
color: currentColor;
}

.wp-block-quote:where(:not([style*=font-style])) .wp-block-quote__citation {
font-style: normal;
}

.wp-block-quote:where(:not([style*=font-style])) cite {
font-style: normal;
}

.wp-block-quote:where(:not([style*=font-style])) footer {
font-style: normal;
}

.wp-block-quote:where(:not([style*=font-weight])) .wp-block-quote__citation,
.wp-block-quote:where(:not([style*=font-weight])) cite,
.wp-block-quote:where(:not([style*=font-weight])) footer {
font-weight: normal;
}

.wp-block-quote.has-text-align-right {
margin: 30px 25px 30px auto;
padding-right: 0;
Expand All @@ -3168,9 +3205,6 @@ pre.wp-block-preformatted {

.wp-block-quote.has-text-align-right p:before {
content: "”";
font-size: 1.25rem;
font-weight: normal;
line-height: 1.7;
margin-right: 5px;
}

Expand Down
36 changes: 22 additions & 14 deletions themes/twentytwentyone/assets/css/style-editor.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,6 @@ blockquote cite,
blockquote footer {
font-weight: normal;
color: var(--global--color-primary);
font-size: var(--global--font-size-xs);
letter-spacing: var(--global--letter-spacing);
}

Expand Down Expand Up @@ -368,8 +367,6 @@ blockquote strong {

blockquote:before {
content: "“";
font-size: var(--quote--font-size);
line-height: var(--quote--line-height);
position: absolute;
left: calc(-0.5 * var(--global--spacing-horizontal));
}
Expand All @@ -378,7 +375,6 @@ blockquote .wp-block-quote__citation,
blockquote cite,
blockquote footer {
color: var(--global--color-primary);
font-size: var(--global--font-size-xs);
font-style: var(--quote--font-style-cite);
}
@media only screen and (max-width: 481.98px) {
Expand Down Expand Up @@ -1530,31 +1526,38 @@ pre.wp-block-preformatted {
border-left: none;
margin: var(--global--spacing-vertical) auto var(--global--spacing-vertical) var(--global--spacing-horizontal);
padding-left: 1em;
}

.wp-block-quote p {
font-family: var(--quote--font-family);
font-size: var(--quote--font-size);
font-style: var(--quote--font-style);
font-weight: var(--quote--font-weight);
line-height: var(--quote--line-height);
}

.wp-block-quote p {
font-family: inherit;
font-size: inherit;
font-style: inherit;
font-weight: inherit;
line-height: inherit;
letter-spacing: inherit;
}

.wp-block-quote strong {
font-weight: var(--quote--font-weight-strong);
}

.wp-block-quote:before {
content: "“";
font-size: var(--quote--font-size);
line-height: var(--quote--line-height);
left: 8px;
}

.wp-block-quote .wp-block-quote__citation {
color: currentColor;
font-size: var(--global--font-size-xs);
font-style: var(--quote--font-style-cite);
font-family: inherit;
font-style: inherit;
font-weight: inherit;
line-height: inherit;
letter-spacing: inherit;
}

.has-background .wp-block-quote .wp-block-quote__citation,
Expand All @@ -1564,6 +1567,14 @@ pre.wp-block-preformatted {
color: currentColor;
}

.wp-block-quote:where(:not([style*=font-style])) .wp-block-quote__citation {
font-style: var(--quote--font-style-cite);
}

.wp-block-quote:where(:not([style*=font-weight])) .wp-block-quote__citation {
font-weight: normal;
}

.wp-block-quote.has-text-align-right {
margin: var(--global--spacing-vertical) var(--global--spacing-horizontal) var(--global--spacing-vertical) auto;
padding-right: 0;
Expand All @@ -1576,9 +1587,6 @@ pre.wp-block-preformatted {

.wp-block-quote.has-text-align-right p:before {
content: "”";
font-size: var(--quote--font-size);
font-weight: normal;
line-height: var(--quote--line-height);
margin-right: 5px;
}

Expand Down
4 changes: 0 additions & 4 deletions themes/twentytwentyone/assets/sass/04-elements/blockquote.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ blockquote {
footer {
font-weight: normal;
color: var(--global--color-primary);
font-size: var(--global--font-size-xs);
letter-spacing: var(--global--letter-spacing);
}

Expand Down Expand Up @@ -57,8 +56,6 @@ blockquote {

&:before {
content: "\201C";
font-size: var(--quote--font-size);
line-height: var(--quote--line-height);
position: absolute;
left: calc(-0.5 * var(--global--spacing-horizontal));
}
Expand All @@ -67,7 +64,6 @@ blockquote {
cite,
footer {
color: var(--global--color-primary);
font-size: var(--global--font-size-xs);
font-style: var(--quote--font-style-cite);
}

Expand Down
38 changes: 26 additions & 12 deletions themes/twentytwentyone/assets/sass/05-blocks/quote/_editor.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,19 @@
border-left: none;
margin: var(--global--spacing-vertical) auto var(--global--spacing-vertical) var(--global--spacing-horizontal);
padding-left: 1em;
font-family: var(--quote--font-family);
font-size: var(--quote--font-size);
font-style: var(--quote--font-style);
font-weight: var(--quote--font-weight);
line-height: var(--quote--line-height);

p {
font-family: var(--quote--font-family);
font-size: var(--quote--font-size);
font-style: var(--quote--font-style);
font-weight: var(--quote--font-weight);
line-height: var(--quote--line-height);
font-family: inherit;
font-size: inherit;
font-style: inherit;
font-weight: inherit;
line-height: inherit;
letter-spacing: inherit;
}

strong {
Expand All @@ -18,15 +24,16 @@

&:before {
content: "\201C";
font-size: var(--quote--font-size);
line-height: var(--quote--line-height);
left: 8px;
}

.wp-block-quote__citation {
color: currentColor;
font-size: var(--global--font-size-xs);
font-style: var(--quote--font-style-cite);
font-family: inherit;
font-style: inherit;
font-weight: inherit;
line-height: inherit;
letter-spacing: inherit;

.has-background &,
[class*="background-color"] &,
Expand All @@ -36,6 +43,15 @@
}
}

&:where(:not([style*="font-style"])) .wp-block-quote__citation {
font-style: var(--quote--font-style-cite);
}

// The cite has a lighter font-weight than the rest of the quote.
&:where(:not([style*="font-weight"])) .wp-block-quote__citation {
font-weight: normal;
}

&.has-text-align-right {
margin: var(--global--spacing-vertical) var(--global--spacing-horizontal) var(--global--spacing-vertical) auto;
padding-right: 0;
Expand All @@ -49,9 +65,6 @@
// Align the quote left of the text.
p:before {
content: "\201D";
font-size: var(--quote--font-size);
font-weight: normal;
line-height: var(--quote--line-height);
margin-right: 5px;
}
}
Expand All @@ -64,6 +77,7 @@
}
}

// The large style was removed in WordPress 6.0, the CSS is kept for backwards compatibility.
&.is-large,
&.is-style-large {
padding-left: 0;
Expand Down
Loading

0 comments on commit 254133b

Please sign in to comment.