Changeset 27510

Timestamp:

03/12/2014 03:06:11 AM (13 years ago)

Author:

azaozz

Message:

wpLink: bring back the Cancel link, improve responsive styles, see #26952

Location:

trunk/src/wp-includes

Files:

• class-wp-editor.php (modified) (1 diff)
• css/editor.css (modified) (3 diffs)
• js/wplink.js (modified) (1 diff)

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

@@ -1092 +1092 @@
                                 <input type="submit" value="<?php esc_attr_e( 'Add Link' ); ?>" class="button-primary" id="wp-link-submit" name="wp-link-submit">
                         </div>
+                        <div id="wp-link-cancel">
+                                <a class="submitdelete deletion" href="#"><?php _e( 'Cancel' ); ?></a>
+                        </div>
                 </div>
                 </form>

trunk/src/wp-includes/css/editor.css

@@ -1154 +1154 @@
 }
 
-#wp-link-cancel { 
-        line-height: 25px; 
+#wp-link-cancel {
+        line-height: 25px;
 }
 
@@ -1168 +1168 @@
 }
 
-@media screen and ( max-width: 782px ), ( max-height: 520px ) {
-
-        #wp-link-wrap,
-        #wp-link-wrap.search-panel-visible {
+@media screen and ( max-width: 782px ) {
+        #wp-link-wrap {
+                height: 270px;
+                margin-top: -135px;
+        }
+
+        #wp-link-wrap.search-panel-visible .query-results {
+                top: 235px;
+        }
+}
+
+@media screen and ( max-width: 620px ) {
+        #wp-link-wrap {
                 width: auto;
-                height: auto;
-                margin: 0;
-                top: 10px;
+                margin-left: 0;
                 left: 10px;
                 right: 10px;
+                max-width: 600px;
+        }
+}
+
+@media screen and ( max-height: 520px ) {
+        #wp-link-wrap.search-panel-visible {
+                height: auto;
+                margin-top: 0;
+                top: 10px;
                 bottom: 10px;
-                max-width: 600px;
-                margin: auto;
+        }
+
+        .search-panel-visible #link-selector {
+                overflow: auto;
+        }
+
+        .search-panel-visible #search-panel .query-results {
+                position: static;
+        }
+}
+
+@media screen and ( max-height: 290px ) {
+        #wp-link-wrap {
+                height: auto;
+                margin-top: 0;
+                top: 10px;
+                bottom: 10px;
         }
 
         #link-selector {
                 overflow: auto;
-                height: calc(100% - 88px);
-                padding-bottom: 0;
-        }
-
-        #wp-link #search-panel {
-                display: block;
-        }
-
-        #wp-link-search-toggle {
-                display: none;
+                height: calc(100% - 92px);
+                padding-bottom: 10px;
         }
 
@@ -1200 +1223 @@
                 position: static;
         }
-
 }
 

trunk/src/wp-includes/js/wplink.js

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