From 06ee3708149a197a165b59476191c20d0598af58 Mon Sep 17 00:00:00 2001 From: Ryan Boren Date: Sat, 17 Nov 2012 15:11:29 +0000 Subject: [PATCH] Pinking shears git-svn-id: http://core.svn.wordpress.org/trunk@22634 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-activate.php | 6 +-- wp-admin/css/wp-admin-rtl.css | 2 +- wp-admin/css/wp-admin.css | 14 ++--- wp-admin/customize.php | 4 +- wp-admin/install.php | 2 +- wp-admin/menu-header.php | 2 +- wp-admin/plugin-install.php | 2 +- wp-includes/cache.php | 2 +- wp-includes/category.php | 2 +- wp-includes/class-wp-customize-manager.php | 6 +-- wp-includes/class-wp-customize-setting.php | 2 +- wp-includes/css/admin-bar.css | 2 +- wp-includes/functions.php | 6 +-- wp-includes/general-template.php | 12 ++--- wp-includes/js/admin-bar.js | 2 +- wp-includes/js/colorpicker.js | 62 +++++++++++----------- wp-includes/ms-blogs.php | 8 +-- wp-includes/post-template.php | 8 +-- wp-includes/query.php | 4 +- wp-includes/taxonomy.php | 2 +- wp-includes/template.php | 2 +- 21 files changed, 76 insertions(+), 76 deletions(-) diff --git a/wp-activate.php b/wp-activate.php index b3e24d4359..0d5f1dca36 100644 --- a/wp-activate.php +++ b/wp-activate.php @@ -2,7 +2,7 @@ /** * Confirms that the activation key that is sent in an email after a user signs * up for a new blog matches the key for that user and then displays confirmation. - * + * * @package WordPress */ @@ -26,7 +26,7 @@ do_action( 'activate_header' ); /** * Adds an action hook specific to this page that fires on wp_head - * + * * @since MU */ function do_activate_header() { @@ -36,7 +36,7 @@ add_action( 'wp_head', 'do_activate_header' ); /** * Loads styles specific to this page. - * + * * @since MU */ function wpmu_activate_stylesheet() { diff --git a/wp-admin/css/wp-admin-rtl.css b/wp-admin/css/wp-admin-rtl.css index 3e595ea3fa..c6a7b7e0a8 100644 --- a/wp-admin/css/wp-admin-rtl.css +++ b/wp-admin/css/wp-admin-rtl.css @@ -475,7 +475,7 @@ form.upgrade .hint { margin-left: 15px; margin-right: 52px; } - + .auto-fold #adminmenu div.wp-menu-image { float: right; width: 30px; diff --git a/wp-admin/css/wp-admin.css b/wp-admin/css/wp-admin.css index ec64173b39..2d8edf8dd8 100644 --- a/wp-admin/css/wp-admin.css +++ b/wp-admin/css/wp-admin.css @@ -8380,12 +8380,12 @@ a.widget-control-edit { background: url('../images/stars-2x.png?ver=20121108') repeat-x top left; background-size: 21px 37px; } - + .welcome-panel .welcome-panel-close:before { background-image: url('../images/xit-2x.gif'); background-size: 20px auto; } - + .welcome-panel .welcome-add-page { background: url('../images/welcome-icons-2x.png') no-repeat 0 -1px; background-size: 16px; @@ -8420,7 +8420,7 @@ a.widget-control-edit { background: url('../images/welcome-icons-2x.png') no-repeat 0px -46px; background-size: 16px; } - + .login h1 a { background-image: url('../images/wordpress-logo-2x.png?ver=20120412'); background-size: 274px 63px; @@ -8430,16 +8430,16 @@ a.widget-control-edit { background-image: url('../images/wp-badge-2x.png?ver=20120516'); background-size: 173px 194px; } - + .wp-full-overlay .collapse-sidebar-arrow { background-image: url('../images/arrows-2x.png'); background-size: 15px 123px; } - + .pressthis a span { background-image: url(../images/press-this-2x.png?v=20121105); } - + .imgedit-crop, .imgedit-rleft, .imgedit-rright, @@ -8450,7 +8450,7 @@ a.widget-control-edit { background-image: url('../images/imgedit-icons-2x.png'); background-size: 260px 64px; } - + .spinner, .imgedit-wait, .customize-loading #customize-container { diff --git a/wp-admin/customize.php b/wp-admin/customize.php index 77037b1cc0..6bfbe337e6 100644 --- a/wp-admin/customize.php +++ b/wp-admin/customize.php @@ -71,7 +71,7 @@ do_action( 'customize_controls_print_scripts' );
- +
is_theme_active() ? __( 'Save & Publish' ) : __( 'Save & Activate' ); @@ -82,7 +82,7 @@ do_action( 'customize_controls_print_scripts' );
- + theme()->get_screenshot(); $cannot_expand = ! ( $screenshot || $wp_customize->theme()->get('Description') ); diff --git a/wp-admin/install.php b/wp-admin/install.php index cdd5df6d00..6fe6303cb9 100644 --- a/wp-admin/install.php +++ b/wp-admin/install.php @@ -58,7 +58,7 @@ function display_header() { <?php _e( 'WordPress › Installation' ); ?> - diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php index ec7ad4e9bf..25ebaa00fa 100644 --- a/wp-admin/menu-header.php +++ b/wp-admin/menu-header.php @@ -109,7 +109,7 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) { if ( ! empty( $submenu_items ) ) { echo "\n\t
    "; echo "
  • {$item[0]}
    • "; - + $first = true; foreach ( $submenu_items as $sub_key => $sub_item ) { if ( ! current_user_can( $sub_item[1] ) ) diff --git a/wp-admin/plugin-install.php b/wp-admin/plugin-install.php index a8fade3c29..cd64d63c9e 100644 --- a/wp-admin/plugin-install.php +++ b/wp-admin/plugin-install.php @@ -47,7 +47,7 @@ get_current_screen()->add_help_tab( array( 'content' => '

    ' . __('If you know what you’re looking for, Search is your best bet. The Search screen has options to search the WordPress.org Plugin Directory for a particular Term, Author, or Tag. You can also search the directory by selecting popular tags. Tags in larger type mean more plugins have been labeled with that tag.') . '

    ' . '

    ' . __('If you just want to get an idea of what’s available, you can browse Featured, Popular, and Newest plugins by using the links in the upper left of the screen. These sections rotate regularly.') . '

    ' . - '

    ' . __('You can also browse a user’s favorite plugins, by using the Favorites link in the upper left of the screen and entering their WordPress.org username.') . '

    ' . + '

    ' . __('You can also browse a user’s favorite plugins, by using the Favorites link in the upper left of the screen and entering their WordPress.org username.') . '

    ' . '

    ' . __('If you want to install a plugin that you’ve downloaded elsewhere, click the Upload link in the upper left. You will be prompted to upload the .zip package, and once uploaded, you can activate the new plugin.') . '

    ' ) ); diff --git a/wp-includes/cache.php b/wp-includes/cache.php index d76ae3aeae..933c7b2ec1 100644 --- a/wp-includes/cache.php +++ b/wp-includes/cache.php @@ -629,7 +629,7 @@ class WP_Object_Cache { $this->multisite = is_multisite(); $this->blog_prefix = $this->multisite ? $blog_id . ':' : ''; - + /** * @todo This should be moved to the PHP4 style constructor, PHP5 diff --git a/wp-includes/category.php b/wp-includes/category.php index f018d7cecb..adac2475bf 100644 --- a/wp-includes/category.php +++ b/wp-includes/category.php @@ -165,7 +165,7 @@ function get_category_by_slug( $slug ) { * * @since 1.0.0 * - * @param string $cat_name Category name. + * @param string $cat_name Category name. * @return int 0, if failure and ID of category on success. */ function get_cat_ID( $cat_name ) { diff --git a/wp-includes/class-wp-customize-manager.php b/wp-includes/class-wp-customize-manager.php index 7d9166c192..4be338969a 100644 --- a/wp-includes/class-wp-customize-manager.php +++ b/wp-includes/class-wp-customize-manager.php @@ -73,7 +73,7 @@ final class WP_Customize_Manager { * @since 3.4.0 * * @param mixed $ajax_message AJAX return - * @param mixed $message UI message + * @param mixed $message UI message */ protected function wp_die( $ajax_message, $message = null ) { if ( $this->doing_ajax() ) @@ -98,7 +98,7 @@ final class WP_Customize_Manager { return '_default_wp_die_handler'; } - + /** * Start preview and customize theme. * @@ -140,7 +140,7 @@ final class WP_Customize_Manager { $this->start_previewing_theme(); } - + /** * Callback to validate a theme once it is loaded * diff --git a/wp-includes/class-wp-customize-setting.php b/wp-includes/class-wp-customize-setting.php index 145cf9daea..dd49f79f26 100644 --- a/wp-includes/class-wp-customize-setting.php +++ b/wp-includes/class-wp-customize-setting.php @@ -380,7 +380,7 @@ class WP_Customize_Setting { * @since 3.4.0 */ class WP_Customize_Filter_Setting extends WP_Customize_Setting { - + /** * @since 3.4.0 */ diff --git a/wp-includes/css/admin-bar.css b/wp-includes/css/admin-bar.css index 30b99d01f0..f924db9594 100644 --- a/wp-includes/css/admin-bar.css +++ b/wp-includes/css/admin-bar.css @@ -607,7 +607,7 @@ background-image: url(../images/admin-bar-sprite-2x.png?d=20120830); background-size: 20px 220px; } - + #wpadminbar .quicklinks li div.blavatar { background: url('../images/wpmini-blue-2x.png') no-repeat; background-size: 16px 16px; diff --git a/wp-includes/functions.php b/wp-includes/functions.php index de157941cc..e64f6f9469 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -2129,7 +2129,7 @@ function _default_wp_die_handler( $message, $title = '', $args = array() ) { .button { display: inline-block; text-decoration: none; - font-size: 14px; + font-size: 14px; line-height: 23px; height: 24px; margin: 0; @@ -2153,7 +2153,7 @@ function _default_wp_die_handler( $message, $title = '', $args = array() ) { color: #333; text-shadow: 0 1px 0 #fff; } - + .button.button-large { height: 29px; line-height: 28px; @@ -2172,7 +2172,7 @@ function _default_wp_die_handler( $message, $title = '', $args = array() ) { border-color: #999; color: #222; } - + .button:focus { -webkit-box-shadow: 1px 1px 1px rgba(0,0,0,.2); box-shadow: 1px 1px 1px rgba(0,0,0,.2); diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php index c7634bdcff..af3d572e59 100644 --- a/wp-includes/general-template.php +++ b/wp-includes/general-template.php @@ -1631,8 +1631,8 @@ function feed_links_extra( $args = array() ) { 'authortitle' => __('%1$s %2$s Posts by %3$s Feed'), /* translators: 1: blog name, 2: separator(raquo), 3: search phrase */ 'searchtitle' => __('%1$s %2$s Search Results for “%3$s” Feed'), - /* translators: 1: blog name, 2: separator(raquo), 3: post type name */ - 'posttypetitle' => __('%1$s %2$s %3$s Feed'), + /* translators: 1: blog name, 2: separator(raquo), 3: post type name */ + 'posttypetitle' => __('%1$s %2$s %3$s Feed'), ); $args = wp_parse_args( $args, $defaults ); @@ -1663,10 +1663,10 @@ function feed_links_extra( $args = array() ) { } elseif ( is_search() ) { $title = sprintf( $args['searchtitle'], get_bloginfo('name'), $args['separator'], get_search_query( false ) ); $href = get_search_feed_link(); - } elseif ( is_post_type_archive() ) { - $title = sprintf( $args['posttypetitle'], get_bloginfo('name'), $args['separator'], post_type_archive_title( '', false ) ); - $href = get_post_type_archive_feed_link( get_queried_object()->name ); - } + } elseif ( is_post_type_archive() ) { + $title = sprintf( $args['posttypetitle'], get_bloginfo('name'), $args['separator'], post_type_archive_title( '', false ) ); + $href = get_post_type_archive_feed_link( get_queried_object()->name ); + } if ( isset($title) && isset($href) ) echo '' . "\n"; diff --git a/wp-includes/js/admin-bar.js b/wp-includes/js/admin-bar.js index fc85d9738b..f53ff2c3ca 100644 --- a/wp-includes/js/admin-bar.js +++ b/wp-includes/js/admin-bar.js @@ -13,7 +13,7 @@ if ( typeof(jQuery) != 'undefined' ) { }; adminbar.removeClass('nojq').removeClass('nojs'); - + if ( 'ontouchstart' in window || /IEMobile\/[1-9]/.test(navigator.userAgent) ) { // touch screen device // close any open drop-downs when the click/touch is not on the toolbar $(document.body).on('click.wp-mobile-hover', function(e) { diff --git a/wp-includes/js/colorpicker.js b/wp-includes/js/colorpicker.js index 1fc32cf243..61c94bb9b3 100644 --- a/wp-includes/js/colorpicker.js +++ b/wp-includes/js/colorpicker.js @@ -11,7 +11,7 @@ // use. That means, you can include it in your product, or your web // site, or any other form where the code is actually being used. You // may not put the plain javascript up on your site for download or -// include it in your javascript libraries for download. +// include it in your javascript libraries for download. // If you wish to share this code with others, please just point them // to the URL instead. // Please DO NOT link directly to my .js files from your site. Copy @@ -21,7 +21,7 @@ /* SOURCE FILE: AnchorPosition.js */ -/* +/* AnchorPosition.js Author: Matt Kruse Last modified: 10/11/02 @@ -30,7 +30,7 @@ DESCRIPTION: These functions find the position of an tag in a document, so other elements can be positioned relative to it. COMPATABILITY: Netscape 4.x,6.x,Mozilla, IE 5.x,6.x on Windows. Some small -positioning errors - usually with Window positioning - occur on the +positioning errors - usually with Window positioning - occur on the Macintosh platform. FUNCTIONS: @@ -44,16 +44,16 @@ getAnchorWindowPosition(anchorname) NOTES: -1) For popping up separate browser windows, use getAnchorWindowPosition. +1) For popping up separate browser windows, use getAnchorWindowPosition. Otherwise, use getAnchorPosition -2) Your anchor tag MUST contain both NAME and ID attributes which are the +2) Your anchor tag MUST contain both NAME and ID attributes which are the same. For example: -3) There must be at least a space between for IE5.5 to see the +3) There must be at least a space between for IE5.5 to see the anchor tag correctly. Do not do with no space. -*/ +*/ // getAnchorPosition(anchorname) // This function returns an object having .x and .y properties which are the coordinates @@ -151,7 +151,7 @@ function AnchorPosition_getWindowOffsetTop (el) { /* SOURCE FILE: PopupWindow.js */ -/* +/* PopupWindow.js Author: Matt Kruse Last modified: 02/16/04 @@ -161,20 +161,20 @@ in a certain place. The window can either be a DIV or a separate browser window. COMPATABILITY: Works with Netscape 4.x, 6.x, IE 5.x on Windows. Some small -positioning errors - usually with Window positioning - occur on the -Macintosh platform. Due to bugs in Netscape 4.x, populating the popup +positioning errors - usually with Window positioning - occur on the +Macintosh platform. Due to bugs in Netscape 4.x, populating the popup window with