Ticket #21368: 21368.2.diff

wp-admin/includes/dashboard.php

@@ -1252 +1252 @@
                 <h4><?php _e( 'Next Steps' ); ?></h4>
                 <ul>
                 <?php if ( 'page' == get_option( 'show_on_front' ) && ! get_option( 'page_for_posts' ) ) : ?>
-                        <li><?php printf( '<a href="%s" class="welcome-edit-page">' . __( 'Edit your front page' ) . '</a>', get_edit_post_link( get_option( 'page_on_front' ) ) ); ?></li>
-                        <li><?php printf( '<a href="%s" class="welcome-add-page">' . __( 'Add additional pages' ) . '</a>', admin_url( 'post-new.php?post_type=page' ) ); ?></li>
+                        <li><?php printf( '<a href="%s" class="welcome-icon welcome-edit-page">' . __( 'Edit your front page' ) . '</a>', get_edit_post_link( get_option( 'page_on_front' ) ) ); ?></li>
+                        <li><?php printf( '<a href="%s" class="welcome-icon welcome-add-page">' . __( 'Add additional pages' ) . '</a>', admin_url( 'post-new.php?post_type=page' ) ); ?></li>
                 <?php elseif ( 'page' == get_option( 'show_on_front' ) ) : ?>
-                        <li><?php printf( '<a href="%s" class="welcome-edit-page">' . __( 'Edit your front page' ) . '</a>', get_edit_post_link( get_option( 'page_on_front' ) ) ); ?></li>
-                        <li><?php printf( '<a href="%s" class="welcome-add-page">' . __( 'Add additional pages' ) . '</a>', admin_url( 'post-new.php?post_type=page' ) ); ?></li>
-                        <li><?php printf( '<a href="%s" class="welcome-write-blog">' . __( 'Add a blog post' ) . '</a>', admin_url( 'post-new.php' ) ); ?></li>
+                        <li><?php printf( '<a href="%s" class="welcome-icon welcome-edit-page">' . __( 'Edit your front page' ) . '</a>', get_edit_post_link( get_option( 'page_on_front' ) ) ); ?></li>
+                        <li><?php printf( '<a href="%s" class="welcome-icon welcome-add-page">' . __( 'Add additional pages' ) . '</a>', admin_url( 'post-new.php?post_type=page' ) ); ?></li>
+                        <li><?php printf( '<a href="%s" class="welcome-icon welcome-write-blog">' . __( 'Add a blog post' ) . '</a>', admin_url( 'post-new.php' ) ); ?></li>
                 <?php else : ?>
-                        <li><?php printf( '<a href="%s" class="welcome-write-blog">' . __( 'Write your first blog post' ) . '</a>', admin_url( 'post-new.php' ) ); ?></li>
-                        <li><?php printf( '<a href="%s" class="welcome-add-page">' . __( 'Add an About page' ) . '</a>', admin_url( 'post-new.php?post_type=page' ) ); ?></li>
+                        <li><?php printf( '<a href="%s" class="welcome-icon welcome-write-blog">' . __( 'Write your first blog post' ) . '</a>', admin_url( 'post-new.php' ) ); ?></li>
+                        <li><?php printf( '<a href="%s" class="welcome-icon welcome-add-page">' . __( 'Add an About page' ) . '</a>', admin_url( 'post-new.php?post_type=page' ) ); ?></li>
                 <?php endif; ?>
-                        <li><?php printf( '<a href="%s" class="welcome-view-site">' . __( 'View your site' ) . '</a>', home_url( '/' ) ); ?></li>
+                        <li><?php printf( '<a href="%s" class="welcome-icon welcome-view-site">' . __( 'View your site' ) . '</a>', home_url( '/' ) ); ?></li>
                 </ul>
         </div>
         <div class="welcome-panel-column welcome-panel-last">
                 <h4><?php _e( 'More Actions' ); ?></h4>
                 <ul>
-                        <li><?php printf( '<div class="welcome-widgets-menus">Manage <a href="%s">' . __( 'widgets' ) . '</a> or <a href="%s">' . __( 'menus' ) . '</a></div>', admin_url( 'widgets.php' ), admin_url( 'nav-menus.php' ) ); ?></li>
-                        <li><?php printf( '<a href="%s" class="welcome-comments">' . __( 'Turn comments on or off' ) . '</a>', admin_url( 'options-discussion.php' ) ); ?></li>
-                        <li><?php printf( '<a href="%s" class="welcome-learn-more">' . __( 'Learn more about getting started' ) . '</a>', 'http://codex.wordpress.org/First_Steps_With_WordPress' ); ?></li>
+                        <li><?php printf( '<div class="welcome-icon welcome-widgets-menus">Manage <a href="%s">' . __( 'widgets' ) . '</a> or <a href="%s">' . __( 'menus' ) . '</a></div>', admin_url( 'widgets.php' ), admin_url( 'nav-menus.php' ) ); ?></li>
+                        <li><?php printf( '<a href="%s" class="welcome-icon welcome-comments">' . __( 'Turn comments on or off' ) . '</a>', admin_url( 'options-discussion.php' ) ); ?></li>
+                        <li><?php printf( '<a href="%s" class="welcome-icon welcome-learn-more">' . __( 'Learn more about getting started' ) . '</a>', 'http://codex.wordpress.org/First_Steps_With_WordPress' ); ?></li>
                 </ul>
         </div>
         </div>

wp-admin/css/wp-admin.css

@@ -2313 +2313 @@
         margin-right: 0;
 }
 
-.welcome-panel h4 .icon16 {
-        margin-left: -32px;
-}
-
 .welcome-panel-column p {
         margin-top: 7px;
 }
 
+.welcome-panel .welcome-icon {
+        display: block;
+        padding: 2px 0 8px 32px;
+        background-image: url('../images/welcome-icons.png');
+        background-repeat: no-repeat;
+        background-size: 16px;
+}
+
 .welcome-panel .welcome-add-page {
-        background: url('../images/welcome-icons.png') no-repeat 0 -1px;
+        background-position: 0 -1px;
 }
 
 .welcome-panel .welcome-edit-page {
-        background: url('../images/welcome-icons.png') no-repeat 0px -92px;
+        background-position: 0 -92px;
 }
 
 .welcome-panel .welcome-learn-more {
-        background: url('../images/welcome-icons.png') no-repeat 0px -138px;
+        background-position: 0 -138px;
 }
 
 .welcome-panel .welcome-comments {
-        background: url('../images/welcome-icons.png') no-repeat 0px -184px;
+        background-position: 0 -184px;
 }
 
 .welcome-panel .welcome-view-site {
-        background: url('../images/welcome-icons.png') no-repeat 0px -276px;
+        background-position: 0 -276px;
 }
 
 .welcome-panel .welcome-widgets-menus {
-        background: url('../images/welcome-icons.png') no-repeat 1px -230px;
+        background-position: 1px -230px;
         line-height: 14px;
 }
 
 .welcome-panel .welcome-write-blog {
-        background: url('../images/welcome-icons.png') no-repeat 0px -46px;
+        background-position: 0 -46px;
 }
 
-.welcome-panel .welcome-add-page,
-.welcome-panel .welcome-edit-page,
-.welcome-panel .welcome-learn-more,
-.welcome-panel .welcome-comments,
-.welcome-panel .welcome-view-site,
-.welcome-panel .welcome-widgets-menus,
-.welcome-panel .welcome-write-blog {
-        background-size: 16px;
-        display: block;
-        padding: 2px 0 8px 32px;
-}
-
 .welcome-panel .welcome-panel-column ul {
         margin: 0.8em 1em 1em 0;
 }
@@ -2392 +2384 @@
                 margin: 0.4em 0 0;
         }
 
-        .welcome-panel .welcome-add-page,
-        .welcome-panel .welcome-edit-page,
-        .welcome-panel .welcome-learn-more,
-        .welcome-panel .welcome-comments,
-        .welcome-panel .welcome-view-site,
-        .welcome-panel .welcome-widgets-menus,
-        .welcome-panel .welcome-write-blog {
+        .welcome-panel .welcome-icon {
                 padding-left: 25px;
         }
 }
@@ -8386 +8372 @@
                 background-size: 20px auto;
         }
 
-        .welcome-panel .welcome-add-page {
-                background: url('../images/welcome-icons-2x.png') no-repeat 0 -1px;
-                background-size: 16px;
+        .welcome-panel .welcome-icon {
+                background-image: url('../images/welcome-icons-2x.png');
         }
 
-        .welcome-panel .welcome-edit-page {
-                background: url('../images/welcome-icons-2x.png') no-repeat 0px -92px;
-                background-size: 16px;
-        }
-
-        .welcome-panel .welcome-learn-more {
-                background: url('../images/welcome-icons-2x.png') no-repeat 0px -138px;
-                background-size: 16px;
-        }
-
-        .welcome-panel .welcome-comments {
-                background: url('../images/welcome-icons-2x.png') no-repeat 0px -184px;
-                background-size: 16px;
-        }
-
-        .welcome-panel .welcome-view-site {
-                background: url('../images/welcome-icons-2x.png') no-repeat 0px -276px;
-                background-size: 16px;
-        }
-
-        .welcome-panel .welcome-widgets-menus {
-                background: url('../images/welcome-icons-2x.png') no-repeat 1px -230px;
-                background-size: 16px;
-        }
-
-        .welcome-panel .welcome-write-blog {
-                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;