Merge branch 'develop' into add/jp-no-pinned-version-warning

Automattic · Dec 19, 2023 · b63d44e · b63d44e
2 parents 91c888b + 8a37fe7
commit b63d44e
Show file tree

Hide file tree

Showing 27 changed files with 2,126 additions and 524 deletions.
diff --git a/akismet/.htaccess b/akismet/.htaccess
@@ -12,7 +12,7 @@
 </IfModule>
 
 # Akismet CSS and JS
-<FilesMatch "^(form\.js|akismet\.js|akismet\.css)$">
+<FilesMatch "^(form\.js|akismet(-frontend|-admin)?\.js|akismet(-admin)?(-rtl)?\.css|inter\.css)$">
 	<IfModule !mod_authz_core.c>
 		Allow from all
 	</IfModule>
@@ -23,12 +23,12 @@
 </FilesMatch>
 
 # Akismet images
-<FilesMatch "^logo-(a|full)-2x\.png$">
+<FilesMatch "^(logo-(a|full)-2x\.png|akismet-refresh-logo\.svg|akismet-refresh-logo@2x\.png|arrow-left\.svg)$">
 	<IfModule !mod_authz_core.c>
 		Allow from all
 	</IfModule>
 
 	<IfModule mod_authz_core.c>
 		Require all granted
 	</IfModule>
-</FilesMatch>
+</FilesMatch>
diff --git a/akismet/_inc/akismet-admin.css b/akismet/_inc/akismet-admin.css
@@ -0,0 +1,360 @@
+#akismet-plugin-container {
+	background-color: var(--akismet-color-light-grey);
+	font-family: 'Inter', -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen-Sans', 'Ubuntu', 'Cantarell', 'Helvetica Neue', sans-serif;
+    --akismet-color-charcoal: #272635;
+	--akismet-color-light-grey: #f6f7f7;
+	--akismet-color-mid-grey: #a7aaad;
+	--akismet-color-dark-grey: #646970;
+	--akismet-color-grey-80: #2c3338;
+	--akismet-color-grey-100: #101517;
+	--akismet-color-white: #fff;
+	--akismet-color-mid-green: #357b49;
+	--akismet-color-mid-red: #e82c3f;
+	--akismet-color-light-blue: #256eff;
+	--akismet-color-notice-light-green: #dbf0e1;
+	--akismet-color-notice-dark-green: #69bf82;
+	--akismet-color-notice-light-red: #ffdbde;
+	--akismet-color-notice-dark-red: #ff6676;
+}
+
+#akismet-plugin-container a {
+	color: var(--akismet-color-mid-green);
+}
+
+#akismet-plugin-container button:focus-visible,
+#akismet-plugin-container input:focus-visible {
+	border: 0;
+	box-shadow: none;
+	outline: 2px solid var(--akismet-color-light-blue);
+}
+
+.akismet-masthead {
+	box-shadow: none;
+}
+
+.akismet-masthead__logo {
+	margin: 20px 0;
+}
+
+.akismet-section-header {
+	box-shadow: none;
+	margin-bottom: 0;
+}
+
+.akismet-section-header__label {
+	color: var(--akismet-color-charcoal);
+	font-weight: 600;
+}
+
+.akismet-button, .akismet-button:hover {
+	background-color: var(--akismet-color-mid-green);
+	border: 0;
+	color: #fff;
+}
+
+/* Need this specificity to override the existing header rule */
+.akismet-new-snapshot h3.akismet-new-snapshot__header {
+	background: none;
+	font-size: 13px;
+	color: var(--akismet-color-charcoal);
+	text-align: left;
+	text-transform: none;
+}
+
+.akismet-new-snapshot .akismet-new-snapshot__number {
+	color: var(--akismet-color-charcoal);
+	letter-spacing: -1px;
+	text-align: left;
+}
+
+.akismet-new-snapshot li.akismet-new-snapshot__item {
+	color: var(--akismet-color-dark-grey);
+	font-size: 13px;
+	text-align: left;
+	text-transform: none;
+}
+
+.akismet-masthead__logo-link {
+	min-height: 50px;
+}
+
+.akismet-masthead__back-link-container {
+	margin-top: 16px;
+	margin-bottom: 2px;
+}
+
+/* Need this specificity to override the existing link rule */
+#akismet-plugin-container a.akismet-masthead__back-link {
+	background-image: url(img/arrow-left.svg);
+	background-position: left;
+	background-repeat: no-repeat;
+	background-size: 16px;
+	color: var(--akismet-color-charcoal);
+	font-weight: 400;
+	padding-left: 20px;
+	text-decoration: none;
+}
+
+#akismet-plugin-container a.akismet-masthead__back-link:hover {
+	text-decoration: underline;
+}
+
+.akismet-new-snapshot__item {
+	border-top: 1px solid var(--akismet-color-light-grey);
+	border-left: 1px solid var(--akismet-color-light-grey);
+	padding: 1em;
+}
+
+.akismet-new-snapshot li:first-child {
+	border-left: none;
+}
+
+.akismet-new-snapshot__list {
+	display: flex;
+	margin-bottom: 0;
+}
+
+.akismet-new-snapshot__item {
+	flex: 1 0 33.33%;
+	margin-bottom: 0;
+	padding-left: 1.5em;
+	padding-right: 1.5em;
+}
+
+.akismet-new-snapshot__chart {
+	padding: 1em;
+}
+
+.akismet-box {
+	border: 0;
+}
+
+.akismet-box,
+.akismet-card {
+	box-shadow: 0 4px 12px rgba(0, 0, 0, 0.06), 0 0 2px rgba(0, 0, 0, 0.16);
+	border-radius: 8px;
+	overflow: hidden;
+}
+
+.akismet-card {
+	margin: 32px auto 0 auto;
+}
+
+.akismet-lower {
+	padding-top: 0;
+}
+
+.akismet-lower .inside {
+	padding: 0;
+}
+
+.akismet-section-header__label {
+	margin: 0;
+}
+
+.akismet-settings__row {
+	border-bottom: 1px solid var(--akismet-color-light-grey);
+	display: block;
+	padding: 1em 1.5em;
+}
+
+.akismet-settings__row-input {
+	margin-left: auto;
+}
+
+.akismet-settings__row-title {
+	font-weight: 500;
+	font-size: 1em;
+	margin: 0;
+	margin-bottom: 1em;
+}
+
+.akismet-settings__row-description {
+	margin-top: 0.5em;
+}
+
+.akismet-card-actions {
+	padding: 1em;
+}
+
+.akismet-settings__row label {
+	padding-bottom: 1em;
+}
+
+.akismet-settings__row-note {
+	font-size: 0.9em;
+	margin-top: 0.4em;
+}
+
+.akismet-settings__row input[type="checkbox"],
+.akismet-settings__row input[type="radio"] {
+	accent-color: var(--akismet-color-mid-green);
+	box-shadow: none;
+	flex-shrink: 0;
+	margin: 2px 0 0 0;
+}
+
+.akismet-settings__row input[type="checkbox"] {
+	margin-top: 1px;
+	vertical-align: top;
+	-webkit-appearance: checkbox;
+}
+
+.akismet-settings__row input[type="radio"] {
+	-webkit-appearance: radio;
+}
+
+/* Fix up misbehaving wp-admin styles in Chrome (from forms and colors stylesheets) */
+.akismet-settings__row input[type="checkbox"]:checked:before {
+	content: '';
+}
+
+.akismet-settings__row input[type="radio"]:checked:before {
+	background: none;
+}
+
+.akismet-settings__row input[type="checkbox"]:checked:hover,
+.akismet-settings__row input[type="radio"]:checked:hover {
+	accent-color: var(--akismet-color-mid-green);
+}
+
+.akismet-button:disabled {
+	background-color: var(--akismet-color-mid-grey);
+	color: var(--akismet-color-white);
+	cursor: arrow;
+}
+
+.akismet-awaiting-stats,
+.akismet-account {
+	padding: 0 1rem 1rem 1rem;
+	margin: 0;
+}
+
+.akismet-account {
+	padding-bottom: 0;
+}
+
+.akismet-account th {
+	font-weight: 500;
+	padding-right: 1em;
+}
+
+.akismet-account th, .akismet-account td {
+	padding-bottom: 1em;
+}
+
+.akismet-settings__row-input-label {
+	align-items: center;
+	display: flex;
+}
+
+.akismet-settings__row-label-text {
+	padding-left: 0.5em;
+	margin-top: 2px;
+}
+
+.akismet-alert {
+	border-left: 8px solid;
+	border-radius: 8px;
+	margin: 20px 0;
+	padding: 0.2em 1em;
+}
+
+.akismet-alert__heading {
+	font-size: 1em;
+}
+
+.akismet-alert.is-good {
+	background-color: var(--akismet-color-notice-light-green);
+	border-left-color: var(--akismet-color-notice-dark-green);
+}
+
+.akismet-alert.is-neutral {
+	background-color: var(--akismet-color-white);
+	border-left-color: var(--akismet-color-dark-grey);
+}
+
+.akismet-alert.is-bad {
+	background-color: var(--akismet-color-notice-light-red);
+	border-left-color: var(--akismet-color-notice-dark-red);
+}
+
+#akismet-plugin-container .akismet-alert.is-good a,
+#akismet-plugin-container .akismet-alert.is-bad a {
+	/* For better contrast - green isn't great */
+	color: var(--akismet-color-grey-80);
+}
+
+/* Setup - API key input */
+.akismet-enter-api-key-box {
+	margin: 1.5rem 0;
+}
+
+.akismet-enter-api-key-box__reveal {
+	background: none;
+	border: 0;
+	color: var(--akismet-color-mid-green);
+	cursor: pointer;
+	text-decoration: underline;
+}
+
+.akismet-enter-api-key-box__form-wrapper {
+	display: none;
+	margin-top: 1.5rem;
+}
+
+.akismet-enter-api-key-box__input-wrapper {
+	box-sizing: border-box;
+	display: flex;
+	flex-wrap: nowrap;
+	padding: 0 1.5rem;
+	width: 100%;
+}
+
+.akismet-enter-api-key-box__key-input {
+	flex-grow: 1;
+	margin-right: 1rem;
+}
+
+h3.akismet-enter-api-key-box__header {
+	padding-top: 0;
+	padding-bottom: 1em;
+	text-align: left;
+}
+
+@media screen and (max-width: 782px) {
+	.akismet-new-snapshot__list {
+		display: block;
+	}
+
+	.akismet-new-snapshot__number {
+		float: right;
+		font-size: 20px;
+		font-weight: 500;
+		margin-top: -16px;
+	}
+
+	.akismet-new-snapshot__header {
+		font-size: 14px;
+		font-weight: 500;
+	}
+
+	.akismet-new-snapshot__text {
+		font-size: 12px;
+	}
+
+	.akismet-settings__row input[type="checkbox"],
+	.akismet-settings__row input[type="radio"] {
+		height: 24px;
+		width: 24px;
+	}
+
+	.akismet-settings__row-label-text {
+		padding-left: 0.8em;
+	}
+
+	.akismet-settings__row input[type="checkbox"],
+	.akismet-settings__row input[type="radio"] {
+		margin-top: 0;
+	}
+}
diff --git a/akismet/_inc/akismet-admin.js b/akismet/_inc/akismet-admin.js
@@ -0,0 +1,7 @@
+document.addEventListener( 'DOMContentLoaded', function() {
+	// Prevent aggressive iframe caching in Firefox
+	var statsIframe = document.getElementById( 'stats-iframe' );
+	if ( statsIframe ) {
+		statsIframe.contentWindow.location.href = statsIframe.src;
+	}
+} );