Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Media: Prevents clipping of text when scaling image edit screen.
This reapplies [46354] clean as the previous commit had remnants of an unrelated patch.

Props sabernhardt, audrasjb, afercia.
See #47115.


git-svn-id: https://develop.svn.wordpress.org/trunk@46359 602fd350-edb4-49c9-b593-d223f7449a82
  • Loading branch information
antpb committed Sep 30, 2019
1 parent d653490 commit 4b152de
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 5 deletions.
6 changes: 6 additions & 0 deletions src/wp-admin/css/edit.css
Expand Up @@ -652,6 +652,12 @@ form#tags-filter {
margin-bottom: 20px;
}

.wp_attachment_details .attachment-content-description {
margin-top: 0.5385em;
display: inline-block;
min-height: 1.6923em;
}

/* Suggested text for privacy policy */
.wp-privacy-policy-guide {
max-width: 1000px;
Expand Down
11 changes: 10 additions & 1 deletion src/wp-admin/css/media.css
Expand Up @@ -1114,10 +1114,14 @@ span.imgedit-scale-warn {
padding: 10px;
}

.imgedit-settings .imgedit-original-dimensions {
display: inline-block;
}

.imgedit-settings .imgedit-scale input[type="text"],
.imgedit-settings .imgedit-crop-ratio input[type="text"],
.imgedit-settings .imgedit-crop-sel input[type="text"] {
width: 50px;
width: 80px;
font-size: 14px;
padding: 5px 8px;
}
Expand All @@ -1130,6 +1134,11 @@ span.imgedit-scale-warn {
color: #444;
}

.imgedit-settings .imgedit-scale-button-wrapper {
margin-top: 0.3077em;
display: block;
}

.imgedit-settings .imgedit-scale .button {
margin-bottom: 0;
}
Expand Down
4 changes: 2 additions & 2 deletions src/wp-admin/includes/image-edit.php
Expand Up @@ -62,7 +62,7 @@ function wp_image_editor( $post_id, $msg = false ) {
printf(
/* translators: %s: Image width and height in pixels. */
__( 'Original dimensions %s' ),
$meta['width'] . ' × ' . $meta['height']
'<span class="imgedit-original-dimensions">' . $meta['width'] . ' &times; ' . $meta['height'] . '</span>'
);
?>
</p>
Expand All @@ -78,7 +78,7 @@ function wp_image_editor( $post_id, $msg = false ) {
<label for="imgedit-scale-height-<?php echo $post_id; ?>" class="screen-reader-text"><?php _e( 'scale height' ); ?></label>
<input type="text" id="imgedit-scale-height-<?php echo $post_id; ?>" onkeyup="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0, this)" onblur="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0, this)" value="<?php echo isset( $meta['height'] ) ? $meta['height'] : 0; ?>" />
<span class="imgedit-scale-warn" id="imgedit-scale-warn-<?php echo $post_id; ?>">!</span>
<input id="imgedit-scale-button" type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'scale')" class="button button-primary" value="<?php esc_attr_e( 'Scale' ); ?>" />
<div class="imgedit-scale-button-wrapper"><input id="imgedit-scale-button" type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'scale')" class="button button-primary" value="<?php esc_attr_e( 'Scale' ); ?>" /></div>
</div>
</fieldset>

Expand Down
2 changes: 1 addition & 1 deletion src/wp-admin/includes/media.php
Expand Up @@ -3207,7 +3207,7 @@ function edit_form_image_editor( $post ) {

?>

<label for="attachment_content"><strong><?php _e( 'Description' ); ?></strong>
<label for="attachment_content" class="attachment-content-description"><strong><?php _e( 'Description' ); ?></strong>
<?php

if ( preg_match( '#^(audio|video)/#', $post->post_mime_type ) ) {
Expand Down
2 changes: 1 addition & 1 deletion src/wp-includes/css/editor.css
Expand Up @@ -1322,7 +1322,7 @@ i.mce-i-wp_code:before {
.wp-core-ui .quicktags-toolbar input.button.button-small {
/* .button-small is normally 11px, but a bit too small for these buttons. */
font-size: 12px;
height: 26px;
min-height: 26px;
line-height: 2;
}
}
Expand Down

0 comments on commit 4b152de

Please sign in to comment.