diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-10-06 07:02:57 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-10-06 07:02:57 +0000 |
| commit | a5b29f6db23d18f819bb6676d05863dcd7504eb9 (patch) | |
| tree | 4807bdb393534ae43d21f6348949497e3b6c5c1e /wp-includes | |
| parent | 6e038c5171a02fc6920d376ba49d14fadbb8a5e0 (diff) | |
WP Merge to rev 4349
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@793 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes')
| -rw-r--r-- | wp-includes/formatting.php | 7 | ||||
| -rw-r--r-- | wp-includes/js/tinymce/plugins/wordpress/wordpress.css | 8 |
2 files changed, 10 insertions, 5 deletions
diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php index d153fb9..11f0067 100644 --- a/wp-includes/formatting.php +++ b/wp-includes/formatting.php @@ -1070,4 +1070,11 @@ function js_escape($text) { return preg_replace("/\r?\n/", "\\n", addslashes($text)); } +function wp_make_link_relative( $link, $base = '' ) { + if ( !$base ) + $base = get_option( 'home' ); + if ( 0 === strpos($link, $base) ) + $link = substr_replace($link, '', 0, strlen($base)); + return $link; +} ?> diff --git a/wp-includes/js/tinymce/plugins/wordpress/wordpress.css b/wp-includes/js/tinymce/plugins/wordpress/wordpress.css index 1b54bbb..cbc9bac 100644 --- a/wp-includes/js/tinymce/plugins/wordpress/wordpress.css +++ b/wp-includes/js/tinymce/plugins/wordpress/wordpress.css @@ -24,11 +24,9 @@ /* You can extend this CSS by adding your own CSS file with the the content_css option */
body {
- font-family: Georgia, "Times New Roman", Times, serif;
- font-size: 1em;
- line-height: 1.2em;
- padding: .3em;
- background-color: #fff;
+ background: #fff;
+ font: 1em/1.3em Georgia, "Times New Roman", Times, serif;
+ padding: .5em;
}
td {
|