From 7cbba801e25b8b419f0b6d4544547d91d2d3e855 Mon Sep 17 00:00:00 2001 From: desrosj Date: Wed, 19 Dec 2018 03:23:21 +0000 Subject: [PATCH] Twenty Thirteen: Fix button block custom colors. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Simplify some of the button block’s CSS selectors in the theme, to make sure the default colors don’t override the custom colors on the front end. Also make sure the button’s gradient is not applied when a custom background color is added, since it will hide it. Props laurelfulford. Merges [44195] into trunk. Fixes #45431. Built from https://develop.svn.wordpress.org/trunk@44304 git-svn-id: http://core.svn.wordpress.org/trunk@44134 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../themes/twentythirteen/css/blocks.css | 83 +++++++++++-------- .../twentythirteen/css/editor-blocks.css | 9 +- wp-includes/version.php | 2 +- 3 files changed, 56 insertions(+), 38 deletions(-) diff --git a/wp-content/themes/twentythirteen/css/blocks.css b/wp-content/themes/twentythirteen/css/blocks.css index e21e6935d9..2a28840ecb 100644 --- a/wp-content/themes/twentythirteen/css/blocks.css +++ b/wp-content/themes/twentythirteen/css/blocks.css @@ -336,32 +336,47 @@ body:not(.sidebar) .wp-block-table.alignfull { } .wp-block-button .wp-block-button__link { - background: #e05d22; /* Old browsers */ - background: -webkit-linear-gradient(top, #e05d22 0%, #d94412 100%); /* Chrome 10+, Safari 5.1+ */ - background: linear-gradient(to bottom, #e05d22 0%, #d94412 100%); /* W3C */ border: none; border-bottom: 3px solid #b93207; border-radius: 2px; - color: #fff; display: inline-block; font-size: 16px; padding: 11px 24px 10px; text-decoration: none; } -.wp-block-button .wp-block-button__link:hover, -.wp-block-button .wp-block-button__link:focus { - background: #ed6a31; /* Old browsers */ - background: -webkit-linear-gradient(top, #ed6a31 0%, #e55627 100%); /* Chrome 10+, Safari 5.1+ */ - background: linear-gradient(to bottom, #ed6a31 0%, #e55627 100%); /* W3C */ +.entry-content .wp-block-button__link { + background-color: #e05d22; color: #fff; - outline: none; } -.wp-block-button .wp-block-button__link:active { - background: #d94412; /* Old browsers */ +.entry-content .wp-block-button__link:not(.has-background) { + background: -webkit-linear-gradient(top, #e05d22 0%, #d94412 100%); /* Chrome 10+, Safari 5.1+ */ + background: linear-gradient(to bottom, #e05d22 0%, #d94412 100%); /* W3C */ +} + +.entry-content .wp-block-button__link:hover, +.entry-content .wp-block-button__link:focus { + background: #ed6a31; + color: #fff; +} + +.entry-content .wp-block-button__link:not(.has-background):hover, +.entry-content .wp-block-button__link:not(.has-background):hover { + background: -webkit-linear-gradient(top, #ed6a31 0%, #e55627 100%); /* Chrome 10+, Safari 5.1+ */ + background: linear-gradient(to bottom, #ed6a31 0%, #e55627 100%); /* W3C */ +} + +.entry-content .wp-block-button__link:active { + background: #d94412; +} + +.entry-content .wp-block-button__link:not(.has-background):active { background: -webkit-linear-gradient(top, #d94412 0%, #e05d22 100%); /* Chrome 10+, Safari 5.1+ */ background: linear-gradient(to bottom, #d94412 0%, #e05d22 100%); /* W3C */ +} + +.entry-content .wp-block-button .wp-block-button__link:active { border: none; border-top: 3px solid #b93207; padding: 10px 24px 11px; @@ -437,90 +452,90 @@ body:not(.sidebar) .wp-block-table.alignfull { 7.0 Blocks - Colors --------------------------------------------------------------*/ -.has-dark-gray-color { +.entry-content .has-dark-gray-color { color: #141412; } -.has-dark-gray-background-color { +.entry-content .has-dark-gray-background-color { background-color: #141412; } -.has-red-color { +.entry-content .has-red-color { color: #bc360a; } -.has-red-background-color { +.entry-content .has-red-background-color { background-color: #bc360a; } -.has-medium-orange-color { +.entry-content .has-medium-orange-color { color: #db572f; } -.has-medium-orange-background-color { +.entry-content .has-medium-orange-background-color { background-color: #db572f; } -.has-light-orange-color { +.entry-content .has-light-orange-color { color: #ea9629; } -.has-light-orange-background-color { +.entry-content .has-light-orange-background-color { background-color: #ea9629; } -.has-yellow-color { +.entry-content .has-yellow-color { color: #fbca3c; } -.has-yellow-background-color { +.entry-content .has-yellow-background-color { background-color: #fbca3c; } -.has-white-color { +.entry-content .has-white-color { color: #fff; } -.has-white-background-color { +.entry-content .has-white-background-color { background-color: #fff; } -.has-dark-brown-color { +.entry-content .has-dark-brown-color { color: #220e10; } -.has-dark-brown-background-color { +.entry-content .has-dark-brown-background-color { background-color: #220e10; } -.has-medium-brown-color { +.entry-content .has-medium-brown-color { color: #722d19; } -.has-medium-brown-background-color { +.entry-content .has-medium-brown-background-color { background-color: #722d19; } -.has-light-brown-color { +.entry-content .has-light-brown-color { color: #eadaa6; } -.has-light-brown-background-color { +.entry-content .has-light-brown-background-color { background-color: #eadaa6; } -.has-beige-color { +.entry-content .has-beige-color { color: #e8e5ce; } -.has-brown-background-color { +.entry-content .has-beige-background-color { background-color: #e8e5ce; } -.has-off-white-color { +.entry-content .has-off-white-color { color: #f7f5e7; } -.has-off-white-background-color { +.entry-content .has-off-white-background-color { background-color: #f7f5e7; } diff --git a/wp-content/themes/twentythirteen/css/editor-blocks.css b/wp-content/themes/twentythirteen/css/editor-blocks.css index af2479e466..c3e9a66d94 100644 --- a/wp-content/themes/twentythirteen/css/editor-blocks.css +++ b/wp-content/themes/twentythirteen/css/editor-blocks.css @@ -326,9 +326,7 @@ p.has-drop-cap:not(:focus)::first-letter { /* Buttons */ .wp-block-button .wp-block-button__link { - background: #e05d22; /* Old browsers */ - background: -webkit-linear-gradient(top, #e05d22 0%, #d94412 100%); /* Chrome 10+, Safari 5.1+ */ - background: linear-gradient(to bottom, #e05d22 0%, #d94412 100%); /* W3C */ + background: #e05d22; border: none; border-bottom: 3px solid #b93207; border-radius: 2px; @@ -340,6 +338,11 @@ p.has-drop-cap:not(:focus)::first-letter { text-decoration: none; } +.wp-block-button__link:not(.has-background) { + background: -webkit-linear-gradient(top, #e05d22 0%, #d94412 100%); /* Chrome 10+, Safari 5.1+ */ + background: linear-gradient(to bottom, #e05d22 0%, #d94412 100%); /* W3C */ +} + /* Separator */ .editor-block-list__block hr.wp-block-separator { diff --git a/wp-includes/version.php b/wp-includes/version.php index a4c9d85eb9..b1132bac3d 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.1-alpha-44303'; +$wp_version = '5.1-alpha-44304'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.