From 875d0265d4735615dfb215fe3fc06a61bc562b49 Mon Sep 17 00:00:00 2001 From: Ryan Boren Date: Tue, 11 Mar 2008 16:54:48 +0000 Subject: [PATCH] More TinyMCE color abstraction and new border for title and editor. Props azaozz. fixes #6156 git-svn-id: https://develop.svn.wordpress.org/trunk@7240 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/css/colors-classic.css | 19 +++++++++ wp-admin/css/colors-fresh.css | 19 +++++++++ wp-admin/edit-form-advanced.php | 4 +- wp-admin/edit-page-form.php | 4 +- wp-admin/js/editor.js | 8 +++- wp-admin/wp-admin.css | 41 +++++++++++++++---- .../inlinepopups/skins/clearlooks2/window.css | 24 +++++------ 7 files changed, 96 insertions(+), 23 deletions(-) diff --git a/wp-admin/css/colors-classic.css b/wp-admin/css/colors-classic.css index c59239b16e..7ef3dbde87 100644 --- a/wp-admin/css/colors-classic.css +++ b/wp-admin/css/colors-classic.css @@ -674,3 +674,22 @@ div#media-upload-error, .file-error, .required abbr, .widget-control-remove:hove .wp_themeSkin .mceMenuItemDisabled .mceText { color: #888; } + +/* pop-up */ +.clearlooks2 .mceTop .mceLeft, .clearlooks2 .mceTop .mceRight { + background-color: #cee1ef; + border-color: #c6d9e9; +} + +.clearlooks2 .mceFocus .mceTop .mceLeft, .clearlooks2 .mceFocus .mceTop .mceRight { + background-color: #5488AF; + border-color: #464646; +} + +#editorcontainer { + border-color: #ccc; +} + +#poststuff #titlewrap { + border-color: #ccc; +} diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css index cf796a4b91..865abb8348 100644 --- a/wp-admin/css/colors-fresh.css +++ b/wp-admin/css/colors-fresh.css @@ -656,3 +656,22 @@ div#media-upload-error, .file-error, .required abbr, .widget-control-remove:hove .wp_themeSkin .mceMenuItemDisabled .mceText { color: #888; } + +/* pop-up */ +.clearlooks2 .mceTop .mceLeft, .clearlooks2 .mceTop .mceRight { + background-color: #cee1ef; + border-color: #c6d9e9; +} + +.clearlooks2 .mceFocus .mceTop .mceLeft, .clearlooks2 .mceFocus .mceTop .mceRight { + background-color: #2683ae; + border-color: #464646; +} + +#editorcontainer { + border-color: #ccc; +} + +#poststuff #titlewrap { + border-color: #ccc; +} diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php index 751297d179..a40b6af9b4 100644 --- a/wp-admin/edit-form-advanced.php +++ b/wp-admin/edit-form-advanced.php @@ -179,8 +179,10 @@ if ( ( 'edit' == $action) && current_user_can('delete_post', $post_ID) )

-
+
+
+
ID); ?>
ID) && ! empty($sample_permalink_html) ) : diff --git a/wp-admin/edit-page-form.php b/wp-admin/edit-page-form.php index 0b7b958db5..2b45baf00d 100644 --- a/wp-admin/edit-page-form.php +++ b/wp-admin/edit-page-form.php @@ -151,8 +151,10 @@ if ( ('edit' == $action) && current_user_can('delete_page', $post_ID) )

-
+
+
+
ID); ?>
ID) && ! empty($sample_permalink_html) ) : diff --git a/wp-admin/js/editor.js b/wp-admin/js/editor.js index d368059f74..a5500ec552 100644 --- a/wp-admin/js/editor.js +++ b/wp-admin/js/editor.js @@ -13,8 +13,14 @@ wpEditorInit = function() { switchEditors = { saveCallback : function(el, content, body) { + document.getElementById(el).style.color = '#fff'; - return this.pre_wpautop(content); + if ( tinyMCE.activeEditor.isHidden() ) + content = document.getElementById(el).value; + else + content = this.pre_wpautop(content); + + return content; }, pre_wpautop : function(content) { diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css index 1355a0f005..f4acf41f62 100644 --- a/wp-admin/wp-admin.css +++ b/wp-admin/wp-admin.css @@ -237,6 +237,9 @@ textarea.all-options, input.all-options { #editorcontainer { padding: 6px; + border-style: none solid solid; + border-width: 1px; + border-collapse: separate; } #currenttheme img { @@ -893,11 +896,11 @@ html, body { #poststuff h3 { font-size: 14px; font-weight: bold; - padding: 8px 5px; + padding: 9px 5px; margin: 0 0 10px; } -#poststuff .postbox, #titlediv, #poststuff .postarea, #poststuff .stuffbox { +#poststuff .postbox, #poststuff .stuffbox { margin-left: 20px; padding: 2px; margin-bottom: 10px; @@ -906,6 +909,33 @@ html, body { border-style: solid; } +#titlediv, #poststuff .postarea { + margin-left: 20px; + margin-bottom: 10px; + margin-right: 8px; +} + +#titlediv { + margin-bottom: 20px; +} + +#titlediv div.inside { + margin: 0; +} + +#titlediv #title { + border: 0; + padding: 0; + font-size: 1.7em; + width: 100%; +} + +#poststuff #titlewrap { + padding: 3px; + border-width: 1px; + border-style: solid; +} + #poststuff .inside { margin: 0 12px 15px; font-size: 11px; @@ -915,12 +945,6 @@ html, body { font-size: 14px; } -#poststuff #title { - font-size: 1.7em; - padding: 4px 3px; - width: 98%; -} - #link_name, #link_url, #link_description { font-size: 1.7em; padding: 4px 3px; @@ -970,6 +994,7 @@ html, body { float: right; margin-right: 20px; margin-top: 5px; + cursor: pointer; } #poststuff #media-buttons a { diff --git a/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css b/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css index 2158491190..569ca80d68 100644 --- a/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css +++ b/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css @@ -18,9 +18,9 @@ } .clearlooks2 .mceTop .mceLeft { width:55%; - background: #cee1ef; - border-left: 1px solid #c6d9e9; - border-top: 1px solid #c6d9e9; + background-image: none; + border-style: solid none none solid; + border-width: 1px; } .clearlooks2 .mceTop .mceCenter { } @@ -28,9 +28,9 @@ right:0; width:55%; height:23px; - background: #cee1ef; - border-right: 1px solid #c6d9e9; - border-top: 1px solid #c6d9e9; + background-image: none; + border-style: solid solid none none; + border-width: 1px; } .clearlooks2 .mceTop span { width:100%; @@ -41,16 +41,16 @@ font-weight:bold; } .clearlooks2 .mceFocus .mceTop .mceLeft { - background: #2683ae; - border-left: 1px solid #464646; - border-top: 1px solid #464646; + background-image: none; + border-style: solid none none solid; + border-width: 1px; } .clearlooks2 .mceFocus .mceTop .mceCenter { } .clearlooks2 .mceFocus .mceTop .mceRight { - background: #2683ae; - border-right: 1px solid #464646; - border-top: 1px solid #464646; + background-image: none; + border-style: solid solid none none; + border-width: 1px; } .clearlooks2 .mceFocus .mceTop span { color:#FFF