Second half of new welcome panel formatting. Add .icon16, for menu icon reuse. see #11651.

git-svn-id: http://svn.automattic.com/wordpress/trunk@19163 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-admin/css/colors-fresh.dev.css

@@ -707,6 +707,9 @@ table.widefat span.spam a,
 .welcome-panel p {
 	color: #777;
 }
+.welcome-panel-column p {
+	color: #464646;
+}
 .welcome-panel .welcome-panel-close {
 	background: #eee;
 	text-shadow: 1px 1px 1px #eee;
@@ -1109,6 +1112,7 @@ table.widefat .spam a:hover,
 }
 
 /* menu and screen icons */
+.icon16.icon-dashboard,
 #adminmenu .menu-icon-dashboard div.wp-menu-image {
 	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -60px -33px;
 }
@@ -1119,6 +1123,7 @@ table.widefat .spam a:hover,
 	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -60px -1px;
 }
 
+.icon16.icon-post,
 #adminmenu .menu-icon-post div.wp-menu-image {
 	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -271px -33px;
 }
@@ -1128,6 +1133,7 @@ table.widefat .spam a:hover,
 	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -271px -1px;
 }
 
+.icon16.icon-media,
 #adminmenu .menu-icon-media div.wp-menu-image {
 	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -120px -33px;
 }
@@ -1137,6 +1143,7 @@ table.widefat .spam a:hover,
 	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -120px -1px;
 }
 
+.icon16.icon-links,
 #adminmenu .menu-icon-links div.wp-menu-image {
 	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -90px -33px;
 }
@@ -1146,6 +1153,7 @@ table.widefat .spam a:hover,
 	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -90px -1px;
 }
 
+.icon16.icon-page,
 #adminmenu .menu-icon-page div.wp-menu-image {
 	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -150px -33px;
 }
@@ -1155,6 +1163,7 @@ table.widefat .spam a:hover,
 	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -150px -1px;
 }
 
+.icon16.icon-comments,
 #adminmenu .menu-icon-comments div.wp-menu-image {
 	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -30px -33px;
 }
@@ -1165,6 +1174,7 @@ table.widefat .spam a:hover,
 	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -30px -1px;
 }
 
+.icon16.icon-appearance,
 #adminmenu .menu-icon-appearance div.wp-menu-image {
 	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll 0 -33px;
 }
@@ -1174,6 +1184,7 @@ table.widefat .spam a:hover,
 	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll 0 -1px;
 }
 
+.icon16.icon-plugins,
 #adminmenu .menu-icon-plugins div.wp-menu-image {
 	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -180px -33px;
 }
@@ -1183,6 +1194,7 @@ table.widefat .spam a:hover,
 	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -180px -1px;
 }
 
+.icon16.icon-users,
 #adminmenu .menu-icon-users div.wp-menu-image {
 	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -300px -33px;
 }
@@ -1193,6 +1205,7 @@ table.widefat .spam a:hover,
 	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -300px -1px;
 }
 
+.icon16.icon-tools,
 #adminmenu .menu-icon-tools div.wp-menu-image {
 	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -210px -33px;
 }
@@ -1203,7 +1216,7 @@ table.widefat .spam a:hover,
 	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -210px -1px;
 }
 
-#icon-options-general,
+.icon16.icon-settings,
 #adminmenu .menu-icon-settings div.wp-menu-image {
 	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -240px -33px;
 }
@@ -1213,6 +1226,7 @@ table.widefat .spam a:hover,
 	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -240px -1px;
 }
 
+.icon16.icon-site,
 #adminmenu .menu-icon-site div.wp-menu-image {
 	background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -360px -33px;
 }
@@ -1224,57 +1238,69 @@ table.widefat .spam a:hover,
 /* end menu and screen icons */
 
 /* Screen Icons */
+.icon32.icon-post,
 #icon-edit,
 #icon-post {
 	background: transparent url(../images/icons32.png?ver=20100531) no-repeat -552px -5px;
 }
 
+.icon32.icon-dashboard,
 #icon-index {
 	background: transparent url(../images/icons32.png?ver=20100531) no-repeat -137px -5px;
 }
 
+.icon32.icon-media,
 #icon-upload {
 	background: transparent url(../images/icons32.png?ver=20100531) no-repeat -251px -5px;
 }
 
+.icon32.icon-links,
 #icon-link-manager,
 #icon-link,
 #icon-link-category {
 	background: transparent url(../images/icons32.png?ver=20100531) no-repeat -190px -5px;
 }
 
+.icon32.icon-page,
 #icon-edit-pages,
 #icon-page {
 	background: transparent url(../images/icons32.png?ver=20100531) no-repeat -312px -5px;
 }
 
+.icon32.icon-comments,
 #icon-edit-comments {
 	background: transparent url(../images/icons32.png?ver=20100531) no-repeat -72px -5px;
 }
 
+.icon32.icon-appearance,
 #icon-themes {
 	background: transparent url(../images/icons32.png?ver=20100531) no-repeat -11px -5px;
 }
 
+.icon32.icon-plugins,
 #icon-plugins {
 	background: transparent url(../images/icons32.png?ver=20100531) no-repeat -370px -5px;
 }
 
+.icon32.icon-users,
 #icon-users,
 #icon-profile,
 #icon-user-edit {
 	background: transparent url(../images/icons32.png?ver=20100531) no-repeat -600px -5px;
 }
 
+.icon32.icon-tools,
 #icon-tools,
 #icon-admin {
 	background: transparent url(../images/icons32.png?ver=20100531) no-repeat -432px -5px;
 }
 
+.icon32.icon-settings,
 #icon-options-general {
 	background: transparent url(../images/icons32.png?ver=20100531) no-repeat -492px -5px;
 }
 
+.icon32.icon-site,
 #icon-ms-admin {
 	background: transparent url(../images/icons32.png?ver=20100531) no-repeat -659px -5px;
 }

wp-admin/css/wp-admin.dev.css

@@ -721,6 +721,14 @@ h2 .nav-tab,
 	width: 36px;
 }
 
+.icon16 {
+	height: 18px;
+	width: 18px;
+	padding: 6px 6px;
+	margin: -6px 0 0 -8px;
+	float: left;
+}
+
 .key-labels label {
 	line-height: 24px;
 }
@@ -2152,7 +2160,6 @@ body.admin-bar #adminmenu {
 	border-width: 1px 0;
 	border-style: solid;
 	position: relative;
-	font-size: 14px;
 	line-height: 1.6em;
 	overflow: auto;
 }
@@ -2161,7 +2168,10 @@ body.admin-bar #adminmenu {
 	font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", sans-serif;
 	font-size: 32px;
 	font-weight: normal;
-	margin: 0 0 0.8em;
+	margin: 0.1em 0 0.8em;
+}
+.welcome-panel h4 {
+	font-size: 14px;
 }
 
 .welcome-panel .welcome-panel-close {
@@ -2184,13 +2194,32 @@ body.admin-bar #adminmenu {
 }
 
 .welcome-panel-content {
-	margin-left: 200px;
+	margin-left: 190px;
 }
 
 .welcome-panel .welcome-panel-column {
-	width: 33.33333%;
+	margin: 0 40px 0 24px;
+	max-width: 270px;
+	min-width: 220px;
+	width: 35%;
 	float: left;
 }
+.welcome-panel .welcome-panel-column:last-child {
+	margin-right: 0;
+}
+
+.welcome-panel h4 .icon16 {
+	margin-left: -32px;
+}
+
+.welcome-panel .welcome-panel-column ul {
+	margin-top: 1.6em;
+}
+
+.welcome-panel .welcome-panel-column li {
+	list-style-type: disc;
+	padding-left: 2px;
+}
 
 
 /*------------------------------------------------------------------------------

wp-admin/includes/dashboard.php

@@ -1288,9 +1288,14 @@ function wp_welcome_panel() {
 		<div class="welcome-panel-content">
 
 		<h3><?php _e( 'Welcome to WordPress!' ); ?></h3>
-		<p><?php _e( 'Welcome to your new WordPress site! Here are some things most people do when they set up a new WordPress site. To get started, use the links below and we&#8217;ll give you some extra help with these tasks.' ); ?></p>
+		<p class="about-description"><?php _e( 'Welcome to your new site! Here are some things most people do when they set up a new WordPress site. To get started, use the links below and we&#8217;ll give you some extra help with these tasks:' ); ?></p>
 
 		<div class="welcome-panel-column">
+			<h4>
+				<span class="icon16 icon-settings"></span>
+				<?php _e( 'Customize your site' ); ?>
+			</h4>
+			<p><?php echo ( 'Holy pancakes, filler content! You should customize your site settings!' ); ?></p>
 			<ul>
 				<li>
 					<?php echo sprintf(
@@ -1306,17 +1311,7 @@ function wp_welcome_panel() {
 				</li>
 				<li>
 					<?php echo sprintf(
-						__( '<a href="%s">Set your time zone</a>.' ),
-						esc_url( admin_url('options-general.php') )
-					); ?>
-				</li>
-			</ul>
-		</div>
-		<div class="welcome-panel-column">
-			<ul>
-				<li>
-					<?php echo sprintf(
-						__( '<a href="%s">Edit your site tagline</a>.' ),
+						__( '<a href="%s">Set your time zone and site tagline</a>.' ),
 						esc_url( admin_url('options-general.php') )
 					); ?>
 				</li>
@@ -1326,19 +1321,18 @@ function wp_welcome_panel() {
 						esc_url( admin_url('themes.php') )
 					); ?>
 				</li>
-				<li>
-					<?php echo sprintf(
-						__( '<a href="%s">Add some widgets</a>.' ),
-						esc_url( admin_url('widgets.php') )
-					); ?>
-				</li>
 			</ul>
 		</div>
 		<div class="welcome-panel-column">
+			<h4>
+				<span class="icon16 icon-page"></span>
+				<?php _e( 'Create some content' ); ?>
+			</h4>
+			<p><?php echo ( 'What is a WordPress site without a voice? Publishing brings joy to the web.' ); ?></p>
 			<ul>
 				<li>
 					<?php echo sprintf(
-						__( 'Delete the default <a href="%1$s">post</a> and <a href="%2$s">comment</a>.' ),
+						__( 'Delete the <a href="%1$s">sample post</a> and <a href="%2$s">page</a>.' ),
 						esc_url( admin_url('edit.php') ),
 						esc_url( admin_url('edit-comments.php') )
 					); ?>
@@ -1351,7 +1345,7 @@ function wp_welcome_panel() {
 				</li>
 				<li>
 					<?php echo sprintf(
-						__( '<a href="%s">Edit the sample page</a> to be about you.' ),
+						__( '<a href="%s">Create an about page</a>.' ),
 						esc_url( admin_url('edit.php?post_type=page') )
 					); ?>
 				</li>

wp-includes/script-loader.php

@@ -437,7 +437,7 @@ function wp_default_styles( &$styles ) {
 	$styles->add_data( 'ie', 'conditional', 'lte IE 7' );
 
 	// all colors stylesheets need to have the same query strings (cache manifest compat)
-	$colors_version = '20111104';
+	$colors_version = '20111104a';
 
 	// Register "meta" stylesheet for admin colors. All colors-* style sheets should have the same version string.
 	$styles->add( 'colors', true, array('wp-admin'), $colors_version );