From d8bbb335cbb5e9a3efcf71a3d79e180dbc2fefab Mon Sep 17 00:00:00 2001 From: Peter Wilson Date: Wed, 24 Nov 2021 03:35:03 +0000 Subject: [PATCH] Twenty Twenty-One: Combine duplicate CSS rules. Use the postcss-merge-rules package when building TT1 stylesheets to reduce duplicate code in production CSS. Props SergeyBiryukov, ryelle, Shaharyar10, shital-patel, mukesh27, poena. Fixes #53605. Built from https://develop.svn.wordpress.org/trunk@52238 git-svn-id: http://core.svn.wordpress.org/trunk@51830 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../twentytwentyone/assets/css/ie-editor.css | 583 ++---------- .../themes/twentytwentyone/assets/css/ie.css | 871 +++--------------- .../themes/twentytwentyone/package-lock.json | 54 ++ .../themes/twentytwentyone/package.json | 1 + .../themes/twentytwentyone/postcss.config.js | 3 +- wp-includes/version.php | 2 +- 6 files changed, 306 insertions(+), 1208 deletions(-) diff --git a/wp-content/themes/twentytwentyone/assets/css/ie-editor.css b/wp-content/themes/twentytwentyone/assets/css/ie-editor.css index caaee11b38..d3bbb93c11 100644 --- a/wp-content/themes/twentytwentyone/assets/css/ie-editor.css +++ b/wp-content/themes/twentytwentyone/assets/css/ie-editor.css @@ -147,11 +147,7 @@ blockquote p { line-height: 1.7; } -blockquote cite { - font-weight: normal; - letter-spacing: normal; -} - +blockquote cite, blockquote footer { font-weight: normal; letter-spacing: normal; @@ -162,33 +158,16 @@ blockquote.alignright { padding-left: inherit; } -blockquote.alignleft p { - font-size: 1.125rem; - max-width: inherit; - width: inherit; -} - +blockquote.alignleft p, blockquote.alignright p { font-size: 1.125rem; max-width: inherit; width: inherit; } -blockquote.alignleft cite { - font-size: 1rem; - letter-spacing: normal; -} - -blockquote.alignleft footer { - font-size: 1rem; - letter-spacing: normal; -} - -blockquote.alignright cite { - font-size: 1rem; - letter-spacing: normal; -} - +blockquote.alignleft cite, +blockquote.alignleft footer, +blockquote.alignright cite, blockquote.alignright footer { font-size: 1rem; letter-spacing: normal; @@ -206,18 +185,8 @@ blockquote:before { left: -12px; } -blockquote .wp-block-quote__citation { - color: #28303d; - font-size: 1rem; - font-style: normal; -} - -blockquote cite { - color: #28303d; - font-size: 1rem; - font-style: normal; -} - +blockquote .wp-block-quote__citation, +blockquote cite, blockquote footer { color: #28303d; font-size: 1rem; @@ -236,16 +205,14 @@ blockquote footer { img { height: auto; - max-width: 100%; vertical-align: middle; } /* Classic editor images */ -.entry-content img { - max-width: 100%; -} /* Make sure embeds and iframes fit their containers. */ +img, +.entry-content img, embed, iframe, object, @@ -254,33 +221,9 @@ video { } /* Media captions */ -figcaption { - color: currentColor; - font-size: 1rem; - line-height: 1.7; - margin-top: 10px; - margin-bottom: 20px; - text-align: center; -} - -.wp-caption { - color: currentColor; - font-size: 1rem; - line-height: 1.7; - margin-top: 10px; - margin-bottom: 20px; - text-align: center; -} - -.wp-caption-text { - color: currentColor; - font-size: 1rem; - line-height: 1.7; - margin-top: 10px; - margin-bottom: 20px; - text-align: center; -} - +figcaption, +.wp-caption, +.wp-caption-text, .wp-block-embed figcaption { color: currentColor; font-size: 1rem; @@ -580,13 +523,7 @@ a:hover { color: currentColor; } -.wp-block-cover { - background-color: #000; - min-height: 450px; - margin-top: inherit; - margin-bottom: inherit; -} - +.wp-block-cover, .wp-block-cover-image { background-color: #000; min-height: 450px; @@ -629,10 +566,7 @@ a:hover { .wp-block-cover-image .wp-block-cover__inner-container, .wp-block-cover-image .wp-block-cover-image-text, .wp-block-cover-image .wp-block-cover-text, -.wp-block-cover-image .block-editor-block-list__block { - color: currentColor; -} - +.wp-block-cover-image .block-editor-block-list__block, .wp-block-cover .wp-block-cover__inner-container a, .wp-block-cover .wp-block-cover-image-text a, .wp-block-cover .wp-block-cover-text a, @@ -644,34 +578,13 @@ a:hover { color: currentColor; } -.wp-block-cover .wp-block-cover__inner-container .has-link-color a { - color: #28303d; -} - -.wp-block-cover .wp-block-cover-image-text .has-link-color a { - color: #28303d; -} - -.wp-block-cover .wp-block-cover-text .has-link-color a { - color: #28303d; -} - -.wp-block-cover .block-editor-block-list__block .has-link-color a { - color: #28303d; -} - -.wp-block-cover-image .wp-block-cover__inner-container .has-link-color a { - color: #28303d; -} - -.wp-block-cover-image .wp-block-cover-image-text .has-link-color a { - color: #28303d; -} - -.wp-block-cover-image .wp-block-cover-text .has-link-color a { - color: #28303d; -} - +.wp-block-cover .wp-block-cover__inner-container .has-link-color a, +.wp-block-cover .wp-block-cover-image-text .has-link-color a, +.wp-block-cover .wp-block-cover-text .has-link-color a, +.wp-block-cover .block-editor-block-list__block .has-link-color a, +.wp-block-cover-image .wp-block-cover__inner-container .has-link-color a, +.wp-block-cover-image .wp-block-cover-image-text .has-link-color a, +.wp-block-cover-image .wp-block-cover-text .has-link-color a, .wp-block-cover-image .block-editor-block-list__block .has-link-color a { color: #28303d; } @@ -753,10 +666,7 @@ a:hover { text-align: right; } -.wp-block-cover.is-style-twentytwentyone-border { - border: 3px solid #28303d; -} - +.wp-block-cover.is-style-twentytwentyone-border, .wp-block-cover-image.is-style-twentytwentyone-border { border: 3px solid #28303d; } @@ -1019,182 +929,46 @@ a:hover { width: 100%; } -.wp-block-heading h1 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -h1 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -.h1 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -.wp-block-heading h2 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -h2 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -.h2 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -.wp-block-heading h3 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -h3 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -.h3 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -.wp-block-heading h4 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -h4 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -.h4 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -.wp-block-heading h5 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -h5 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -.h5 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -.wp-block-heading h6 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -h6 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - +.wp-block-heading h1, +h1, +.h1, +.wp-block-heading h2, +h2, +.h2, +.wp-block-heading h3, +h3, +.h3, +.wp-block-heading h4, +h4, +.h4, +.wp-block-heading h5, +h5, +.h5, +.wp-block-heading h6, +h6, .h6 { clear: both; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; font-weight: normal; } -.wp-block-heading h1 strong { - font-weight: 600; -} - -h1 strong { - font-weight: 600; -} - -.h1 strong { - font-weight: 600; -} - -.wp-block-heading h2 strong { - font-weight: 600; -} - -h2 strong { - font-weight: 600; -} - -.h2 strong { - font-weight: 600; -} - -.wp-block-heading h3 strong { - font-weight: 600; -} - -h3 strong { - font-weight: 600; -} - -.h3 strong { - font-weight: 600; -} - -.wp-block-heading h4 strong { - font-weight: 600; -} - -h4 strong { - font-weight: 600; -} - -.h4 strong { - font-weight: 600; -} - -.wp-block-heading h5 strong { - font-weight: 600; -} - -h5 strong { - font-weight: 600; -} - -.h5 strong { - font-weight: 600; -} - -.wp-block-heading h6 strong { - font-weight: 600; -} - -h6 strong { - font-weight: 600; -} - +.wp-block-heading h1 strong, +h1 strong, +.h1 strong, +.wp-block-heading h2 strong, +h2 strong, +.h2 strong, +.wp-block-heading h3 strong, +h3 strong, +.h3 strong, +.wp-block-heading h4 strong, +h4 strong, +.h4 strong, +.wp-block-heading h5 strong, +h5 strong, +.h5 strong, +.wp-block-heading h6 strong, +h6 strong, .h6 strong { font-weight: 600; } @@ -1388,20 +1162,8 @@ h3 { } } -.wp-block-heading h4 { - font-size: 1.5rem; - font-weight: 600; - letter-spacing: normal; - line-height: 1.3; -} - -h4 { - font-size: 1.5rem; - font-weight: 600; - letter-spacing: normal; - line-height: 1.3; -} - +.wp-block-heading h4, +h4, .h4 { font-size: 1.5rem; font-weight: 600; @@ -1409,20 +1171,8 @@ h4 { line-height: 1.3; } -.wp-block-heading h5 { - font-size: 1.125rem; - font-weight: 600; - letter-spacing: 0.05em; - line-height: 1.3; -} - -h5 { - font-size: 1.125rem; - font-weight: 600; - letter-spacing: 0.05em; - line-height: 1.3; -} - +.wp-block-heading h5, +h5, .h5 { font-size: 1.125rem; font-weight: 600; @@ -1430,20 +1180,8 @@ h5 { line-height: 1.3; } -.wp-block-heading h6 { - font-size: 1rem; - font-weight: 600; - letter-spacing: 0.05em; - line-height: 1.3; -} - -h6 { - font-size: 1rem; - font-weight: 600; - letter-spacing: 0.05em; - line-height: 1.3; -} - +.wp-block-heading h6, +h6, .h6 { font-size: 1rem; font-weight: 600; @@ -1468,10 +1206,7 @@ h6 { } /* Block Styles */ -.wp-block-image.is-style-twentytwentyone-border img { - border: 3px solid #28303d; -} - +.wp-block-image.is-style-twentytwentyone-border img, .wp-block-image.is-style-twentytwentyone-image-frame img { border: 3px solid #28303d; } @@ -1480,10 +1215,7 @@ h6 { padding: 20px; } -.wp-block-latest-comments { - padding-left: 0; -} - +.wp-block-latest-comments, .wp-block-latest-posts { padding-left: 0; } @@ -1559,13 +1291,7 @@ h6 { color: currentColor; } -.wp-block-latest-posts .wp-block-latest-posts__post-excerpt { - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-size: 1.125rem; - line-height: 1.7; - margin-top: 20px; -} - +.wp-block-latest-posts .wp-block-latest-posts__post-excerpt, .wp-block-latest-posts .wp-block-latest-posts__post-full-content { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; font-size: 1.125rem; @@ -1693,12 +1419,7 @@ h6 { display: block; } -ul { - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - margin: 30px 0; - padding-left: 50px; -} - +ul, ol { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; margin: 30px 0; @@ -1842,18 +1563,8 @@ pre.wp-block-preformatted { color: currentColor; } -.wp-block-pullquote .wp-block-pullquote__citation { - font-size: 1rem; - font-style: normal; - text-transform: none; -} - -.wp-block-pullquote cite { - font-size: 1rem; - font-style: normal; - text-transform: none; -} - +.wp-block-pullquote .wp-block-pullquote__citation, +.wp-block-pullquote cite, .wp-block-pullquote footer { font-size: 1rem; font-style: normal; @@ -1883,12 +1594,7 @@ pre.wp-block-preformatted { text-align: left; } -.wp-block-pullquote.is-style-solid-color.alignleft blockquote { - padding-left: 20px; - padding-right: 20px; - max-width: inherit; -} - +.wp-block-pullquote.is-style-solid-color.alignleft blockquote, .wp-block-pullquote.is-style-solid-color.alignright blockquote { padding-left: 20px; padding-right: 20px; @@ -2002,14 +1708,7 @@ pre.wp-block-preformatted { display: none; } -.wp-block-quote.is-large { - padding-left: 0; - - /* Resetting margins to match _block-container.scss */ - margin-top: 30px; - margin-bottom: 30px; -} - +.wp-block-quote.is-large, .wp-block-quote.is-style-large { padding-left: 0; @@ -2100,10 +1799,7 @@ pre.wp-block-preformatted { } @media only screen and (max-width: 481px) { - .wp-block-quote.is-large { - padding-left: 25px; - } - + .wp-block-quote.is-large, .wp-block-quote.is-style-large { padding-left: 25px; } @@ -2113,11 +1809,7 @@ pre.wp-block-preformatted { left: 0; } - .wp-block-quote.is-large.has-text-align-right { - padding-left: 0; - padding-right: 25px; - } - + .wp-block-quote.is-large.has-text-align-right, .wp-block-quote.is-style-large.has-text-align-right { padding-left: 0; padding-right: 25px; @@ -2250,13 +1942,7 @@ pre.wp-block-preformatted { color: currentColor; } -.wp-block-rss .wp-block-rss__item-excerpt { - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-size: 1.125rem; - line-height: 1.7; - margin-top: 20px; -} - +.wp-block-rss .wp-block-rss__item-excerpt, .wp-block-rss .wp-block-rss__item-full-content { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; font-size: 1.125rem; @@ -2299,17 +1985,7 @@ pre.wp-block-preformatted { margin-bottom: 10px; } -.wp-block-search.wp-block-search__button-inside .wp-block-search__inside-wrapper { - border: 3px solid #39414d; - border-radius: 0; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-size: 1.125rem; - line-height: 1.7; - max-width: inherit; - margin-right: -3px; - padding: 10px; -} - +.wp-block-search.wp-block-search__button-inside .wp-block-search__inside-wrapper, .wp-block-search .wp-block-search__input { border: 3px solid #39414d; border-radius: 0; @@ -2321,18 +1997,12 @@ pre.wp-block-preformatted { padding: 10px; } -.is-dark-theme .wp-block-search.wp-block-search__button-inside .wp-block-search__inside-wrapper { - background: rgba(255, 255, 255, 0.9); -} - +.is-dark-theme .wp-block-search.wp-block-search__button-inside .wp-block-search__inside-wrapper, .is-dark-theme .wp-block-search .wp-block-search__input { background: rgba(255, 255, 255, 0.9); } -.has-background .wp-block-search.wp-block-search__button-inside .wp-block-search__inside-wrapper { - border-color: #28303d !important; -} - +.has-background .wp-block-search.wp-block-search__button-inside .wp-block-search__inside-wrapper, .has-background .wp-block-search .wp-block-search__input { border-color: #28303d !important; } @@ -2438,10 +2108,7 @@ pre.wp-block-preformatted { color: #28303d; } -.is-dark-theme .wp-block-search.wp-block-search__button-inside.wp-block-search__text-button .wp-block-search__button { - color: #28303d; -} - +.is-dark-theme .wp-block-search.wp-block-search__button-inside.wp-block-search__text-button .wp-block-search__button, .is-dark-theme .wp-block-search.wp-block-search__button-inside.wp-block-search__icon-button .wp-block-search__button { color: #28303d; } @@ -2468,12 +2135,7 @@ pre.wp-block-preformatted { justify-content: center; } -.wp-block-separator { - border-bottom: 1px solid #28303d; - clear: both; - opacity: 1; -} - +.wp-block-separator, hr { border-bottom: 1px solid #28303d; clear: both; @@ -2535,10 +2197,7 @@ hr:not(.is-style-dots) { max-width: inherit; } -.wp-block-separator.is-style-twentytwentyone-separator-thick { - border-bottom-width: 3px; -} - +.wp-block-separator.is-style-twentytwentyone-separator-thick, hr.is-style-twentytwentyone-separator-thick { border-bottom-width: 3px; } @@ -2601,74 +2260,32 @@ table tfoot, text-align: center; } -table th { - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; -} - +table th, .wp-block-table th { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; } -table td { - padding: 10px; -} - -table th { - padding: 10px; -} - -.wp-block-table td { - padding: 10px; -} - +table td, +table th, +.wp-block-table td, .wp-block-table th { padding: 10px; } -table.is-style-regular .has-background { - color: #28303d; -} - -table.is-style-stripes .has-background { - color: #28303d; -} - -table.is-style-stripes .has-background thead tr { - color: #28303d; -} - -table.is-style-stripes .has-background tfoot tr { - color: #28303d; -} - -table.is-style-stripes .has-background tbody tr { - color: #28303d; -} - -.wp-block-table.is-style-regular .has-background { - color: #28303d; -} - -.wp-block-table.is-style-stripes .has-background { - color: #28303d; -} - -.wp-block-table.is-style-stripes .has-background thead tr { - color: #28303d; -} - -.wp-block-table.is-style-stripes .has-background tfoot tr { - color: #28303d; -} - +table.is-style-regular .has-background, +table.is-style-stripes .has-background, +table.is-style-stripes .has-background thead tr, +table.is-style-stripes .has-background tfoot tr, +table.is-style-stripes .has-background tbody tr, +.wp-block-table.is-style-regular .has-background, +.wp-block-table.is-style-stripes .has-background, +.wp-block-table.is-style-stripes .has-background thead tr, +.wp-block-table.is-style-stripes .has-background tfoot tr, .wp-block-table.is-style-stripes .has-background tbody tr { color: #28303d; } -table.is-style-stripes { - border-color: #f0f0f0; -} - +table.is-style-stripes, .wp-block-table.is-style-stripes { border-color: #f0f0f0; } @@ -3065,20 +2682,23 @@ pre.wp-block-verse { } html { - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; line-height: 1.7; } +html, body { - color: #28303d; - background-color: #d1e4dd; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; +} + +body { + background-color: #d1e4dd; font-size: 1.25rem; font-weight: normal; -moz-osx-font-smoothing: grayscale; -webkit-font-smoothing: antialiased; } +body, .wp-block a { color: #28303d; } @@ -3092,10 +2712,7 @@ body { text-decoration: none; } -.has-background .has-link-color a { - color: #28303d; -} - +.has-background .has-link-color a, .has-background.has-link-color a { color: #28303d; } diff --git a/wp-content/themes/twentytwentyone/assets/css/ie.css b/wp-content/themes/twentytwentyone/assets/css/ie.css index 2dd396d65c..969aa13750 100644 --- a/wp-content/themes/twentytwentyone/assets/css/ie.css +++ b/wp-content/themes/twentytwentyone/assets/css/ie.css @@ -808,13 +808,7 @@ template { @media only screen and (min-width: 482px) { - .alignfull { - max-width: 100%; - width: auto; - margin-left: auto; - margin-right: auto; - } - + .alignfull, .full-max-width { max-width: 100%; width: auto; @@ -959,27 +953,9 @@ template { * Top Level Wrappers (header, main, footer) * - Set vertical padding and horizontal margins */ -.site-header { - padding-top: 30px; - padding-bottom: 30px; - margin-left: auto; - margin-right: auto; -} - -.site-main { - padding-top: 30px; - padding-bottom: 30px; - margin-left: auto; - margin-right: auto; -} - -.widget-area { - padding-top: 30px; - padding-bottom: 30px; - margin-left: auto; - margin-right: auto; -} - +.site-header, +.site-main, +.widget-area, .site-footer { padding-top: 30px; padding-bottom: 30px; @@ -1031,34 +1007,10 @@ template { * Block & non-gutenberg content wrappers * - Set margins */ -.entry-header { - margin-top: 30px; - margin-right: auto; - margin-bottom: 30px; - margin-left: auto; -} - -.post-thumbnail { - margin-top: 30px; - margin-right: auto; - margin-bottom: 30px; - margin-left: auto; -} - -.entry-content { - margin-top: 30px; - margin-right: auto; - margin-bottom: 30px; - margin-left: auto; -} - -.entry-footer { - margin-top: 30px; - margin-right: auto; - margin-bottom: 30px; - margin-left: auto; -} - +.entry-header, +.post-thumbnail, +.entry-content, +.entry-footer, .author-bio { margin-top: 30px; margin-right: auto; @@ -1365,11 +1317,7 @@ blockquote p { line-height: 1.7; } -blockquote cite { - font-weight: normal; - letter-spacing: normal; -} - +blockquote cite, blockquote footer { font-weight: normal; letter-spacing: normal; @@ -1380,33 +1328,16 @@ blockquote.alignright { padding-left: inherit; } -blockquote.alignleft p { - font-size: 1.125rem; - max-width: inherit; - width: inherit; -} - +blockquote.alignleft p, blockquote.alignright p { font-size: 1.125rem; max-width: inherit; width: inherit; } -blockquote.alignleft cite { - font-size: 1rem; - letter-spacing: normal; -} - -blockquote.alignleft footer { - font-size: 1rem; - letter-spacing: normal; -} - -blockquote.alignright cite { - font-size: 1rem; - letter-spacing: normal; -} - +blockquote.alignleft cite, +blockquote.alignleft footer, +blockquote.alignright cite, blockquote.alignright footer { font-size: 1rem; letter-spacing: normal; @@ -1424,18 +1355,8 @@ blockquote:before { left: -12px; } -blockquote .wp-block-quote__citation { - color: #28303d; - font-size: 1rem; - font-style: normal; -} - -blockquote cite { - color: #28303d; - font-size: 1rem; - font-style: normal; -} - +blockquote .wp-block-quote__citation, +blockquote cite, blockquote footer { color: #28303d; font-size: 1rem; @@ -2084,16 +2005,14 @@ fieldset input[type=checkbox] + label { img { height: auto; - max-width: 100%; vertical-align: middle; } /* Classic editor images */ -.entry-content img { - max-width: 100%; -} /* Make sure embeds and iframes fit their containers. */ +img, +.entry-content img, embed, iframe, object, @@ -2102,33 +2021,9 @@ video { } /* Media captions */ -figcaption { - color: currentColor; - font-size: 1rem; - line-height: 1.7; - margin-top: 10px; - margin-bottom: 20px; - text-align: center; -} - -.wp-caption { - color: currentColor; - font-size: 1rem; - line-height: 1.7; - margin-top: 10px; - margin-bottom: 20px; - text-align: center; -} - -.wp-caption-text { - color: currentColor; - font-size: 1rem; - line-height: 1.7; - margin-top: 10px; - margin-bottom: 20px; - text-align: center; -} - +figcaption, +.wp-caption, +.wp-caption-text, .wp-block-embed figcaption { color: currentColor; font-size: 1rem; @@ -2242,10 +2137,7 @@ a:hover { outline: 2px dotted #28303d; } -.has-background .has-link-color a { - color: #28303d; -} - +.has-background .has-link-color a, .has-background.has-link-color a { color: #28303d; } @@ -2259,18 +2151,7 @@ a:hover { /** * Button */ -.site .button { - border: 3px solid transparent; - border-radius: 0; - cursor: pointer; - font-weight: 500; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-size: 1.25rem; - line-height: 1.5; - padding: 15px 30px; - text-decoration: none; -} - +.site .button, button { border: 3px solid transparent; border-radius: 0; @@ -2307,30 +2188,8 @@ input[type=reset] { text-decoration: none; } -.wp-block-search .wp-block-search__button { - border: 3px solid transparent; - border-radius: 0; - cursor: pointer; - font-weight: 500; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-size: 1.25rem; - line-height: 1.5; - padding: 15px 30px; - text-decoration: none; -} - -.wp-block-button .wp-block-button__link { - border: 3px solid transparent; - border-radius: 0; - cursor: pointer; - font-weight: 500; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-size: 1.25rem; - line-height: 1.5; - padding: 15px 30px; - text-decoration: none; -} - +.wp-block-search .wp-block-search__button, +.wp-block-button .wp-block-button__link, .wp-block-file a.wp-block-file__button { border: 3px solid transparent; border-radius: 0; @@ -2819,21 +2678,7 @@ input[type=reset]:disabled { padding-right: 20px; } -.wp-block-cover { - background-color: #000; - min-height: 450px; - margin-top: inherit; - margin-bottom: inherit; - - /* default & custom background-color */ - - /* Treating H2 separately to account for legacy /core styles */ - - /* Block Styles */ - - /* The background color class is used just for the overlay, and does not need to be applied to the inner container. */ -} - +.wp-block-cover, .wp-block-cover-image { background-color: #000; min-height: 450px; @@ -2860,36 +2705,11 @@ input[type=reset]:disabled { margin-bottom: 0; } -.wp-block-cover .wp-block-cover__inner-container { - color: currentColor; - margin-top: 30px; - margin-bottom: 30px; -} - -.wp-block-cover .wp-block-cover-image-text { - color: currentColor; - margin-top: 30px; - margin-bottom: 30px; -} - -.wp-block-cover .wp-block-cover-text { - color: currentColor; - margin-top: 30px; - margin-bottom: 30px; -} - -.wp-block-cover-image .wp-block-cover__inner-container { - color: currentColor; - margin-top: 30px; - margin-bottom: 30px; -} - -.wp-block-cover-image .wp-block-cover-image-text { - color: currentColor; - margin-top: 30px; - margin-bottom: 30px; -} - +.wp-block-cover .wp-block-cover__inner-container, +.wp-block-cover .wp-block-cover-image-text, +.wp-block-cover .wp-block-cover-text, +.wp-block-cover-image .wp-block-cover__inner-container, +.wp-block-cover-image .wp-block-cover-image-text, .wp-block-cover-image .wp-block-cover-text { color: currentColor; margin-top: 30px; @@ -2905,26 +2725,11 @@ input[type=reset]:disabled { color: currentColor; } -.wp-block-cover .wp-block-cover__inner-container .has-link-color a { - color: #28303d; -} - -.wp-block-cover .wp-block-cover-image-text .has-link-color a { - color: #28303d; -} - -.wp-block-cover .wp-block-cover-text .has-link-color a { - color: #28303d; -} - -.wp-block-cover-image .wp-block-cover__inner-container .has-link-color a { - color: #28303d; -} - -.wp-block-cover-image .wp-block-cover-image-text .has-link-color a { - color: #28303d; -} - +.wp-block-cover .wp-block-cover__inner-container .has-link-color a, +.wp-block-cover .wp-block-cover-image-text .has-link-color a, +.wp-block-cover .wp-block-cover-text .has-link-color a, +.wp-block-cover-image .wp-block-cover__inner-container .has-link-color a, +.wp-block-cover-image .wp-block-cover-image-text .has-link-color a, .wp-block-cover-image .wp-block-cover-text .has-link-color a { color: #28303d; } @@ -2998,10 +2803,7 @@ input[type=reset]:disabled { text-align: right; } -.wp-block-cover .wp-block-cover__inner-container { - width: calc(100% - 60px); -} - +.wp-block-cover .wp-block-cover__inner-container, .wp-block-cover-image .wp-block-cover__inner-container { width: calc(100% - 60px); } @@ -3084,10 +2886,7 @@ input[type=reset]:disabled { justify-content: center; } -.wp-block-cover.is-style-twentytwentyone-border { - border: 3px solid #28303d; -} - +.wp-block-cover.is-style-twentytwentyone-border, .wp-block-cover-image.is-style-twentytwentyone-border { border: 3px solid #28303d; } @@ -3111,30 +2910,19 @@ input[type=reset]:disabled { margin: 0 auto; } -.wp-block-gallery .blocks-gallery-image { - width: calc(50% - 10px); -} - +.wp-block-gallery .blocks-gallery-image, .wp-block-gallery .blocks-gallery-item { width: calc(50% - 10px); } -.wp-block-gallery .blocks-gallery-image figcaption { - margin: 0; - color: #fff; - font-size: 1rem; -} - +.wp-block-gallery .blocks-gallery-image figcaption, .wp-block-gallery .blocks-gallery-item figcaption { margin: 0; color: #fff; font-size: 1rem; } -.wp-block-gallery .blocks-gallery-image figcaption a { - color: #fff; -} - +.wp-block-gallery .blocks-gallery-image figcaption a, .wp-block-gallery .blocks-gallery-item figcaption a { color: #fff; } @@ -3233,122 +3021,34 @@ input[type=reset]:disabled { margin-left: -30px; } -h1 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -.h1 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -h2 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -.h2 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -h3 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -.h3 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -h4 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -.h4 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -h5 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -.h5 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - -h6 { - clear: both; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-weight: normal; -} - +h1, +.h1, +h2, +.h2, +h3, +.h3, +h4, +.h4, +h5, +.h5, +h6, .h6 { clear: both; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; font-weight: normal; } -h1 strong { - font-weight: 600; -} - -.h1 strong { - font-weight: 600; -} - -h2 strong { - font-weight: 600; -} - -.h2 strong { - font-weight: 600; -} - -h3 strong { - font-weight: 600; -} - -.h3 strong { - font-weight: 600; -} - -h4 strong { - font-weight: 600; -} - -.h4 strong { - font-weight: 600; -} - -h5 strong { - font-weight: 600; -} - -.h5 strong { - font-weight: 600; -} - -h6 strong { - font-weight: 600; -} - +h1 strong, +.h1 strong, +h2 strong, +.h2 strong, +h3 strong, +.h3 strong, +h4 strong, +.h4 strong, +h5 strong, +.h5 strong, +h6 strong, .h6 strong { font-weight: 600; } @@ -3431,13 +3131,7 @@ h3 { } } -h4 { - font-size: 1.5rem; - font-weight: 600; - letter-spacing: normal; - line-height: 1.3; -} - +h4, .h4 { font-size: 1.5rem; font-weight: 600; @@ -3445,13 +3139,7 @@ h4 { line-height: 1.3; } -h5 { - font-size: 1.125rem; - font-weight: 600; - letter-spacing: 0.05em; - line-height: 1.3; -} - +h5, .h5 { font-size: 1.125rem; font-weight: 600; @@ -3459,13 +3147,7 @@ h5 { line-height: 1.3; } -h6 { - font-size: 1rem; - font-weight: 600; - letter-spacing: 0.05em; - line-height: 1.3; -} - +h6, .h6 { font-size: 1rem; font-weight: 600; @@ -3509,10 +3191,7 @@ h6 { margin-top: 0; } -.wp-block-image.is-style-twentytwentyone-border img { - border: 3px solid #28303d; -} - +.wp-block-image.is-style-twentytwentyone-border img, .wp-block-image.is-style-twentytwentyone-image-frame img { border: 3px solid #28303d; } @@ -3671,13 +3350,7 @@ h6 { color: currentColor; } -.wp-block-latest-posts .wp-block-latest-posts__post-excerpt { - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-size: 1.125rem; - line-height: 1.7; - margin-top: 20px; -} - +.wp-block-latest-posts .wp-block-latest-posts__post-excerpt, .wp-block-latest-posts .wp-block-latest-posts__post-full-content { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; font-size: 1.125rem; @@ -3827,12 +3500,7 @@ figure.wp-caption a:focus img { outline-offset: 2px; } -ul { - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - margin: 0; - padding-left: 50px; -} - +ul, ol { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; margin: 0; @@ -3840,16 +3508,16 @@ ol { } ul.aligncenter, -ol.aligncenter { +ol.aligncenter, +ul.alignright, +ol.alignright { list-style-position: inside; padding: 0; } ul.alignright, ol.alignright { - list-style-position: inside; text-align: right; - padding: 0; } ul { @@ -4110,22 +3778,8 @@ pre.wp-block-preformatted { color: currentColor; } -.wp-block-pullquote .wp-block-pullquote__citation { - color: currentColor; - display: block; - font-size: 1rem; - font-style: normal; - text-transform: none; -} - -.wp-block-pullquote cite { - color: currentColor; - display: block; - font-size: 1rem; - font-style: normal; - text-transform: none; -} - +.wp-block-pullquote .wp-block-pullquote__citation, +.wp-block-pullquote cite, .wp-block-pullquote footer { color: currentColor; display: block; @@ -4222,10 +3876,7 @@ pre.wp-block-preformatted { color: currentColor; } -.wp-block-pullquote.is-style-solid-color.alignleft { - padding: 20px; -} - +.wp-block-pullquote.is-style-solid-color.alignleft, .wp-block-pullquote.is-style-solid-color.alignright { padding: 20px; } @@ -4301,15 +3952,7 @@ pre.wp-block-preformatted { display: none; } -.wp-block-quote.is-large { - padding-left: 0; - padding-right: 0; - - /* Resetting margins to match _block-container.scss */ - margin-top: 30px; - margin-bottom: 30px; -} - +.wp-block-quote.is-large, .wp-block-quote.is-style-large { padding-left: 0; padding-right: 0; @@ -4400,41 +4043,18 @@ pre.wp-block-preformatted { } } -.wp-block-quote.is-large .wp-block-quote__citation { - color: #28303d; - font-size: 1.125rem; -} - -.wp-block-quote.is-large cite { - color: #28303d; - font-size: 1.125rem; -} - -.wp-block-quote.is-large footer { - color: #28303d; - font-size: 1.125rem; -} - -.wp-block-quote.is-style-large .wp-block-quote__citation { - color: #28303d; - font-size: 1.125rem; -} - -.wp-block-quote.is-style-large cite { - color: #28303d; - font-size: 1.125rem; -} - +.wp-block-quote.is-large .wp-block-quote__citation, +.wp-block-quote.is-large cite, +.wp-block-quote.is-large footer, +.wp-block-quote.is-style-large .wp-block-quote__citation, +.wp-block-quote.is-style-large cite, .wp-block-quote.is-style-large footer { color: #28303d; font-size: 1.125rem; } @media only screen and (max-width: 481px) { - .wp-block-quote.is-large { - padding-left: 25px; - } - + .wp-block-quote.is-large, .wp-block-quote.is-style-large { padding-left: 25px; } @@ -4444,11 +4064,7 @@ pre.wp-block-preformatted { left: 0; } - .wp-block-quote.is-large.has-text-align-right { - padding-left: 0; - padding-right: 25px; - } - + .wp-block-quote.is-large.has-text-align-right, .wp-block-quote.is-style-large.has-text-align-right { padding-left: 0; padding-right: 25px; @@ -4464,13 +4080,13 @@ pre.wp-block-preformatted { padding-left: 0; padding-right: 0; } -} -@media only screen and (max-width: 481px) { .wp-block-quote.has-text-align-right { padding-left: 0; padding-right: 13px; } +} +@media only screen and (max-width: 481px) { .wp-block-quote.has-text-align-right:before { right: 0; @@ -4569,13 +4185,7 @@ pre.wp-block-preformatted { color: currentColor; } -.wp-block-rss .wp-block-rss__item-excerpt { - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - font-size: 1.125rem; - line-height: 1.7; - margin-top: 20px; -} - +.wp-block-rss .wp-block-rss__item-excerpt, .wp-block-rss .wp-block-rss__item-full-content { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; font-size: 1.125rem; @@ -4724,14 +4334,17 @@ pre.wp-block-preformatted { hr { border-style: none; - border-bottom: 1px solid #28303d; clear: both; margin-left: auto; margin-right: auto; } +hr, hr.wp-block-separator { border-bottom: 1px solid #28303d; +} + +hr.wp-block-separator { opacity: 1; /** @@ -4848,88 +4461,39 @@ table tfoot, text-align: center; } -table th { - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; -} - +table th, .wp-block-table th { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; } -table td { - padding: 10px; - border: 1px solid; -} - -table th { - padding: 10px; - border: 1px solid; -} - -.wp-block-table td { - padding: 10px; - border: 1px solid; -} - +table td, +table th, +.wp-block-table td, .wp-block-table th { padding: 10px; border: 1px solid; } -table figcaption { - color: #28303d; - font-size: 1rem; -} - +table figcaption, .wp-block-table figcaption { color: #28303d; font-size: 1rem; } -table.is-style-regular .has-background { - color: #28303d; -} - -table.is-style-stripes .has-background { - color: #28303d; -} - -table.is-style-stripes .has-background thead tr { - color: #28303d; -} - -table.is-style-stripes .has-background tfoot tr { - color: #28303d; -} - -table.is-style-stripes .has-background tbody tr { - color: #28303d; -} - -.wp-block-table.is-style-regular .has-background { - color: #28303d; -} - -.wp-block-table.is-style-stripes .has-background { - color: #28303d; -} - -.wp-block-table.is-style-stripes .has-background thead tr { - color: #28303d; -} - -.wp-block-table.is-style-stripes .has-background tfoot tr { - color: #28303d; -} - +table.is-style-regular .has-background, +table.is-style-stripes .has-background, +table.is-style-stripes .has-background thead tr, +table.is-style-stripes .has-background tfoot tr, +table.is-style-stripes .has-background tbody tr, +.wp-block-table.is-style-regular .has-background, +.wp-block-table.is-style-stripes .has-background, +.wp-block-table.is-style-stripes .has-background thead tr, +.wp-block-table.is-style-stripes .has-background tfoot tr, .wp-block-table.is-style-stripes .has-background tbody tr { color: #28303d; } -table.is-style-stripes { - border-color: #f0f0f0; -} - +table.is-style-stripes, .wp-block-table.is-style-stripes { border-color: #f0f0f0; } @@ -5304,13 +4868,11 @@ table.wp-calendar-table caption { /** * .alignwide */ -.alignwide { - clear: both; -} /** * .alignfull */ +.alignwide, .alignfull { clear: both; } @@ -5723,10 +5285,7 @@ h1.entry-title { /** * Entry Content */ -.entry-content { - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; -} - +.entry-content, .entry-summary { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; } @@ -5911,10 +5470,7 @@ body:not(.single) .site-main > article:last-of-type .entry-footer { } } -h1.page-title { - font-weight: 300; -} - +h1.page-title, h2.page-title { font-weight: 300; } @@ -5928,74 +5484,26 @@ h1.page-title { padding-bottom: 60px; } -.archive .content-area .format-aside .entry-content { - font-size: 1.5rem; -} - -.archive .content-area .format-status .entry-content { - font-size: 1.5rem; -} - -.archive .content-area .format-link .entry-content { - font-size: 1.5rem; -} - -.search .content-area .format-aside .entry-content { - font-size: 1.5rem; -} - -.search .content-area .format-status .entry-content { - font-size: 1.5rem; -} - -.search .content-area .format-link .entry-content { - font-size: 1.5rem; -} - -.blog .content-area .format-aside .entry-content { - font-size: 1.5rem; -} - -.blog .content-area .format-status .entry-content { - font-size: 1.5rem; -} - +.archive .content-area .format-aside .entry-content, +.archive .content-area .format-status .entry-content, +.archive .content-area .format-link .entry-content, +.search .content-area .format-aside .entry-content, +.search .content-area .format-status .entry-content, +.search .content-area .format-link .entry-content, +.blog .content-area .format-aside .entry-content, +.blog .content-area .format-status .entry-content, .blog .content-area .format-link .entry-content { font-size: 1.5rem; } -.archive .format-image .entry-content { - margin-top: 60px; -} - -.archive .format-gallery .entry-content { - margin-top: 60px; -} - -.archive .format-video .entry-content { - margin-top: 60px; -} - -.search .format-image .entry-content { - margin-top: 60px; -} - -.search .format-gallery .entry-content { - margin-top: 60px; -} - -.search .format-video .entry-content { - margin-top: 60px; -} - -.blog .format-image .entry-content { - margin-top: 60px; -} - -.blog .format-gallery .entry-content { - margin-top: 60px; -} - +.archive .format-image .entry-content, +.archive .format-gallery .entry-content, +.archive .format-video .entry-content, +.search .format-image .entry-content, +.search .format-gallery .entry-content, +.search .format-video .entry-content, +.blog .format-image .entry-content, +.blog .format-gallery .entry-content, .blog .format-video .entry-content { margin-top: 60px; } @@ -6009,14 +5517,8 @@ h1.page-title { display: block; } -.archive.logged-in .entry-footer .posted-on { - margin-right: 10px; -} - -.search.logged-in .entry-footer .posted-on { - margin-right: 10px; -} - +.archive.logged-in .entry-footer .posted-on, +.search.logged-in .entry-footer .posted-on, .blog.logged-in .entry-footer .posted-on { margin-right: 10px; } @@ -6142,10 +5644,7 @@ h1.page-title { @media only screen and (min-width: 482px) { - .comment-list .depth-2 { - padding-left: 100px; - } - + .comment-list .depth-2, .comment-list .depth-3 { padding-left: 100px; } @@ -6208,10 +5707,7 @@ h1.page-title { display: none; } -.pingback .url { - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; -} - +.pingback .url, .trackback .url { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; } @@ -6234,11 +5730,7 @@ h1.page-title { word-wrap: break-word; } -.pingback .comment-body { - margin-top: 30px; - margin-bottom: 30px; -} - +.pingback .comment-body, .trackback .comment-body { margin-top: 30px; margin-bottom: 30px; @@ -6992,12 +6484,12 @@ h1.page-title { } /* Next/Previous navigation */ -.navigation { +.navigation, +.navigation a { color: #28303d; } .navigation a { - color: #28303d; text-decoration: none; } @@ -7037,13 +6529,7 @@ h1.page-title { flex-wrap: wrap; } - .navigation .nav-links .nav-next { - flex: 0 1 auto; - margin-bottom: inherit; - margin-top: inherit; - max-width: calc(50% - 10px); - } - + .navigation .nav-links .nav-next, .navigation .nav-links .nav-previous { flex: 0 1 auto; margin-bottom: inherit; @@ -7063,21 +6549,13 @@ h1.page-title { position: relative; } -.navigation .nav-previous .svg-icon { - top: -2px; - margin-right: 5px; -} - +.navigation .nav-previous .svg-icon, .navigation .prev .svg-icon { top: -2px; margin-right: 5px; } -.navigation .nav-next .svg-icon { - top: -1px; - margin-left: 5px; -} - +.navigation .nav-next .svg-icon, .navigation .next .svg-icon { top: -1px; margin-left: 5px; @@ -7118,11 +6596,7 @@ h1.page-title { } } -.post-navigation .nav-next { - margin-top: 30px; - margin-bottom: 30px; -} - +.post-navigation .nav-next, .post-navigation .nav-previous { margin-top: 30px; margin-bottom: 30px; @@ -7138,12 +6612,7 @@ h1.page-title { margin-bottom: 0; } -.pagination { - border-top: 3px solid #28303d; - padding-top: 30px; - margin: 30px auto; -} - +.pagination, .comments-pagination { border-top: 3px solid #28303d; padding-top: 30px; @@ -7151,19 +6620,13 @@ h1.page-title { } @media only screen and (min-width: 822px) { - .pagination { - margin: 30px auto; - } - + .pagination, .comments-pagination { margin: 30px auto; } } -.pagination .nav-links { - margin-top: -30px; -} - +.pagination .nav-links, .comments-pagination .nav-links { margin-top: -30px; } @@ -7360,31 +6823,11 @@ h1.page-title { clear: both; } -.widget h1 { - font-weight: 700; - line-height: 1.4; -} - -.widget h2 { - font-weight: 700; - line-height: 1.4; -} - -.widget h3 { - font-weight: 700; - line-height: 1.4; -} - -.widget h4 { - font-weight: 700; - line-height: 1.4; -} - -.widget h5 { - font-weight: 700; - line-height: 1.4; -} - +.widget h1, +.widget h2, +.widget h3, +.widget h4, +.widget h5, .widget h6 { font-weight: 700; line-height: 1.4; @@ -7398,18 +6841,9 @@ h1.page-title { font-size: 1.125rem; } -.widget h3 { - font-size: 1rem; -} - -.widget h4 { - font-size: 1rem; -} - -.widget h5 { - font-size: 1rem; -} - +.widget h3, +.widget h4, +.widget h5, .widget h6 { font-size: 1rem; } @@ -7423,10 +6857,7 @@ h1.page-title { line-height: 1.9; } -.widget ul.sub-menu { - margin-left: 13px; -} - +.widget ul.sub-menu, .widget ul.children { margin-left: 13px; } @@ -7854,14 +7285,8 @@ h1.page-title { background: linear-gradient(160deg, #e4d1d1, #d1d1e4); } -header * { - max-width: unset; -} - -main * { - max-width: unset; -} - +header *, +main *, footer * { max-width: unset; } diff --git a/wp-content/themes/twentytwentyone/package-lock.json b/wp-content/themes/twentytwentyone/package-lock.json index bc11065966..d50eae7390 100644 --- a/wp-content/themes/twentytwentyone/package-lock.json +++ b/wp-content/themes/twentytwentyone/package-lock.json @@ -1300,6 +1300,18 @@ "quick-lru": "^4.0.1" } }, + "caniuse-api": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz", + "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==", + "dev": true, + "requires": { + "browserslist": "^4.0.0", + "caniuse-lite": "^1.0.0", + "lodash.memoize": "^4.1.2", + "lodash.uniq": "^4.5.0" + } + }, "caniuse-lite": { "version": "1.0.30001164", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001164.tgz", @@ -1461,6 +1473,12 @@ "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", "dev": true }, + "cssnano-utils": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-2.0.1.tgz", + "integrity": "sha512-i8vLRZTnEH9ubIyfdZCAdIdgnHAUeQeByEeQ2I7oTilvP9oHO6RScpeq3GsFUVqeB8uZgOQ9pw8utofNn32hhQ==", + "dev": true + }, "damerau-levenshtein": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.7.tgz", @@ -3130,6 +3148,12 @@ "integrity": "sha1-Cwih3PaDl8OXhVwyOXg4Mt90A9E=", "dev": true }, + "lodash.memoize": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", + "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=", + "dev": true + }, "lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", @@ -3154,6 +3178,12 @@ "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=", "dev": true }, + "lodash.uniq": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", + "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=", + "dev": true + }, "log-symbols": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", @@ -4624,6 +4654,30 @@ "integrity": "sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=", "dev": true }, + "postcss-merge-rules": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.0.3.tgz", + "integrity": "sha512-cEKTMEbWazVa5NXd8deLdCnXl+6cYG7m2am+1HzqH0EnTdy8fRysatkaXb2dEnR+fdaDxTvuZ5zoBdv6efF6hg==", + "dev": true, + "requires": { + "browserslist": "^4.16.6", + "caniuse-api": "^3.0.0", + "cssnano-utils": "^2.0.1", + "postcss-selector-parser": "^6.0.5" + }, + "dependencies": { + "postcss-selector-parser": { + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz", + "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==", + "dev": true, + "requires": { + "cssesc": "^3.0.0", + "util-deprecate": "^1.0.2" + } + } + } + }, "postcss-nested": { "version": "5.0.6", "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-5.0.6.tgz", diff --git a/wp-content/themes/twentytwentyone/package.json b/wp-content/themes/twentytwentyone/package.json index 4351af868f..6b3b25bda9 100644 --- a/wp-content/themes/twentytwentyone/package.json +++ b/wp-content/themes/twentytwentyone/package.json @@ -28,6 +28,7 @@ "postcss-custom-media": "^8.0.0", "postcss-discard-duplicates": "^5.0.1", "postcss-focus-within": "^5.0.1", + "postcss-merge-rules": "^5.0.3", "postcss-nested": "^5.0.6", "rtlcss": "^3.5.0", "sass": "^1.43.4", diff --git a/wp-content/themes/twentytwentyone/postcss.config.js b/wp-content/themes/twentytwentyone/postcss.config.js index c291aae9e6..d889f314ba 100644 --- a/wp-content/themes/twentytwentyone/postcss.config.js +++ b/wp-content/themes/twentytwentyone/postcss.config.js @@ -8,6 +8,7 @@ module.exports = { require('postcss-calc')({ precision: 0 }), - require('postcss-discard-duplicates') + require('postcss-discard-duplicates'), + require('postcss-merge-rules') ] }; diff --git a/wp-includes/version.php b/wp-includes/version.php index 478964d832..6706cfe036 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '5.9-alpha-52237'; +$wp_version = '5.9-alpha-52238'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.