WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move the (recently added) `.notice` admin notices below the first H2, same as the `.updated` and `.error` notices. Props sippis, fixes #30885. 

Built from https://develop.svn.wordpress.org/trunk@31023


git-svn-id: http://core.svn.wordpress.org/trunk@31004 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2015-01-02 18:52:23 +00:00
parent fe0bf57deb
commit e0189c3686
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-admin/js/common.js
View File

@ -171,7 +171,7 @@ $('.contextual-help-tabs').delegate('a', 'click', function(e) {
}); });
$(document).ready( function() { $(document).ready( function() {
var checks, first, last, checked, sliced, mobileEvent, transitionTimeout, focusedRowActions, var checks, first, last, checked, sliced, mobileEvent, transitionTimeout, focusedRowActions, $firstHeading,
lastClicked = false, lastClicked = false,
pageInput = $('input.current-page'), pageInput = $('input.current-page'),
currentPage = pageInput.val(), currentPage = pageInput.val(),
@ -368,9 +368,10 @@ $(document).ready( function() {
}); });
} }
// Move .updated and .error alert boxes. Don't move boxes designed to be inline. // Move .notice, .updated and .error alert boxes. Don't move boxes designed to be inline.
$('div.wrap h2:first').nextAll('div.updated, div.error').addClass('below-h2'); $firstHeading = $( 'div.wrap h2:first' );
$('div.updated, div.error').not('.below-h2, .inline').insertAfter( $('div.wrap h2:first') ); $firstHeading.nextAll( 'div.updated, div.error, div.notice' ).addClass( 'below-h2' );
$( 'div.updated, div.error, div.notice' ).not( '.below-h2, .inline' ).insertAfter( $firstHeading );
// Init screen meta // Init screen meta
screenMeta.init(); screenMeta.init();

2
wp-admin/js/common.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.2-alpha-31022'; $wp_version = '4.2-alpha-31023';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.