<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[44194] branches/5.0/src/wp-content/themes/twentytwelve/css: Twenty Twelve: Fix button block custom colors.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/44194">44194</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/44194","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>laurelfulford</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-12-14 20:54:35 +0000 (Fri, 14 Dec 2018)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Twenty Twelve: Fix button block custom colors.
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.
Fixes <a href="https://core.trac.wordpress.org/ticket/45432">#45432</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches50srcwpcontentthemestwentytwelvecssblockscss">branches/5.0/src/wp-content/themes/twentytwelve/css/blocks.css</a></li>
<li><a href="#branches50srcwpcontentthemestwentytwelvecsseditorblockscss">branches/5.0/src/wp-content/themes/twentytwelve/css/editor-blocks.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches50srcwpcontentthemestwentytwelvecssblockscss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.0/src/wp-content/themes/twentytwelve/css/blocks.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.0/src/wp-content/themes/twentytwelve/css/blocks.css 2018-12-14 20:41:25 UTC (rev 44193)
+++ branches/5.0/src/wp-content/themes/twentytwelve/css/blocks.css 2018-12-14 20:54:35 UTC (rev 44194)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -244,19 +244,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* Buttons */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.wp-block-button .wp-block-button__link,
-.wp-block-button .wp-block-button__link:visited {
- background-color: #e6e6e6;
- background-repeat: repeat-x;
- background-image: -moz-linear-gradient(top, #f4f4f4, #e6e6e6);
- background-image: -ms-linear-gradient(top, #f4f4f4, #e6e6e6);
- background-image: -webkit-linear-gradient(top, #f4f4f4, #e6e6e6);
- background-image: -o-linear-gradient(top, #f4f4f4, #e6e6e6);
- background-image: linear-gradient(top, #f4f4f4, #e6e6e6);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.wp-block-button .wp-block-button__link {
</ins><span class="cx" style="display: block; padding: 0 10px"> border: 1px solid #d2d2d2;
</span><span class="cx" style="display: block; padding: 0 10px"> border-radius: 3px;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- box-shadow: 0 1px 2px rgba(64, 64, 64, 0.1);
- color: #7c7c7c;
</del><span class="cx" style="display: block; padding: 0 10px"> font-family: inherit;
</span><span class="cx" style="display: block; padding: 0 10px"> font-size: 11px;
</span><span class="cx" style="display: block; padding: 0 10px"> font-size: 0.785714286rem;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -266,9 +256,39 @@
</span><span class="cx" style="display: block; padding: 0 10px"> padding: 0.428571429rem 0.714285714rem;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.wp-block-button .wp-block-button__link:hover,
-.wp-block-button .wp-block-button__link:focus {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.entry-content .wp-block-button__link,
+.entry-content .wp-block-button__link:visited {
+ background-color: #e6e6e6;
+ color: #7c7c7c;
+}
+
+.entry-content .wp-block-button__link:hover,
+.entry-content .wp-block-button__link:visited:hover,
+.entry-content .wp-block-button__link:focus {
</ins><span class="cx" style="display: block; padding: 0 10px"> background-color: #ebebeb;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ color: #5e5e5e;
+}
+
+.entry-content .wp-block-button__link:active {
+ background-color: #e1e1e1;
+ color: #757575;
+}
+
+.wp-block-button__link:not(.has-background) {
+ background-repeat: repeat-x;
+ background-image: -moz-linear-gradient(top, #f4f4f4, #e6e6e6);
+ background-image: -ms-linear-gradient(top, #f4f4f4, #e6e6e6);
+ background-image: -webkit-linear-gradient(top, #f4f4f4, #e6e6e6);
+ background-image: -o-linear-gradient(top, #f4f4f4, #e6e6e6);
+ background-image: linear-gradient(top, #f4f4f4, #e6e6e6);
+}
+
+.wp-block-button__link:not(.has-text-color) {
+ box-shadow: 0 1px 2px rgba(64, 64, 64, 0.1);
+}
+
+.wp-block-button__link:not(.has-background):hover,
+.wp-block-button__link:not(.has-background):focus {
</ins><span class="cx" style="display: block; padding: 0 10px"> background-image: -moz-linear-gradient(top, #f9f9f9, #ebebeb);
</span><span class="cx" style="display: block; padding: 0 10px"> background-image: -ms-linear-gradient(top, #f9f9f9, #ebebeb);
</span><span class="cx" style="display: block; padding: 0 10px"> background-image: -webkit-linear-gradient(top, #f9f9f9, #ebebeb);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -275,11 +295,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> background-image: -o-linear-gradient(top, #f9f9f9, #ebebeb);
</span><span class="cx" style="display: block; padding: 0 10px"> background-image: linear-gradient(top, #f9f9f9, #ebebeb);
</span><span class="cx" style="display: block; padding: 0 10px"> background-repeat: repeat-x;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- color: #5e5e5e;
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.wp-block-button .wp-block-button__link:active {
- background-color: #e1e1e1;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.wp-block-button__link:not(.has-background):active {
</ins><span class="cx" style="display: block; padding: 0 10px"> background-image: -moz-linear-gradient(top, #ebebeb, #e1e1e1);
</span><span class="cx" style="display: block; padding: 0 10px"> background-image: -ms-linear-gradient(top, #ebebeb, #e1e1e1);
</span><span class="cx" style="display: block; padding: 0 10px"> background-image: -webkit-linear-gradient(top, #ebebeb, #e1e1e1);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -287,8 +305,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> background-image: linear-gradient(top, #ebebeb, #e1e1e1);
</span><span class="cx" style="display: block; padding: 0 10px"> background-repeat: repeat-x;
</span><span class="cx" style="display: block; padding: 0 10px"> border-color: transparent;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}
+
+.wp-block-button__link:not(.has-text-color):active {
</ins><span class="cx" style="display: block; padding: 0 10px"> box-shadow: inset 0 0 8px 2px #c6c6c6, 0 1px 0 0 #f4f4f4;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- color: #757575;
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* Separator */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -367,42 +387,52 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 6.0 Blocks - Colors
</span><span class="cx" style="display: block; padding: 0 10px"> --------------------------------------------------------------*/
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.has-blue-color {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.entry-content .has-blue-color,
+.entry-content .has-blue-color:visited {
</ins><span class="cx" style="display: block; padding: 0 10px"> color: #21759b;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.has-blue-background-color {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.entry-content .has-blue-background-color,
+.entry-content .has-blue-background-color:visited {
</ins><span class="cx" style="display: block; padding: 0 10px"> background-color: #21759b;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.has-dark-gray-color {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.entry-content .has-dark-gray-color,
+.entry-content .has-dark-gray-color:visited {
</ins><span class="cx" style="display: block; padding: 0 10px"> color: #373737;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.has-dark-gray-background-color {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.entry-content .has-dark-gray-background-color,
+.entry-content .has-dark-gray-background-color:visited {
</ins><span class="cx" style="display: block; padding: 0 10px"> background-color: #373737;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.has-medium-gray-color {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.entry-content .has-medium-gray-color,
+.entry-content .has-medium-gray-color:visited {
</ins><span class="cx" style="display: block; padding: 0 10px"> color: #9f9f9f;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.has-medium-gray-background-color {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.entry-content .has-medium-gray-background-color,
+.entry-content .has-medium-gray-background-color:visited {
</ins><span class="cx" style="display: block; padding: 0 10px"> background-color: #9f9f9f;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.has-light-gray-color {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.entry-content .has-light-gray-color,
+.entry-content .has-light-gray-color:visited {
</ins><span class="cx" style="display: block; padding: 0 10px"> color: #e6e6e6;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.has-light-gray-background-color {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.entry-content .has-light-gray-background-color,
+.entry-content .has-light-gray-background-color:visited {
</ins><span class="cx" style="display: block; padding: 0 10px"> background-color: #e6e6e6;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.has-white-color {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.entry-content .has-white-color,
+.entry-content .has-white-color:visited {
</ins><span class="cx" style="display: block; padding: 0 10px"> color: #fff;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.has-white-background-color {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.entry-content .has-white-background-color,
+.entry-content .has-white-background-color:visited {
</ins><span class="cx" style="display: block; padding: 0 10px"> background-color: #fff;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="branches50srcwpcontentthemestwentytwelvecsseditorblockscss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.0/src/wp-content/themes/twentytwelve/css/editor-blocks.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.0/src/wp-content/themes/twentytwelve/css/editor-blocks.css 2018-12-14 20:41:25 UTC (rev 44193)
+++ branches/5.0/src/wp-content/themes/twentytwelve/css/editor-blocks.css 2018-12-14 20:54:35 UTC (rev 44194)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -235,7 +235,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .wp-block-file .wp-block-file__button,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.wp-block-button .wp-block-button__link:hover {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.wp-block-button .wp-block-file__button:hover {
</ins><span class="cx" style="display: block; padding: 0 10px"> background-color: #e6e6e6;
</span><span class="cx" style="display: block; padding: 0 10px"> background-repeat: repeat-x;
</span><span class="cx" style="display: block; padding: 0 10px"> background-image: -moz-linear-gradient(top, #f4f4f4, #e6e6e6);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -335,19 +335,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* Buttons */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.wp-block-button .wp-block-button__link,
-.wp-block-button .wp-block-button__link:hover {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.wp-block-button__link {
</ins><span class="cx" style="display: block; padding: 0 10px"> background-color: #e6e6e6;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- background-repeat: repeat-x;
- background-image: -moz-linear-gradient(top, #f4f4f4, #e6e6e6);
- background-image: -ms-linear-gradient(top, #f4f4f4, #e6e6e6);
- background-image: -webkit-linear-gradient(top, #f4f4f4, #e6e6e6);
- background-image: -o-linear-gradient(top, #f4f4f4, #e6e6e6);
- background-image: linear-gradient(top, #f4f4f4, #e6e6e6);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ color: #7c7c7c;
+}
+
+.wp-block-button .wp-block-button__link {
</ins><span class="cx" style="display: block; padding: 0 10px"> border: 1px solid #d2d2d2;
</span><span class="cx" style="display: block; padding: 0 10px"> border-radius: 3px;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- box-shadow: 0 1px 2px rgba(64, 64, 64, 0.1);
- color: #7c7c7c;
</del><span class="cx" style="display: block; padding: 0 10px"> font-family: inherit;
</span><span class="cx" style="display: block; padding: 0 10px"> font-size: 11px;
</span><span class="cx" style="display: block; padding: 0 10px"> font-weight: normal;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -355,6 +350,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> padding: 6px 10px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.wp-block-button .editor-rich-text__tinymce.mce-content-body {
+ line-height: 1.428571429;
+}
+
+.wp-block-button__link:not(.has-text-color) {
+ box-shadow: 0 1px 2px rgba(64, 64, 64, 0.1);
+}
+
+.wp-block-button .wp-block-button__link:not(.has-background) {
+ background-image: -moz-linear-gradient(top, #f4f4f4, #e6e6e6);
+ background-image: -ms-linear-gradient(top, #f4f4f4, #e6e6e6);
+ background-image: -webkit-linear-gradient(top, #f4f4f4, #e6e6e6);
+ background-image: -o-linear-gradient(top, #f4f4f4, #e6e6e6);
+ background-image: linear-gradient(top, #f4f4f4, #e6e6e6);
+ background-repeat: repeat-x;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /* Separator */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .editor-block-list__block hr.wp-block-separator {
</span></span></pre>
</div>
</div>
</body>
</html>