Skip to content

Commit

Permalink
Initial merge with WP 5.2.3
Browse files Browse the repository at this point in the history
  • Loading branch information
patrickebates committed Sep 5, 2019
1 parent d72bb9e commit ab2c0d3
Show file tree
Hide file tree
Showing 100 changed files with 852 additions and 695 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Project Nami
===============

### Version: `2.2.2` ###
### Version: `2.2.3` ###

### Description: ###
[![Deploy to Azure](http://azuredeploy.net/deploybutton.png)](https://deploy.azure.com/?repository=https://github.com/ProjectNami/projectnami/tree/latest)
Expand Down
27 changes: 26 additions & 1 deletion wp-admin/about.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,31 @@

<div class="changelog point-releases">
<h3><?php _e( 'Maintenance and Security Releases' ); ?></h3>
<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 some security issues and fixed %2$s bug.',
'<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.',
29
),
'5.2.3',
number_format_i18n( 29 )
);
?>
<?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.2.3' )
)
);
?>
</p>
<p>
<?php
printf(
Expand Down Expand Up @@ -151,7 +176,7 @@
</div>
<div class="column is-vertically-aligned-center">
<h3><?php _e( 'PHP Error Protection' ); ?></h3>
<p><?php _e( 'This administrator-focused update will let you safely fix or manage fatal errors without requiring developer time. It features better handling of the so-called “white screen of death”, and a way to enter recovery mode, which pauses error-causing plugins or themes.' ); ?></p>
<p><?php _e( 'This administrator-focused update will let you safely fix or manage fatal errors without requiring a developer. It features better handling of the so-called “white screen of death”, and a way to enter recovery mode, which pauses error-causing plugins or themes.' ); ?></p>
</div>
</div>

Expand Down
2 changes: 1 addition & 1 deletion wp-admin/async-upload.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

require_once( ABSPATH . 'wp-admin/admin.php' );

header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
header( 'Content-Type: text/plain; charset=' . get_option( 'blog_charset' ) );

if ( isset( $_REQUEST['action'] ) && 'upload-attachment' === $_REQUEST['action'] ) {
include( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
Expand Down
4 changes: 3 additions & 1 deletion wp-admin/css/color-picker-rtl.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
/* rtl:ignore */
.wp-color-picker {
width: 80px;
direction: ltr;
}

.wp-picker-container .hidden {
Expand Down Expand Up @@ -39,7 +41,7 @@
border-right: 1px solid #999;
}

.wp-picker-containers {
.wp-picker-container {
display: inline-block;
}

Expand Down
2 changes: 1 addition & 1 deletion wp-admin/css/color-picker-rtl.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion wp-admin/css/color-picker.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
/* rtl:ignore */
.wp-color-picker {
width: 80px;
direction: ltr;
}

.wp-picker-container .hidden {
Expand Down Expand Up @@ -39,7 +41,7 @@
border-left: 1px solid #999;
}

.wp-picker-containers {
.wp-picker-container {
display: inline-block;
}

Expand Down
2 changes: 1 addition & 1 deletion wp-admin/css/color-picker.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions wp-admin/css/common-rtl.css
Original file line number Diff line number Diff line change
Expand Up @@ -2656,12 +2656,17 @@ div.action-links {
left: 250px;
bottom: 0;
right: 0;
margin-top: 10px;
margin-left: 250px; /* FYI box */
padding: 10px 26px;
margin-bottom: -99939px; /* 60px less than the padding below to accommodate footer */
padding-bottom: 99999px; /* equal height column trick */
}

#section-holder .notice {
margin: 5px 0 15px;
}

#section-holder .updated {
margin: 16px 0;
}
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/css/common-rtl.min.css

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions wp-admin/css/common.css
Original file line number Diff line number Diff line change
Expand Up @@ -2656,12 +2656,17 @@ div.action-links {
right: 250px;
bottom: 0;
left: 0;
margin-top: 10px;
margin-right: 250px; /* FYI box */
padding: 10px 26px;
margin-bottom: -99939px; /* 60px less than the padding below to accommodate footer */
padding-bottom: 99999px; /* equal height column trick */
}

#section-holder .notice {
margin: 5px 0 15px;
}

#section-holder .updated {
margin: 16px 0;
}
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/css/common.min.css

Large diffs are not rendered by default.

8 changes: 2 additions & 6 deletions wp-admin/css/forms-rtl.css
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ fieldset label,
background-color: #eee;
border: 1px solid #ddd;
color: #23282d;
margin: -1px 0 5px;
margin: -1px 1px 5px;
padding: 3px 5px;
text-align: center;
width: 25em;
Expand Down Expand Up @@ -522,7 +522,7 @@ fieldset label,

.wp-pwd [type="text"],
.wp-pwd [type="password"] {
margin: 0;
margin-bottom: 0;
/* Same height as the buttons */
line-height: 20px;
min-height: 28px;
Expand All @@ -542,10 +542,6 @@ fieldset label,
display: inline-block;
}

.form-table span.description.important {
font-size: 12px;
}

p.search-box {
float: left;
margin: 0;
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/css/forms-rtl.min.css

Large diffs are not rendered by default.

8 changes: 2 additions & 6 deletions wp-admin/css/forms.css
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ fieldset label,
background-color: #eee;
border: 1px solid #ddd;
color: #23282d;
margin: -1px 0 5px;
margin: -1px 1px 5px;
padding: 3px 5px;
text-align: center;
width: 25em;
Expand Down Expand Up @@ -522,7 +522,7 @@ fieldset label,

.wp-pwd [type="text"],
.wp-pwd [type="password"] {
margin: 0;
margin-bottom: 0;
/* Same height as the buttons */
line-height: 20px;
min-height: 28px;
Expand All @@ -542,10 +542,6 @@ fieldset label,
display: inline-block;
}

.form-table span.description.important {
font-size: 12px;
}

p.search-box {
float: right;
margin: 0;
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/css/forms.min.css

Large diffs are not rendered by default.

79 changes: 3 additions & 76 deletions wp-admin/css/install-rtl.css
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,9 @@ submit {
.form-table input[type=text],
.form-table input[type=email],
.form-table input[type=url],
.form-table input[type=password] {
width: 206px;
.form-table input[type=password],
#pass-strength-result {
width: 218px;
}

.form-table th p {
Expand Down Expand Up @@ -212,66 +213,6 @@ submit {
font-family: Consolas, Monaco, monospace;
}

.wp-hide-pw > .dashicons {
line-height: inherit;
}

#pass-strength-result {
background-color: #eee;
border: 1px solid #ddd;
color: #23282d;
margin: -2px 0px 5px 5px;
padding: 3px 5px;
text-align: center;
width: 218px;
box-sizing: border-box;
opacity: 0;
}

#pass-strength-result.short {
background-color: #f1adad;
border-color: #e35b5b;
opacity: 1;
}

#pass-strength-result.bad {
background-color: #fbc5a9;
border-color: #f78b53;
opacity: 1;
}

#pass-strength-result.good {
background-color: #ffe399;
border-color: #ffc733;
opacity: 1;
}

#pass-strength-result.strong {
background-color: #c1e1b9;
border-color: #83c373;
opacity: 1;
}

#pass1.short, #pass1-text.short {
border-color: #e35b5b;
}

#pass1.bad, #pass1-text.bad {
border-color: #f78b53;
}

#pass1.good, #pass1-text.good {
border-color: #ffc733;
}

#pass1.strong, #pass1-text.strong {
border-color: #83c373;
}

.pw-weak {
display: none;
}

.message {
border-right: 4px solid #dc3232;
padding: .7em .6em;
Expand All @@ -291,20 +232,6 @@ submit {
direction: ltr;
}

#pass1-text,
.show-password #pass1 {
display: none;
}

.show-password #pass1-text
{
display: inline-block;
}

.form-table span.description.important {
font-size: 12px;
}


/* localization */
body.rtl,
Expand Down
Loading

0 comments on commit ab2c0d3

Please sign in to comment.