Skip to content

Commit

Permalink
Wordpress core and plugin upgrades
Browse files Browse the repository at this point in the history
  • Loading branch information
@michaliskambi
michaliskambi committed Nov 20, 2024
1 parent bfd08a8 commit 124a843
Show file tree
Hide file tree
Showing 21 changed files with 1,176 additions and 985 deletions.
2 changes: 1 addition & 1 deletion htdocs/wp/wp-content/plugins/akismet/.htaccess
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</FilesMatch>

# Akismet images
<FilesMatch "^(logo-(a|full)-2x\.png|akismet-refresh-logo\.svg|akismet-refresh-logo@2x\.png|arrow-left\.svg|icon-external\.svg)$">
<FilesMatch "^(logo-a-2x\.png|akismet-refresh-logo\.svg|akismet-refresh-logo@2x\.png|arrow-left\.svg|icon-external\.svg|akismet-activation-banner-elements\.png)$">
<IfModule !mod_authz_core.c>
Allow from all
</IfModule>
Expand Down
115 changes: 110 additions & 5 deletions htdocs/wp/wp-content/plugins/akismet/_inc/akismet-admin.css
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#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;
body {
--akismet-color-charcoal: #272635;
--akismet-color-light-grey: #f6f7f7;
--akismet-color-mid-grey: #a7aaad;
--akismet-color-dark-grey: #646970;
Expand All @@ -15,14 +13,26 @@
--akismet-color-notice-dark-green: #69bf82;
--akismet-color-notice-light-red: #ffdbde;
--akismet-color-notice-dark-red: #ff6676;
--akismet-color-notice-yellow: #e5c133;
}

#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-plugin-container a {
color: var(--akismet-color-mid-green);
}

#akismet-plugin-container a.akismet-button {
background-color: var(--akismet-color-mid-green);
color: var(--akismet-color-white);
}

#akismet-plugin-container button:focus-visible,
#akismet-plugin-container input:focus-visible {
#akismet-plugin-container input:focus-visible,
#akismet-plugin-container a:focus-visible {
border: 0;
box-shadow: none;
outline: 2px solid var(--akismet-color-light-blue);
Expand Down Expand Up @@ -297,12 +307,37 @@
border-left-color: var(--akismet-color-notice-dark-red);
}

.akismet-alert.is-commercial {
background-color: var(--akismet-color-white);
border-color: var(--akismet-color-mid-grey);
border-bottom-width: 1px;
border-left-color: var(--akismet-color-notice-yellow);
display: flex;
padding-bottom: 1em;
}

#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);
}

.akismet-alert-header {
font-size: 16px;
margin-bottom: 0.5em;
}

.akismet-alert-button-wrapper {
align-self: center;
margin-left: 2em;
min-width: 120px;
}

.akismet-alert-info {
text-wrap: pretty;
margin: 0.5em 0;
}

/* Setup - API key input */
.akismet-enter-api-key-box {
margin: 1.5rem 0;
Expand Down Expand Up @@ -340,6 +375,50 @@ h3.akismet-enter-api-key-box__header {
text-align: left;
}

/* Notices > Activation (shown on edit-comments.php) */
#akismet-setup-prompt {
background: none;
border: none;
margin: 0;
padding: 0;
width: 100%;
}

.akismet-activate {
align-items: center;
/* background-image is defined via an inline style in class.akismet-admin.php */
background-color: var(--akismet-color-light-grey);
background-position: calc(100% - 1em) center;
background-repeat: no-repeat;
background-size: 140px;
border: 1px solid var(--akismet-color-mid-green);
border-left-width: 4px;
display: flex;
justify-content: space-between;
margin: 15px 0;
min-height: 60px;
overflow: hidden;
padding: 5px 160px 5px 5px;
position: relative;
}

.akismet-activate__button,
.akismet-activate__button:hover,
.akismet-activate__button:visited {
margin: 0 1em;
}

.akismet-activate__description {
color: var(--akismet-color-charcoal);
flex-grow: 1;
font-size: 16px;
font-weight: 600;
margin: 0 auto;
text-align: center;
text-wrap: pretty;
}

/* Gutenberg medium breakpoint */
@media screen and (max-width: 782px) {
.akismet-new-snapshot__list {
display: block;
Expand Down Expand Up @@ -375,4 +454,30 @@ h3.akismet-enter-api-key-box__header {
.akismet-settings__row input[type="radio"] {
margin-top: 0;
}

.akismet-activate {
background-size: 120px;
padding-right: 134px;
}

.akismet-activate__button {
white-space: normal;
}

.akismet-activate__description {
font-size: 14px;
margin-right: 1em;
}
}

/* Gutenberg small breakpoint */
@media screen and (max-width: 600px) {
.akismet-activate__button,
.akismet-activate__button:hover {
font-size: 13px;
}

.akismet-activate__description {
display: none;
}
}
134 changes: 2 additions & 132 deletions htdocs/wp/wp-content/plugins/akismet/_inc/akismet.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,144 +140,13 @@ table.comments td.comment p a:after {
padding-top: 0;
}

.akismet-settings span.akismet-note{
.akismet-settings span.akismet-note {
float: left;
padding-left: 23px;
font-size: 75%;
margin-top: -10px;
}

/**
* For the activation notice on the plugins page.
*/

#akismet_setup_prompt {
background: none;
border: none;
margin: 0;
padding: 0;
width: 100%;
}

.akismet_activate {
border: 1px solid #4F800D;
padding: 5px;
margin: 15px 0;
background: #83AF24;
background-image: -webkit-gradient(linear, 0% 0, 80% 100%, from(#83AF24), to(#4F800D));
background-image: -moz-linear-gradient(80% 100% 120deg, #4F800D, #83AF24);
-moz-border-radius: 3px;
border-radius: 3px;
-webkit-border-radius: 3px;
position: relative;
overflow: hidden;
}

.akismet_activate .aa_a {
position: absolute;
top: -5px;
right: 10px;
font-size: 140px;
color: #769F33;
font-family: Georgia, "Times New Roman", Times, serif;
}

.akismet_activate .aa_button {
font-weight: bold;
border: 1px solid #029DD6;
border-top: 1px solid #06B9FD;
font-size: 15px;
text-align: center;
padding: 9px 0 8px 0;
color: #FFF;
background: #029DD6;
background-image: -webkit-gradient(linear, 0% 0, 0% 100%, from(#029DD6), to(#0079B1));
background-image: -moz-linear-gradient(0% 100% 90deg, #0079B1, #029DD6);
-moz-border-radius: 2px;
border-radius: 2px;
-webkit-border-radius: 2px;
width: 100%;
cursor: pointer;
margin: 0;
}

.akismet_activate .aa_button:hover {
text-decoration: none !important;
border: 1px solid #029DD6;
border-bottom: 1px solid #00A8EF;
font-size: 15px;
text-align: center;
padding: 9px 0 8px 0;
color: #F0F8FB;
background: #0079B1;
background-image: -webkit-gradient(linear, 0% 0, 0% 100%, from(#0079B1), to(#0092BF));
background-image: -moz-linear-gradient(0% 100% 90deg, #0092BF, #0079B1);
-moz-border-radius: 2px;
border-radius: 2px;
-webkit-border-radius: 2px;
}

.akismet_activate .aa_button_border {
border: 1px solid #006699;
-moz-border-radius: 2px;
border-radius: 2px;
-webkit-border-radius: 2px;
background: #029DD6;
background-image: -webkit-gradient(linear, 0% 0, 0% 100%, from(#029DD6), to(#0079B1));
background-image: -moz-linear-gradient(0% 100% 90deg, #0079B1, #029DD6);
}

.akismet_activate .aa_button_container {
box-sizing: border-box;
display: inline-block;
background: #DEF1B8;
padding: 5px;
-moz-border-radius: 2px;
border-radius: 2px;
-webkit-border-radius: 2px;
width: 266px;
}

.akismet_activate .aa_description {
position: absolute;
top: 22px;
left: 285px;
margin-left: 25px;
color: #E5F2B1;
font-size: 15px;
}

.akismet_activate .aa_description strong {
color: #FFF;
font-weight: normal;
}

@media (max-width: 550px) {
.akismet_activate .aa_a {
display: none;
}

.akismet_activate .aa_button_container {
width: 100%;
}
}

@media (max-width: 782px) {
.akismet_activate {
min-width: 0;
}
}

@media (max-width: 850px) {
#akismet_setup_prompt .aa_description {
display: none;
}

.akismet_activate {
min-width: 0;
}
}

.jetpack_page_akismet-key-config #wpcontent, .settings_page_akismet-key-config #wpcontent {
padding-left: 0;
}
Expand All @@ -287,6 +156,7 @@ table.comments td.comment p a:after {
text-align:center;
box-shadow:0 1px 0 rgba(200,215,225,0.5),0 1px 2px #e9eff3
}

@media (max-width: 45rem) {
.akismet-masthead {
padding:0 1.25rem
Expand Down
Binary file added ...s/wp/wp-content/plugins/akismet/_inc/img/akismet-activation-banner-elements.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed htdocs/wp/wp-content/plugins/akismet/_inc/img/logo-full-2x.png
View file
Binary file not shown.
Loading

0 comments on commit 124a843

Please sign in to comment.