Ticket #30468: 30468.5.patch

src/wp-includes/class-wp-editor.php

@@ -1403 +1403 @@
                 // display: none is required here, see #WP27605
                 ?>
                 <div id="wp-link-backdrop" style="display: none"></div>
-                <div id="wp-link-wrap" class="wp-core-ui" style="display: none">
+                <div id="wp-link-wrap" class="wp-core-ui" style="display: none" role="dialog" aria-labelledby="link-modal-title">
                 <form id="wp-link" tabindex="-1">
                 <?php wp_nonce_field( 'internal-linking', '_ajax_linking_nonce', false ); ?>
-                <div id="link-modal-title">
-                        <?php _e( 'Insert/edit link' ) ?>
-                        <button type="button" id="wp-link-close"><span class="screen-reader-text"><?php _e( 'Close' ); ?></span></button>
-                </div>
+                <h1 id="link-modal-title"><?php _e( 'Insert/edit link' ) ?></h1>
+                <button type="button" id="wp-link-close"><span class="screen-reader-text"><?php _e( 'Close' ); ?></span></button>
                 <div id="link-selector">
                         <div id="link-options">
                                 <div>
@@ -1421 +1419 @@
                                         <input id="wp-link-text" type="text" /></label>
                                 </div>
                                 <div class="link-target">
-                                        <label><span>&nbsp;</span>
+                                        <label><span></span>
                                         <input type="checkbox" id="wp-link-target" /> <?php _e( 'Open link in a new tab' ); ?></label>
                                 </div>
                         </div>
@@ -1428 +1426 @@
                 </div>
                 <div class="submitbox">
                         <div id="wp-link-cancel">
-                                <a class="submitdelete deletion" href="#"><?php _e( 'Cancel' ); ?></a>
+                                <button type="button" class="button"><?php _e( 'Cancel' ); ?></button>
                         </div>
                         <div id="wp-link-update">
                                 <input type="submit" value="<?php esc_attr_e( 'Add Link' ); ?>" class="button button-primary" id="wp-link-submit" name="wp-link-submit">

src/wp-includes/css/editor.css

@@ -1074 +1074 @@
         padding: 10px;
         margin: 1px 0 0;
         line-height: 150%;
-        border: 0 none;
+        border: 0;
         outline: none;
         display: block;
         resize: vertical;
@@ -1388 +1388 @@
         font-size: 18px;
         font-weight: 600;
         line-height: 36px;
+        margin: 0;
         padding: 0 36px 0 16px;
-        top: 0;
-        right: 0;
-        left: 0;
 }
 
 #wp-link-close {
@@ -1438 +1436 @@
         padding: 0 16px 50px;
 }
 
-#wp-link-wrap.search-panel-visible #link-selector {
-        -webkit-overflow-scrolling: touch;
-}
-
 #wp-link ol,
 #wp-link ul {
         list-style: none;
@@ -1494 +1488 @@
         max-width: 70%;
 }
 
-#wp-link li {
-        clear: both;
-        margin-bottom: 0;
-        border-bottom: 1px solid #f1f1f1;
-        color: #32373c;
-        padding: 4px 6px 4px 10px;
-        cursor: pointer;
-        position: relative;
-}
-
-#wp-link li:hover {
-        background: #eaf2fa;
-        color: #151515;
-}
-
-#wp-link li.unselectable {
-        border-bottom: 1px solid #ddd;
-}
-
-#wp-link li.unselectable:hover {
-        background: #fff;
-        cursor: auto;
-        color: #32373c;
-}
-
-#wp-link li.selected {
-        background: #ddd;
-        color: #32373c;
-}
-
-#wp-link li.selected .item-title {
-        font-weight: bold;
-}
-
-#wp-link li:last-child {
-        border: none;
-}
-
-#wp-link .item-title {
-        display: inline-block;
-        width: 80%;
-        width: -webkit-calc(100% - 68px);
-        width: calc(100% - 68px);
-        word-wrap: break-word;
-}
-
-#wp-link .item-info {
-        text-transform: uppercase;
-        color: #666;
-        font-size: 11px;
-        position: absolute;
-        right: 5px;
-        top: 5px;
-}
-
 #wp-link .submitbox {
         padding: 8px 16px;
         background: #fcfcfc;
@@ -1571 +1510 @@
 
 #wp-link-submit {
         float: right;
-        margin-bottom: 0;
 }
 
 @media screen and ( max-width: 782px ) {
@@ -1583 +1521 @@
                 padding: 0 16px 60px;
         }
 
-        #wp-link-wrap.search-panel-visible #link-selector {
-                bottom: 52px;
-        }
-
         #wp-link-cancel {
                 line-height: 32px;
         }
+
+        #wp-link .link-target {
+                padding-top: 10px;
+        }
+
+        #wp-link .submitbox .button {
+                margin-bottom: 0;
+        }
 }
 
 @media screen and ( max-width: 520px ) {

src/wp-includes/js/wplink.js

@@ -35 +35 @@
                                 wpLink.update();
                         });
 
-                        inputs.close.add( inputs.backdrop ).add( '#wp-link-cancel a' ).click( function( event ) {
+                        inputs.close.add( inputs.backdrop ).add( '#wp-link-cancel .button' ).click( function( event ) {
                                 event.preventDefault();
                                 wpLink.close();
                         });