Skip to content

Commit

Permalink
Make sure .widefat border and background coloring only applies to tab…
Browse files Browse the repository at this point in the history
…les. props MikeHansenMe. fixes #21936.

git-svn-id: http://core.svn.wordpress.org/trunk@23315 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information
helen committed Jan 22, 2013
1 parent 868873d commit b538d61
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 18 deletions.
1 change: 0 additions & 1 deletion wp-activate.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
* @package WordPress
*/

/** Define ABSPATH as this file's directory */
define( 'WP_INSTALLING', true );

/** Sets up the WordPress Environment. */
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/css/colors-classic.css
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ div.dashboard-widget,
background-color: #f1f1f1;
}

.widefat {
table.widefat {
border-color: #d1e5ee;
background-color: #fff;
}
Expand Down
5 changes: 1 addition & 4 deletions wp-admin/css/colors-fresh.css
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,10 @@ div.dashboard-widget,
background-color: #f1f1f1;
}

.widefat {
table.widefat {
border-color: #dfdfdf;
background-color: #f9f9f9;
}
textarea.widefat {
background-color: #fff;
}

div.dashboard-widget-error {
background-color: #c43;
Expand Down
10 changes: 5 additions & 5 deletions wp-admin/css/wp-admin.css
Original file line number Diff line number Diff line change
Expand Up @@ -1143,6 +1143,11 @@ form.upgrade .hint {
margin: -0.5em 0 2em 0;
}

.update-php .spinner {
float: none;
margin: -4px 0;
}

#ajax-loading,
.ajax-loading,
.ajax-feedback,
Expand Down Expand Up @@ -8575,8 +8580,3 @@ a.widget-control-edit {
.locale-lt-lt .inline-edit-row fieldset label span.input-text-wrap {
margin-left: 8em;
}

.update-php .spinner {
float: none;
margin: -4px 0;
}
2 changes: 1 addition & 1 deletion wp-admin/options-writing.php
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
<p><?php _e('Press This is a bookmarklet: a little app that runs in your browser and lets you grab bits of the web.');?></p>
<p><?php _e('Use Press This to clip text, images and videos from any web page. Then edit and add more straight from Press This before you save or publish it in a post on your site.'); ?></p>
<p><?php _e('Drag-and-drop the following link to your bookmarks bar or right click it and add it to your favorites for a posting shortcut.') ?></p>
<p class="pressthis"><a onclick="return false;" oncontextmenu="if(window.navigator.userAgent.indexOf('WebKit')!=-1||window.navigator.userAgent.indexOf('MSIE')!=-1)jQuery('.pressthis-code').show().find('textarea').focus().select();return false;" href="<?php echo htmlspecialchars( get_shortcut_link() ); ?>"><span><?php _e('Press This') ?></span></a></p>
<p class="pressthis"><a onclick="return false;" oncontextmenu="if(window.navigator.userAgent.indexOf('WebKit')!=-1||window.navigator.userAgent.indexOf('MSIE')!=-1){jQuery('.pressthis-code').show().find('textarea').focus().select();return false;}" href="<?php echo htmlspecialchars( get_shortcut_link() ); ?>"><span><?php _e('Press This') ?></span></a></p>
<div class="pressthis-code" style="display:none;">
<p class="description"><?php _e('If your bookmarks toolbar is hidden: copy the code below, open your Bookmarks manager, create new bookmark, type Press This into the name field and paste the code into the URL field.') ?></p>
<p><textarea rows="5" cols="120" readonly="readonly"><?php echo htmlspecialchars( get_shortcut_link() ); ?></textarea></p>
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/tools.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

<p><?php _e('Use Press This to clip text, images and videos from any web page. Then edit and add more straight from Press This before you save or publish it in a post on your site.'); ?></p>
<p class="description"><?php _e('Drag-and-drop the following link to your bookmarks bar or right click it and add it to your favorites for a posting shortcut.') ?></p>
<p class="pressthis"><a onclick="return false;" oncontextmenu="if(window.navigator.userAgent.indexOf('WebKit')!=-1||window.navigator.userAgent.indexOf('MSIE')!=-1)jQuery('.pressthis-code').show().find('textarea').focus().select();return false;" href="<?php echo htmlspecialchars( get_shortcut_link() ); ?>"><span><?php _e('Press This') ?></span></a></p>
<p class="pressthis"><a onclick="return false;" oncontextmenu="if(window.navigator.userAgent.indexOf('WebKit')!=-1||window.navigator.userAgent.indexOf('MSIE')!=-1){jQuery('.pressthis-code').show().find('textarea').focus().select();return false;}" href="<?php echo htmlspecialchars( get_shortcut_link() ); ?>"><span><?php _e('Press This') ?></span></a></p>
<div class="pressthis-code" style="display:none;">
<p class="description"><?php _e('If your bookmarks toolbar is hidden: copy the code below, open your Bookmarks manager, create new bookmark, type Press This into the name field and paste the code into the URL field.') ?></p>
<p><textarea rows="5" cols="120" readonly="readonly"><?php echo htmlspecialchars( get_shortcut_link() ); ?></textarea></p>
Expand Down
2 changes: 1 addition & 1 deletion wp-includes/post.php
Original file line number Diff line number Diff line change
Expand Up @@ -2665,7 +2665,7 @@ function wp_get_recent_posts( $args = array(), $output = ARRAY_A ) {
*
* If the $postarr parameter has 'ID' set to a value, then post will be updated.
*
* You can set the post date manually, but setting the values for 'post_date'
* You can set the post date manually, by setting the values for 'post_date'
* and 'post_date_gmt' keys. You can close the comments or open the comments by
* setting the value for 'comment_status' key.
*
Expand Down
8 changes: 4 additions & 4 deletions wp-includes/template.php
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ function get_date_template() {
/**
* Retrieve path of home template in current or parent template.
*
* This is the template used for the page containing the blog posts
* This is the template used for the page containing the blog posts.
*
* Attempts to locate 'home.php' first before falling back to 'index.php'.
*
Expand Down Expand Up @@ -225,9 +225,9 @@ function get_front_page_template() {
/**
* Retrieve path of page template in current or parent template.
*
* Will first look for the specifically assigned page template
* The will search for 'page-{slug}.php' followed by 'page-id.php'
* and finally 'page.php'
* Will first look for the specifically assigned page template.
* Then will search for 'page-{slug}.php', followed by 'page-id.php',
* and finally 'page.php'.
*
* @since 1.5.0
*
Expand Down

0 comments on commit b538d61

Please sign in to comment.