Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-27 06:42:56 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Built from https://develop.svn.wordpress.org/trunk@27510


git-svn-id: http://core.svn.wordpress.org/trunk@27353 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2014-03-12 03:07:15 +00:00
parent 8e6ec4f72c
commit d1008b2dfe
7 changed files with 93 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-includes/class-wp-editor.php
View File

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

64
wp-includes/css/editor-rtl.css
View File

@ -1153,8 +1153,8 @@ i.mce-caret:before {
left: 0; left: 0;
} }
#wp-link-cancel { #wp-link-cancel {
line-height: 25px; line-height: 25px;
} }
#wp-link-update { #wp-link-update {
@ -1167,39 +1167,61 @@ i.mce-caret:before {
margin-bottom: 0; margin-bottom: 0;
} }
@media screen and ( max-width: 782px ), ( max-height: 520px ) { @media screen and ( max-width: 782px ) {
#wp-link-wrap {
height: 270px;
margin-top: -135px;
}
#wp-link-wrap, #wp-link-wrap.search-panel-visible .query-results {
#wp-link-wrap.search-panel-visible { top: 235px;
}
}
@media screen and ( max-width: 620px ) {
#wp-link-wrap {
width: auto; width: auto;
height: auto; margin-right: 0;
margin: 0;
top: 10px;
right: 10px; right: 10px;
left: 10px; left: 10px;
bottom: 10px;
max-width: 600px; max-width: 600px;
margin: auto; }
}
@media screen and ( max-height: 520px ) {
#wp-link-wrap.search-panel-visible {
height: auto;
margin-top: 0;
top: 10px;
bottom: 10px;
}
.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 { #link-selector {
overflow: auto; overflow: auto;
height: calc(100% - 88px); height: calc(100% - 92px);
padding-bottom: 0; padding-bottom: 10px;
}
#wp-link #search-panel {
display: block;
}
#wp-link-search-toggle {
display: none;
} }
#search-panel .query-results { #search-panel .query-results {
position: static; position: static;
} }
} }
/* Old TinyMCE 3.x modal */ /* Old TinyMCE 3.x modal */

2
wp-includes/css/editor-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

64
wp-includes/css/editor.css
View File

@ -1153,8 +1153,8 @@ i.mce-caret:before {
right: 0; right: 0;
} }
#wp-link-cancel { #wp-link-cancel {
line-height: 25px; line-height: 25px;
} }
#wp-link-update { #wp-link-update {
@ -1167,39 +1167,61 @@ i.mce-caret:before {
margin-bottom: 0; margin-bottom: 0;
} }
@media screen and ( max-width: 782px ), ( max-height: 520px ) { @media screen and ( max-width: 782px ) {
#wp-link-wrap {
height: 270px;
margin-top: -135px;
}
#wp-link-wrap, #wp-link-wrap.search-panel-visible .query-results {
#wp-link-wrap.search-panel-visible { top: 235px;
}
}
@media screen and ( max-width: 620px ) {
#wp-link-wrap {
width: auto; width: auto;
height: auto; margin-left: 0;
margin: 0;
top: 10px;
left: 10px; left: 10px;
right: 10px; right: 10px;
bottom: 10px;
max-width: 600px; max-width: 600px;
margin: auto; }
}
@media screen and ( max-height: 520px ) {
#wp-link-wrap.search-panel-visible {
height: auto;
margin-top: 0;
top: 10px;
bottom: 10px;
}
.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 { #link-selector {
overflow: auto; overflow: auto;
height: calc(100% - 88px); height: calc(100% - 92px);
padding-bottom: 0; padding-bottom: 10px;
}
#wp-link #search-panel {
display: block;
}
#wp-link-search-toggle {
display: none;
} }
#search-panel .query-results { #search-panel .query-results {
position: static; position: static;
} }
} }
/* Old TinyMCE 3.x modal */ /* Old TinyMCE 3.x modal */

2
wp-includes/css/editor.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/js/wplink.js
View File

@ -38,7 +38,7 @@ var wpLink;
event.preventDefault(); event.preventDefault();
wpLink.update(); 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(); event.preventDefault();
wpLink.close(); wpLink.close();
}); });

2
wp-includes/js/wplink.min.js vendored
View File

File diff suppressed because one or more lines are too long