Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/master' into latest
Browse files Browse the repository at this point in the history
  • Loading branch information
patrickebates committed Dec 19, 2019
2 parents ffc0390 + c7ccaac commit 7e1bc6b
Show file tree
Hide file tree
Showing 36 changed files with 213 additions and 106 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Project Nami
===============

### Version: `2.3.1` ###
### Version: `2.3.2` ###

### Description: ###
[![Deploy to Azure](http://azuredeploy.net/deploybutton.png)](https://deploy.azure.com/?repository=https://github.com/ProjectNami/projectnami/tree/latest)
Expand Down
25 changes: 25 additions & 0 deletions wp-admin/about.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,31 @@
<div class="about__section changelog">
<div class="column">
<h2><?php _e( 'Maintenance and Security Releases' ); ?></h2>
<p>
<?php
printf(
/* translators: 1: WordPress version number, 2: plural number of bugs. More than one security issue. */
_n(
'<strong>Version %1$s</strong> addressed %2$s bug.',
'<strong>Version %1$s</strong> addressed %2$s bugs.',
5
),
'5.3.2',
number_format_i18n( 5 )
);
?>
<?php
printf(
/* translators: %s: HelpHub URL */
__( 'For more information, see <a href="%s">the release notes</a>.' ),
sprintf(
/* translators: %s: WordPress version */
esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
sanitize_title( '5.3.2' )
)
);
?>
</p>
<p>
<?php
printf(
Expand Down
10 changes: 7 additions & 3 deletions wp-admin/css/colors/_admin.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,13 @@ textarea:focus {
.button.active,
.button.active:focus,
.button.active:hover {
border-color: darken( $button-color, 5% );
color: darken( $button-text-color, 5% );
box-shadow: inset 0 2px 5px -3px darken( $button-color, 5% );
border-color: $button-color;
color: darken( #32373c, 5% );
box-shadow: inset 0 2px 5px -3px $button-color;
}

.button.active:focus {
box-shadow: 0 0 0 1px #32373c;
}

.button-primary {
Expand Down
10 changes: 7 additions & 3 deletions wp-admin/css/colors/blue/colors-rtl.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,13 @@ textarea:focus {
.wp-core-ui .button.active,
.wp-core-ui .button.active:focus,
.wp-core-ui .button.active:hover {
border-color: #dd9f32;
color: #f2f2f2;
box-shadow: inset 0 2px 5px -3px #dd9f32;
border-color: #e1a948;
color: #262a2e;
box-shadow: inset 0 2px 5px -3px #e1a948;
}

.wp-core-ui .button.active:focus {
box-shadow: 0 0 0 1px #32373c;
}

.wp-core-ui .button-primary {
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/css/colors/blue/colors-rtl.min.css
View file

Large diffs are not rendered by default.

10 changes: 7 additions & 3 deletions wp-admin/css/colors/blue/colors.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,13 @@ textarea:focus {
.wp-core-ui .button.active,
.wp-core-ui .button.active:focus,
.wp-core-ui .button.active:hover {
border-color: #dd9f32;
color: #f2f2f2;
box-shadow: inset 0 2px 5px -3px #dd9f32;
border-color: #e1a948;
color: #262a2e;
box-shadow: inset 0 2px 5px -3px #e1a948;
}

.wp-core-ui .button.active:focus {
box-shadow: 0 0 0 1px #32373c;
}

.wp-core-ui .button-primary {
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/css/colors/blue/colors.min.css
View file

Large diffs are not rendered by default.

10 changes: 7 additions & 3 deletions wp-admin/css/colors/coffee/colors-rtl.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,13 @@ textarea:focus {
.wp-core-ui .button.active,
.wp-core-ui .button.active:focus,
.wp-core-ui .button.active:hover {
border-color: #bf9878;
color: #f2f2f2;
box-shadow: inset 0 2px 5px -3px #bf9878;
border-color: #c7a589;
color: #262a2e;
box-shadow: inset 0 2px 5px -3px #c7a589;
}

.wp-core-ui .button.active:focus {
box-shadow: 0 0 0 1px #32373c;
}

.wp-core-ui .button-primary {
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/css/colors/coffee/colors-rtl.min.css
View file

Large diffs are not rendered by default.

10 changes: 7 additions & 3 deletions wp-admin/css/colors/coffee/colors.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,13 @@ textarea:focus {
.wp-core-ui .button.active,
.wp-core-ui .button.active:focus,
.wp-core-ui .button.active:hover {
border-color: #bf9878;
color: #f2f2f2;
box-shadow: inset 0 2px 5px -3px #bf9878;
border-color: #c7a589;
color: #262a2e;
box-shadow: inset 0 2px 5px -3px #c7a589;
}

.wp-core-ui .button.active:focus {
box-shadow: 0 0 0 1px #32373c;
}

.wp-core-ui .button-primary {
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/css/colors/coffee/colors.min.css
View file

Large diffs are not rendered by default.

10 changes: 7 additions & 3 deletions wp-admin/css/colors/ectoplasm/colors-rtl.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,13 @@ textarea:focus {
.wp-core-ui .button.active,
.wp-core-ui .button.active:focus,
.wp-core-ui .button.active:hover {
border-color: #93a43e;
color: #f2f2f2;
box-shadow: inset 0 2px 5px -3px #93a43e;
border-color: #a3b745;
color: #262a2e;
box-shadow: inset 0 2px 5px -3px #a3b745;
}

.wp-core-ui .button.active:focus {
box-shadow: 0 0 0 1px #32373c;
}

.wp-core-ui .button-primary {
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/css/colors/ectoplasm/colors-rtl.min.css
View file

Large diffs are not rendered by default.

10 changes: 7 additions & 3 deletions wp-admin/css/colors/ectoplasm/colors.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,13 @@ textarea:focus {
.wp-core-ui .button.active,
.wp-core-ui .button.active:focus,
.wp-core-ui .button.active:hover {
border-color: #93a43e;
color: #f2f2f2;
box-shadow: inset 0 2px 5px -3px #93a43e;
border-color: #a3b745;
color: #262a2e;
box-shadow: inset 0 2px 5px -3px #a3b745;
}

.wp-core-ui .button.active:focus {
box-shadow: 0 0 0 1px #32373c;
}

.wp-core-ui .button-primary {
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/css/colors/ectoplasm/colors.min.css
View file

Large diffs are not rendered by default.

10 changes: 7 additions & 3 deletions wp-admin/css/colors/light/colors-rtl.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,13 @@ textarea:focus {
.wp-core-ui .button.active,
.wp-core-ui .button.active:focus,
.wp-core-ui .button.active:hover {
border-color: #0490b3;
color: #262626;
box-shadow: inset 0 2px 5px -3px #0490b3;
border-color: #04a4cc;
color: #262a2e;
box-shadow: inset 0 2px 5px -3px #04a4cc;
}

.wp-core-ui .button.active:focus {
box-shadow: 0 0 0 1px #32373c;
}

.wp-core-ui .button-primary {
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/css/colors/light/colors-rtl.min.css
View file

Large diffs are not rendered by default.

10 changes: 7 additions & 3 deletions wp-admin/css/colors/light/colors.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,13 @@ textarea:focus {
.wp-core-ui .button.active,
.wp-core-ui .button.active:focus,
.wp-core-ui .button.active:hover {
border-color: #0490b3;
color: #262626;
box-shadow: inset 0 2px 5px -3px #0490b3;
border-color: #04a4cc;
color: #262a2e;
box-shadow: inset 0 2px 5px -3px #04a4cc;
}

.wp-core-ui .button.active:focus {
box-shadow: 0 0 0 1px #32373c;
}

.wp-core-ui .button-primary {
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/css/colors/light/colors.min.css
View file

Large diffs are not rendered by default.

10 changes: 7 additions & 3 deletions wp-admin/css/colors/midnight/colors-rtl.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,13 @@ textarea:focus {
.wp-core-ui .button.active,
.wp-core-ui .button.active:focus,
.wp-core-ui .button.active:hover {
border-color: #dd382d;
color: #f2f2f2;
box-shadow: inset 0 2px 5px -3px #dd382d;
border-color: #e14d43;
color: #262a2e;
box-shadow: inset 0 2px 5px -3px #e14d43;
}

.wp-core-ui .button.active:focus {
box-shadow: 0 0 0 1px #32373c;
}

.wp-core-ui .button-primary {
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/css/colors/midnight/colors-rtl.min.css
View file

Large diffs are not rendered by default.

10 changes: 7 additions & 3 deletions wp-admin/css/colors/midnight/colors.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,13 @@ textarea:focus {
.wp-core-ui .button.active,
.wp-core-ui .button.active:focus,
.wp-core-ui .button.active:hover {
border-color: #dd382d;
color: #f2f2f2;
box-shadow: inset 0 2px 5px -3px #dd382d;
border-color: #e14d43;
color: #262a2e;
box-shadow: inset 0 2px 5px -3px #e14d43;
}

.wp-core-ui .button.active:focus {
box-shadow: 0 0 0 1px #32373c;
}

.wp-core-ui .button-primary {
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/css/colors/midnight/colors.min.css
View file

Large diffs are not rendered by default.

10 changes: 7 additions & 3 deletions wp-admin/css/colors/ocean/colors-rtl.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,13 @@ textarea:focus {
.wp-core-ui .button.active,
.wp-core-ui .button.active:focus,
.wp-core-ui .button.active:hover {
border-color: #8faf91;
color: #f2f2f2;
box-shadow: inset 0 2px 5px -3px #8faf91;
border-color: #9ebaa0;
color: #262a2e;
box-shadow: inset 0 2px 5px -3px #9ebaa0;
}

.wp-core-ui .button.active:focus {
box-shadow: 0 0 0 1px #32373c;
}

.wp-core-ui .button-primary {
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/css/colors/ocean/colors-rtl.min.css
View file

Large diffs are not rendered by default.

10 changes: 7 additions & 3 deletions wp-admin/css/colors/ocean/colors.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,13 @@ textarea:focus {
.wp-core-ui .button.active,
.wp-core-ui .button.active:focus,
.wp-core-ui .button.active:hover {
border-color: #8faf91;
color: #f2f2f2;
box-shadow: inset 0 2px 5px -3px #8faf91;
border-color: #9ebaa0;
color: #262a2e;
box-shadow: inset 0 2px 5px -3px #9ebaa0;
}

.wp-core-ui .button.active:focus {
box-shadow: 0 0 0 1px #32373c;
}

.wp-core-ui .button-primary {
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/css/colors/ocean/colors.min.css
View file

Large diffs are not rendered by default.

10 changes: 7 additions & 3 deletions wp-admin/css/colors/sunrise/colors-rtl.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,13 @@ textarea:focus {
.wp-core-ui .button.active,
.wp-core-ui .button.active:focus,
.wp-core-ui .button.active:hover {
border-color: #d97426;
color: #f2f2f2;
box-shadow: inset 0 2px 5px -3px #d97426;
border-color: #dd823b;
color: #262a2e;
box-shadow: inset 0 2px 5px -3px #dd823b;
}

.wp-core-ui .button.active:focus {
box-shadow: 0 0 0 1px #32373c;
}

.wp-core-ui .button-primary {
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/css/colors/sunrise/colors-rtl.min.css
View file

Large diffs are not rendered by default.

10 changes: 7 additions & 3 deletions wp-admin/css/colors/sunrise/colors.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,13 @@ textarea:focus {
.wp-core-ui .button.active,
.wp-core-ui .button.active:focus,
.wp-core-ui .button.active:hover {
border-color: #d97426;
color: #f2f2f2;
box-shadow: inset 0 2px 5px -3px #d97426;
border-color: #dd823b;
color: #262a2e;
box-shadow: inset 0 2px 5px -3px #dd823b;
}

.wp-core-ui .button.active:focus {
box-shadow: 0 0 0 1px #32373c;
}

.wp-core-ui .button-primary {
Expand Down
Loading

0 comments on commit 7e1bc6b

Please sign in to comment.