Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Pinking shears 

git-svn-id: http://svn.automattic.com/wordpress/trunk@18276 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2011-06-11 15:44:06 +00:00
parent 6c176b156c
commit 46f63a6b1e
12 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wp-admin/css/nav-menu.dev.css
View File

@ -387,13 +387,13 @@ body {
-khtml-border-radius: 3px;
}
#menu-to-edit .menu-item-invalid .menu-item-handle {
background-color: #f6c9cc; /* Fallback */
background-image: -ms-linear-gradient(bottom, #f6c9cc, #fdf8ff); /* IE10 */
background-image: -moz-linear-gradient(bottom, #f6c9cc, #fdf8ff); /* Firefox */
background-image: -o-linear-gradient(bottom, #f6c9cc, #fdf8ff); /* Opera */
background-image: -webkit-gradient(linear, left bottom, left top, from(#f6c9cc), to(#fdf8ff)); /* old Webkit */
background-image: -webkit-linear-gradient(bottom, #f6c9cc, #fdf8ff); /* new Webkit */
#menu-to-edit .menu-item-invalid .menu-item-handle {
background-color: #f6c9cc; /* Fallback */
background-image: -ms-linear-gradient(bottom, #f6c9cc, #fdf8ff); /* IE10 */
background-image: -moz-linear-gradient(bottom, #f6c9cc, #fdf8ff); /* Firefox */
background-image: -o-linear-gradient(bottom, #f6c9cc, #fdf8ff); /* Opera */
background-image: -webkit-gradient(linear, left bottom, left top, from(#f6c9cc), to(#fdf8ff)); /* old Webkit */
background-image: -webkit-linear-gradient(bottom, #f6c9cc, #fdf8ff); /* new Webkit */
background-image: linear-gradient(bottom, #f6c9cc, #fdf8ff); /* proposed W3C Markup */
}

2
wp-content/themes/twentyeleven/comments.php
View File

@ -63,7 +63,7 @@
</nav>
<?php endif; // check for comment navigation ?>
<?php
<?php
/* If there are no comments and comments are closed, let's leave a little note, shall we?
* But we don't want the note on pages or post types that do not support comments.
*/

4
wp-content/themes/twentyeleven/content-aside.php
View File

@ -3,7 +3,7 @@
* The template for displaying posts in the Aside Post Format on index and archive pages
*
* Learn more: http://codex.wordpress.org/Post_Formats
*
*
* @package WordPress
* @subpackage Twenty_Eleven
* @since Twenty Eleven 1.0
@ -16,7 +16,7 @@
<h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
<h2 class="entry-format"><?php _e( 'Aside', 'twentyeleven' ); ?></h2>
</hgroup>
<?php if ( comments_open() ) : ?>
<div class="comments-link">
<?php comments_popup_link( __( '<span class="leave-reply">Reply</span>', 'twentyeleven' ), __( '1', 'twentyeleven' ), __( '%', 'twentyeleven' ) ); ?>

2
wp-content/themes/twentyeleven/content-intro.php
View File

@ -1,7 +1,7 @@
<?php
/**
* The template for displaying page content in the showcase.php page template
*
*
* @package WordPress
* @subpackage Twenty_Eleven
* @since Twenty Eleven 1.0

2
wp-content/themes/twentyeleven/content-link.php
View File

@ -3,7 +3,7 @@
* The template for displaying posts in the Link Post Format on index and archive pages
*
* Learn more: http://codex.wordpress.org/Post_Formats
*
*
* @package WordPress
* @subpackage Twenty_Eleven
* @since Twenty Eleven 1.0

6
wp-content/themes/twentyeleven/content-status.php
View File

@ -3,7 +3,7 @@
* The template for displaying posts in the Status Post Format on index and archive pages
*
* Learn more: http://codex.wordpress.org/Post_Formats
*
*
* @package WordPress
* @subpackage Twenty_Eleven
*/
@ -15,7 +15,7 @@
<h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
<h2 class="entry-format"><?php _e( 'Status', 'twentyeleven' ); ?></h2>
</hgroup>
<?php if ( comments_open() ) : ?>
<div class="comments-link">
<?php comments_popup_link( __( '<span class="leave-reply">Reply</span>', 'twentyeleven' ), __( '1', 'twentyeleven' ), __( '%', 'twentyeleven' ) ); ?>
@ -30,7 +30,7 @@
<?php else : ?>
<div class="entry-content">
<div class="avatar"><?php echo get_avatar( get_the_author_meta( 'ID' ), apply_filters( 'twentyeleven_status_avatar', '65' ) ); ?></div>
<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) ); ?>
<?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyeleven' ), 'after' => '</div>' ) ); ?>
</div><!-- .entry-content -->

2
wp-content/themes/twentyeleven/functions.php
View File

@ -115,7 +115,7 @@ function twentyeleven_setup() {
define( 'HEADER_TEXTCOLOR', '000' );
// By leaving empty, we default to random image rotation
define( 'HEADER_IMAGE', '' );
define( 'HEADER_IMAGE', '' );
// The height and width of your custom header.
// Add a filter to twentyeleven_header_image_width and twentyeleven_header_image_height to change these values.

8
wp-content/themes/twentyeleven/inc/theme-options.php
View File

@ -250,7 +250,7 @@ function theme_options_render_page() {
<input type="button" class="pickcolor button hide-if-no-js" value="<?php esc_attr_e( 'Select a Color', 'twentyeleven' ); ?>" />
<div id="colorPickerDiv" style="z-index: 100; background:#eee; border:1px solid #ccc; position:absolute; display:none;"></div>
<br />
<span><?php printf( __( 'Default color: %s', 'twentyeleven' ), '<span id="default-color">' . twentyeleven_get_default_link_color( $options['color_scheme'] ) . '</span>' ); ?></span>
<span><?php printf( __( 'Default color: %s', 'twentyeleven' ), '<span id="default-color">' . twentyeleven_get_default_link_color( $options['color_scheme'] ) . '</span>' ); ?></span>
</fieldset>
</td>
</tr>
@ -298,8 +298,8 @@ function twentyeleven_theme_options_validate( $input ) {
// Color scheme must be in our array of color scheme options
if ( isset( $input['color_scheme'] ) && array_key_exists( $input['color_scheme'], twentyeleven_color_schemes() ) )
$output['color_scheme'] = $input['color_scheme'];
// Our defaults for the link color may have changed, based on the color scheme.
// Our defaults for the link color may have changed, based on the color scheme.
$output['link_color'] = $defaults['link_color'] = twentyeleven_get_default_link_color( $output['color_scheme'] );
// Link color must be 3 or 6 hexadecimal characters
@ -364,7 +364,7 @@ function twentyeleven_print_link_color_style() {
}
section.recent-posts .other-recent-posts .comments-link a:hover {
border-color: <?php echo $link_color; ?>;
}
}
article.feature-image.small .entry-summary p a:hover,
.entry-header .comments-link a:hover,
.entry-header .comments-link a:focus,

2
wp-content/themes/twentyeleven/searchform.php
View File

@ -8,7 +8,7 @@
*/
?>
<form method="get" id="searchform" action="<?php echo esc_url( home_url( '/' ) ); ?>">
<label for="s" class="assistive-text"><?php _e( 'Search', 'twentyeleven' ); ?></label>
<label for="s" class="assistive-text"><?php _e( 'Search', 'twentyeleven' ); ?></label>
<input type="text" class="field" name="s" id="s" placeholder="<?php esc_attr_e( 'Search', 'twentyeleven' ); ?>" />
<input type="submit" class="submit" name="submit" id="searchsubmit" value="<?php esc_attr_e( 'Search', 'twentyeleven' ); ?>" />
</form>

4
wp-content/themes/twentyeleven/showcase.php
View File

@ -54,7 +54,7 @@ get_header(); ?>
// The Featured Posts query.
$featured = new WP_Query( $featured_args );
// Proceed only if published posts exist
if ( $featured->have_posts() ) :
@ -98,7 +98,7 @@ get_header(); ?>
?>
<section class="featured-post <?php echo $feature_class; ?>" id="featured-post-<?php echo $counter_slider; ?>">
<?php
/**
* If the thumbnail is as big as the header image

10
wp-content/themes/twentyeleven/style.css
View File

@ -846,7 +846,7 @@ img[class*="wp-image-"] {
height: auto;
}
img.size-full {
max-width: 97.5%;
max-width: 97.5%;
width: auto; /* Prevent stretching of full-size images in IE8 */
}
.entry-content img.wp-smiley {
@ -1104,7 +1104,7 @@ blockquote.pull {
}
.singular .entry-meta .edit-link a {
bottom: auto;
left: 50px;
left: 50px;
position: absolute;
right: auto;
top: 80px;
@ -2448,7 +2448,7 @@ p.comment-form-comment {
footer.entry-meta a[rel=bookmark]:link:after,
footer.entry-meta a[rel=bookmark]:visited:after {
content:" [" attr(href) "] "; /* Show URLs */
}
}
#page {
clear: both !important;
display: block !important;
@ -2543,7 +2543,7 @@ p.comment-form-comment {
#colophon {
display: none;
}
/* Comments */
.commentlist > li.comment {
background: none;
@ -2581,7 +2581,7 @@ p.comment-form-comment {
.commentlist .reply {
display: none;
}
/* Post author highlighting */
.commentlist > li.bypostauthor {
color: #444;

4
wp-includes/nav-menu.php
View File

@ -528,8 +528,8 @@ function wp_get_nav_menu_items( $menu, $args = array() ) {
}
$items = array_map( 'wp_setup_nav_menu_item', $items );
if ( ! in_array( $args['post_status'], array( 'draft', 'any' ) ) )
if ( ! in_array( $args['post_status'], array( 'draft', 'any' ) ) )
$items = array_filter( $items, '_is_valid_nav_menu_item' );
if ( ARRAY_A == $args['output'] ) {