Shift welcome panel columns below WP badge. Improve column grid. props chexee, see #11651.

git-svn-id: https://develop.svn.wordpress.org/trunk@19342 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Daryl Koopersmith 2011-11-18 23:33:11 +00:00
parent 4c029929c3
commit 8ada86e942
4 changed files with 146 additions and 130 deletions

File diff suppressed because one or more lines are too long

View File

@ -2209,24 +2209,38 @@ body.admin-bar #adminmenu {
.welcome-panel .wp-badge {
float: left;
margin-bottom: 20px;
}
.welcome-panel-content {
max-width: 1500px;
}
.welcome-panel-content .about-description,
.welcome-panel h3 {
margin-left: 190px;
}
.welcome-panel p.welcome-panel-dismiss {
clear: both;
padding: 1.5em 0 0 0;
padding: 1em 0 0 0;
}
.welcome-panel .welcome-panel-column-container {
clear: both;
overflow: hidden;
position: relative;
padding-left: 25px;
}
.welcome-panel .welcome-panel-column {
margin: 0 40px 0 24px;
max-width: 270px;
min-width: 220px;
width: 25%;
margin: 0 5% 0 -25px;
padding-left: 25px;
width: 30%;
min-width: 200px;
float: left;
}
.welcome-panel .welcome-panel-column:last-child {
margin-right: 0;
}

View File

@ -1293,132 +1293,134 @@ function wp_welcome_panel() {
<h3><?php _e( 'Welcome to your new WordPress site! ' ); ?></h3>
<p class="about-description"><?php _e( 'If you need help getting started, check out our documentation on <a href="http://codex.wordpress.org/First_Steps_With_WordPress">First Steps with WordPress</a>. If you&#8217;d rather dive right in, here are a few things most people do first when they set up a new WordPress site. If you need help, use the Help tabs in the upper right corner to get information on how to use your current screen and where to go for more assistance.' ); ?></p>
<div class="welcome-panel-column">
<h4>
<span class="icon16 icon-settings"></span>
<?php _e( 'Basic Settings' ); ?>
</h4>
<p><?php _e( 'Here are a few easy things you can do to get your feet wet. Make sure to click Save on each Settings screen.' ); ?></p>
<ul>
<li>
<?php echo sprintf(
__( '<a href="%s">Choose your privacy setting</a>' ),
esc_url( admin_url('options-privacy.php') )
); ?>
</li>
<li>
<?php echo sprintf(
__( '<a href="%s">Select your tagline and time zone</a>' ),
esc_url( admin_url('options-general.php') )
); ?>
</li>
<li>
<?php echo sprintf(
__( '<a href="%s">Turn comments on or off</a>' ),
esc_url( admin_url('options-discussion.php') )
); ?>
</li>
<li>
<?php echo sprintf(
__( '<a href="%s">Fill in your profile</a>' ),
esc_url( admin_url('profile.php') )
); ?>
</li>
</ul>
</div>
<div class="welcome-panel-column">
<h4>
<span class="icon16 icon-page"></span>
<?php _e( 'Add Real Content' ); ?>
</h4>
<p><?php _e( 'Check out the sample page & post editors to see how it all works, then delete the default content and write your own!' ); ?></p>
<ul>
<li>
<?php echo sprintf(
__( 'View the <a href="%1$s">sample page</a> and <a href="%2$s">post</a>' ),
esc_url( get_permalink( 2 ) ),
esc_url( get_permalink( 1 ) )
); ?>
</li>
<li>
<?php echo sprintf(
__( 'Delete the <a href="%1$s">sample page</a> and <a href="%2$s">post</a>' ),
esc_url( admin_url('edit.php?post_type=page') ),
esc_url( admin_url('edit.php') )
); ?>
</li>
<li>
<?php echo sprintf(
__( '<a href="%s">Create an About Me page</a>' ),
esc_url( admin_url('edit.php?post_type=page') )
); ?>
</li>
<li>
<?php echo sprintf(
__( '<a href="%s">Write your first post</a>' ),
esc_url( admin_url('post-new.php') )
); ?>
</li>
</ul>
</div>
<div class="welcome-panel-column">
<h4>
<span class="icon16 icon-appearance"></span>
<?php _e( 'Customize Your Site' ); ?>
</h4>
<?php
$ct = current_theme_info();
if ( empty ( $ct->stylesheet_dir ) ) :
echo '<p>';
printf( __( '<a href="%s">Install a theme</a> to get started customizing your site.' ), esc_url( admin_url( 'themes.php' ) ) );
echo '</p>';
else:
echo '<p>';
printf( __( 'Use the current theme &mdash; %1$s &mdash; or <a href="%2$s">choose a new one</a>. If you stick with %3$s, here are a few ways to make your site look unique.' ), $ct->title, esc_url( admin_url( 'themes.php' ) ), $ct->title );
echo '</p>';
?>
<ul>
<?php if ( 'twentyeleven' == $ct->stylesheet ) : ?>
<li>
<?php echo sprintf(
__( '<a href="%s">Choose light or dark</a>' ),
esc_url( admin_url( 'themes.php?page=theme_options' ) )
); ?>
</li>
<div class="welcome-panel-column-container">
<div class="welcome-panel-column">
<h4>
<span class="icon16 icon-settings"></span>
<?php _e( 'Basic Settings' ); ?>
</h4>
<p><?php _e( 'Here are a few easy things you can do to get your feet wet. Make sure to click Save on each Settings screen.' ); ?></p>
<ul>
<li>
<?php echo sprintf(
__( '<a href="%s">Choose your privacy setting</a>' ),
esc_url( admin_url('options-privacy.php') )
); ?>
</li>
<li>
<?php echo sprintf(
__( '<a href="%s">Select your tagline and time zone</a>' ),
esc_url( admin_url('options-general.php') )
); ?>
</li>
<li>
<?php echo sprintf(
__( '<a href="%s">Turn comments on or off</a>' ),
esc_url( admin_url('options-discussion.php') )
); ?>
</li>
<li>
<?php echo sprintf(
__( '<a href="%s">Fill in your profile</a>' ),
esc_url( admin_url('profile.php') )
); ?>
</li>
</ul>
</div>
<div class="welcome-panel-column">
<h4>
<span class="icon16 icon-page"></span>
<?php _e( 'Add Real Content' ); ?>
</h4>
<p><?php _e( 'Check out the sample page & post editors to see how it all works, then delete the default content and write your own!' ); ?></p>
<ul>
<li>
<?php echo sprintf(
__( 'View the <a href="%1$s">sample page</a> and <a href="%2$s">post</a>' ),
esc_url( get_permalink( 2 ) ),
esc_url( get_permalink( 1 ) )
); ?>
</li>
<li>
<?php echo sprintf(
__( 'Delete the <a href="%1$s">sample page</a> and <a href="%2$s">post</a>' ),
esc_url( admin_url('edit.php?post_type=page') ),
esc_url( admin_url('edit.php') )
); ?>
</li>
<li>
<?php echo sprintf(
__( '<a href="%s">Create an About Me page</a>' ),
esc_url( admin_url('edit.php?post_type=page') )
); ?>
</li>
<li>
<?php echo sprintf(
__( '<a href="%s">Write your first post</a>' ),
esc_url( admin_url('post-new.php') )
); ?>
</li>
</ul>
</div>
<div class="welcome-panel-column">
<h4>
<span class="icon16 icon-appearance"></span>
<?php _e( 'Customize Your Site' ); ?>
</h4>
<?php
endif;
if ( current_theme_supports( 'custom-background' ) ) :
$ct = current_theme_info();
if ( empty ( $ct->stylesheet_dir ) ) :
echo '<p>';
printf( __( '<a href="%s">Install a theme</a> to get started customizing your site.' ), esc_url( admin_url( 'themes.php' ) ) );
echo '</p>';
else:
echo '<p>';
printf( __( 'Use the current theme &mdash; %1$s &mdash; or <a href="%2$s">choose a new one</a>. If you stick with %3$s, here are a few ways to make your site look unique.' ), $ct->title, esc_url( admin_url( 'themes.php' ) ), $ct->title );
echo '</p>';
?>
<li>
<?php echo sprintf(
__( '<a href="%s">Set a background color</a>' ),
esc_url( admin_url( 'themes.php?page=custom-background' ) )
); ?>
</li>
<?php
endif;
if ( current_theme_supports( 'custom-header' ) ) :
?>
<li>
<?php echo sprintf(
__( '<a href="%s">Select a new header image</a>' ),
esc_url( admin_url( 'themes.php?page=custom-header' ) )
); ?>
</li>
<?php
endif;
if ( current_theme_supports( 'widgets' ) ) :
?>
<li>
<?php echo sprintf(
__( '<a href="%s">Add some widgets</a>' ),
esc_url( admin_url( 'widgets.php' ) )
); ?>
</li>
<ul>
<?php if ( 'twentyeleven' == $ct->stylesheet ) : ?>
<li>
<?php echo sprintf(
__( '<a href="%s">Choose light or dark</a>' ),
esc_url( admin_url( 'themes.php?page=theme_options' ) )
); ?>
</li>
<?php
endif;
if ( current_theme_supports( 'custom-background' ) ) :
?>
<li>
<?php echo sprintf(
__( '<a href="%s">Set a background color</a>' ),
esc_url( admin_url( 'themes.php?page=custom-background' ) )
); ?>
</li>
<?php
endif;
if ( current_theme_supports( 'custom-header' ) ) :
?>
<li>
<?php echo sprintf(
__( '<a href="%s">Select a new header image</a>' ),
esc_url( admin_url( 'themes.php?page=custom-header' ) )
); ?>
</li>
<?php
endif;
if ( current_theme_supports( 'widgets' ) ) :
?>
<li>
<?php echo sprintf(
__( '<a href="%s">Add some widgets</a>' ),
esc_url( admin_url( 'widgets.php' ) )
); ?>
</li>
<?php endif; ?>
</ul>
<?php endif; ?>
</ul>
<?php endif; ?>
</div>
</div>
<p class="welcome-panel-dismiss"><?php printf( __( 'Already know what you&#8217;re doing? <a href="%s">Dismiss this message</a>.' ), '#' ) ?></p>
</div>

View File

@ -433,7 +433,7 @@ function wp_default_styles( &$styles ) {
// Any rtl stylesheets that don't have a .dev version for ltr
$no_suffix = array( 'farbtastic' );
$styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20111118' );
$styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20111118a' );
$styles->add( 'ie', "/wp-admin/css/ie$suffix.css", array(), '20111015' );
$styles->add_data( 'ie', 'conditional', 'lte IE 7' );