Formatting and CSS for credits and freedoms pages. see #18742.

git-svn-id: http://svn.automattic.com/wordpress/trunk@19143 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
koopersmith 2011-11-04 00:37:56 +00:00
parent 4516c37a11
commit 011ade3db6
7 changed files with 123 additions and 41 deletions

View File

@ -24,29 +24,6 @@ get_current_screen()->set_help_sidebar(
'<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
);
add_action( 'admin_head', '_wp_credits_add_css' );
function _wp_credits_add_css() { ?>
<style type="text/css">
div.wrap { max-width: 750px }
h3.wp-people-group, p.wp-credits-list { clear: both; }
ul.compact { margin-bottom: 0 }
<?php if ( is_rtl() ) { ?>
li.wp-person { float: right; margin-left: 10px; }
li.wp-person img.gravatar { float: right; margin-left: 10px; }
<?php } else { ?>
li.wp-person { float: left; margin-right: 10px; }
li.wp-person img.gravatar { float: left; margin-right: 10px; }
<?php } ?>
li.wp-person img.gravatar { width: 60px; height: 60px; margin-bottom: 10px; }
ul.compact li.wp-person img.gravatar { width: 30px; height: 30px; }
li.wp-person { height: 70px; width: 220px; }
ul.compact li.wp-person { height: 40px; width: auto; white-space: nowrap }
li.wp-person a.web { font-size: 16px; text-decoration: none; }
p.wp-credits-list a { white-space: nowrap; }
</style>
<?php }
function wp_credits() {
global $wp_version;
$locale = get_locale();
@ -100,12 +77,14 @@ include( './admin-header.php' );
</a>
</h2>
<h3><?php _e( 'Credits' ); ?></h3>
<?php
$credits = wp_credits();
if ( ! $credits ) {
echo '<p>' . sprintf( __( 'WordPress is created by a <a href="%1$s">worldwide team</a> of passionate individuals. <a href="%2$s">Get involved in WordPress</a>.' ),
echo '<p class="about-description">' . sprintf( __( 'WordPress is created by a <a href="%1$s">worldwide team</a> of passionate individuals. <a href="%2$s">Get involved in WordPress</a>.' ),
'http://wordpress.org/about/',
/* translators: Url to the codex documentation on contributing to WordPress used on the credits page */
__( 'http://codex.wordpress.org/Contributing_to_WordPress' ) ) . '</p>';
@ -113,7 +92,7 @@ if ( ! $credits ) {
exit;
}
echo '<p>' . __( 'WordPress is created by a worldwide team of passionate individuals. We couldn&#8217;t possibly list them all, but here some of the most influential people currently involved with the project:' ) . "</p>\n";
echo '<p class="about-description">' . __( 'WordPress is created by a worldwide team of passionate individuals. We couldn&#8217;t possibly list them all, but here some of the most influential people currently involved with the project:' ) . "</p>\n";
$gravatar = is_ssl() ? 'https://secure.gravatar.com/avatar/' : 'http://0.gravatar.com/avatar/';
@ -128,7 +107,7 @@ foreach ( $credits['groups'] as $group_slug => $group_data ) {
$title = translate( $group_data['name'] );
}
echo '<h3 class="wp-people-group">' . $title . "</h3>\n";
echo '<h4 class="wp-people-group">' . $title . "</h4>\n";
}
if ( ! empty( $group_data['shuffle'] ) )
@ -154,7 +133,7 @@ foreach ( $credits['groups'] as $group_slug => $group_data ) {
echo '<img src="' . $gravatar . $person_data[1] . '?s=' . $size . '" class="gravatar" alt="' . esc_attr( $person_data[0] ) . '" /></a>' . "\n\t";
echo '<a class="web" href="' . sprintf( $credits['data']['profiles'], $person_data[2] ) . '">' . $person_data[0] . "</a>\n\t";
if ( ! $compact )
echo '<br /><span class="title">' . translate( $person_data[3] ) . "</span>\n";
echo '<span class="title">' . translate( $person_data[3] ) . "</span>\n";
echo "</li>\n";
}
echo "</ul>\n";

File diff suppressed because one or more lines are too long

View File

@ -1794,6 +1794,27 @@ div.widgets-sortables,
box-shadow: 0 0 6px rgba( 0, 0, 0, 0.3 );
}
.about-wrap h4.wp-people-group {
text-shadow: 1px 1px 1px white;
}
.about-wrap li.wp-person img.gravatar {
-moz-box-shadow: 0 0 4px rgba( 0, 0, 0, 0.4 );
-webkit-box-shadow: 0 0 4px rgba( 0, 0, 0, 0.4 );
box-shadow: 0 0 4px rgba( 0, 0, 0, 0.4 );
}
.about-wrap li.wp-person .title {
color: #464646;
text-shadow: 1px 1px 1px white;
}
.freedoms-php .about-wrap ol li {
color: #999;
}
.freedoms-php .about-wrap ol p {
color: #464646;
}
/* End About Pages */

File diff suppressed because one or more lines are too long

View File

@ -4643,6 +4643,10 @@ input.button-highlighted,
.about-wrap {
position: relative;
margin: 44px 40px 0 20px;
font-size: 14px;
}
.about-wrap p {
line-height: 1.6em;
}
.about-wrap h1 {
margin: 0.6em 200px 0 0;
@ -4650,14 +4654,21 @@ input.button-highlighted,
font-size: 3.6em;
font-weight: 200;
}
.about-text,
.about-description,
.about-wrap li.wp-person a.web {
font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", sans-serif;
font-weight: normal;
line-height: 1.6em;
font-size: 18px;
}
.about-description {
margin-top: 1.4em;
}
.about-text {
margin: 1em 200px 1.4em 0;
min-height: 60px;
font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", sans-serif;
font-weight: normal;
font-size: 24px;
line-height: 1.6em;
}
.about-wrap h2.nav-tab-wrapper {
padding-left: 6px;
@ -4736,7 +4747,6 @@ input.button-highlighted,
margin-bottom: 0.6em;
}
.about-wrap .feature-section p {
line-height: 1.6em;
margin-top: 0.6em;
}
@ -4790,6 +4800,76 @@ input.button-highlighted,
text-decoration: none;
}
.about-wrap h4.wp-people-group {
margin-top: 2.6em;
font-size: 16px;
}
.about-wrap ul.wp-people-group {
overflow: hidden;
padding: 5px;
margin: 0 -5px;
}
.about-wrap ul.compact {
margin-bottom: 0
}
.about-wrap li.wp-person {
float: left;
margin-right: 10px;
}
.about-wrap li.wp-person img.gravatar {
float: left;
margin-right: 10px;
padding: 2px;
}
.rtl .about-wrap li.wp-person {
float: right;
margin-left: 10px;
}
.rtl .about-wrap li.wp-person img.gravatar {
float: right;
margin-left: 10px;
}
.about-wrap li.wp-person img.gravatar {
width: 60px;
height: 60px;
margin-bottom: 10px;
}
.about-wrap ul.compact li.wp-person img.gravatar {
width: 30px;
height: 30px;
}
.about-wrap li.wp-person {
height: 70px;
width: 280px;
padding-bottom: 15px;
}
.about-wrap ul.compact li.wp-person {
height: 40px;
width: auto;
white-space: nowrap;
}
.about-wrap li.wp-person a.web {
display: block;
margin: 6px 0 2px;
font-size: 16px;
text-decoration: none;
}
.about-wrap p.wp-credits-list a {
white-space: nowrap;
}
.freedoms-php .about-wrap ol {
margin: 40px 60px;
}
.freedoms-php .about-wrap ol li {
list-style-type: decimal;
font-weight: bold;
}
.freedoms-php .about-wrap ol p {
font-weight: normal;
margin: 0.6em 0;
}
/*------------------------------------------------------------------------------
23.0 - Misc
------------------------------------------------------------------------------*/

View File

@ -34,13 +34,15 @@ include( './admin-header.php' );
</a>
</h2>
<p><?php printf( __( 'WordPress is Free and open source software, built by a distributed community of mostly volunteer developers from around the world. WordPress comes with some awesome, worldview-changing rights courtesy of its <a href="%s">license</a>, the GPL.' ), 'http://wordpress.org/about/license/' ); ?></p>
<h3><?php _e( 'Freedoms' ); ?></h3>
<p class="about-description"><?php printf( __( 'WordPress is Free and open source software, built by a distributed community of mostly volunteer developers from around the world. WordPress comes with some awesome, worldview-changing rights courtesy of its <a href="%s">license</a>, the GPL.' ), 'http://wordpress.org/about/license/' ); ?></p>
<ol start="0">
<li><?php _e( 'You have the freedom to run the program, for any purpose.' ); ?></li>
<li><?php _e( 'You have access to the source code, the freedom to study how the program works, and the freedom to change it to make it do what you wish.' ); ?></li>
<li><?php _e( 'You have the freedom to redistribute copies of the original program so you can help your neighbor.' ); ?></li>
<li><?php _e( 'You have the freedom to distribute copies of your modified versions to others. By doing this you can give the whole community a chance to benefit from your changes.' ); ?></li>
<li><p><?php _e( 'You have the freedom to run the program, for any purpose.' ); ?></p></li>
<li><p><?php _e( 'You have access to the source code, the freedom to study how the program works, and the freedom to change it to make it do what you wish.' ); ?></p></li>
<li><p><?php _e( 'You have the freedom to redistribute copies of the original program so you can help your neighbor.' ); ?></p></li>
<li><p><?php _e( 'You have the freedom to distribute copies of your modified versions to others. By doing this you can give the whole community a chance to benefit from your changes.' ); ?></p></li>
</ol>
<p><?php printf( __( 'WordPress grows when people like you tell their friends about it, and the thousands of businesses and services that are built on and around WordPress share that fact with their users. We&#8217;re flattered every time someone spreads the good word, just make sure to <a href="%s">check out our trademark guidelines</a> first.' ), 'http://wordpressfoundation.org/trademark-policy/' ); ?></p>

View File

@ -431,13 +431,13 @@ 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(), '20111103d' );
$styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20111103e' );
$styles->add( 'ie', "/wp-admin/css/ie$suffix.css", array(), '20111015' );
$styles->add_data( 'ie', 'conditional', 'lte IE 7' );
// all colors stylesheets need to have the same query strings (cache manifest compat)
$colors_version = '20111103b';
$colors_version = '20111103c';
// 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 );