Changeset 27190
- Timestamp:
- 02/18/2014 06:31:30 AM (11 years ago)
- Location:
- trunk/src/wp-includes
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-includes/css/editor.css
r27182 r27190 3 3 ------------------------------------------------------------------------------*/ 4 4 5 /* TinyMCE widgets/containers */ 6 7 .mce-container, 8 .mce-widget { 9 color: inherit; 10 font-family: inherit; 11 } 12 13 /* TinyMCE windows */ 14 #mce-modal-block.mce-in { 15 opacity: 0.7; 16 z-index: 159900 !important; /* Overwrite inline style added by TinyMCE. */ 17 } 18 19 .mce-window { 20 border-radius: 0; 21 box-shadow: 0 5px 15px rgba(0,0,0,0.7); 22 z-index: 160000 !important; /* Overwrite inline style added by TinyMCE. */ 23 -webkit-font-smoothing: subpixel-antialiased; 24 } 25 26 .mce-window .mce-container-body.mce-abs-layout { 27 overflow: visible; 28 } 29 30 .mce-window .mce-window-head { 31 background: #fcfcfc; 32 border-bottom: 1px solid #dfdfdf; 33 padding: 0; 34 min-height: 40px; 35 } 36 37 .mce-window .mce-window-head .mce-title { 38 font-size: 22px; 39 font-weight: 600; 40 line-height: 40px; 41 margin: 0; 42 padding: 0 40px 0 16px; 43 } 44 45 .mce-window .mce-window-head .mce-close { 46 color: transparent; 47 top: 0; 48 right: 0; 49 width: 40px; 50 height: 40px; 51 line-height: 40px; 52 text-align: center; 53 } 54 55 .mce-window .mce-window-head .mce-close:before { 56 font: normal 20px/2 'dashicons'; 57 text-align: center; 58 color: #888; 59 width: 40px; 60 height: 40px; 61 display: block; 62 } 63 64 .mce-window .mce-window-head .mce-close:hover:before { 65 color: #555; 66 } 67 68 .mce-window .mce-window-head .mce-dragh { 69 width: calc( 100% - 40px ); 70 } 71 72 .mce-textbox { 73 border: 1px solid #ddd; 74 border-radius: 0; 75 -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,0.07); 76 box-shadow: inset 0 1px 2px rgba(0,0,0,0.07); 77 -webkit-transition: none; 78 transition: none; 79 } 80 81 .mce-textbox:focus, 82 .mce-textbox.mce-focus { 83 border-color: #999; 84 -webkit-box-shadow: 0 1px 2px rgba(0,0,0,0.1); 85 box-shadow: 0 1px 2px rgba(0,0,0,0.1); 86 } 87 88 /* TinyMCE menus */ 89 .mce-menu, 90 .mce-floatpanel.mce-popover { 91 border-color: rgba(0,0,0,0.15); 92 border-radius: 0; 93 box-shadow: 0 3px 5px rgba( 0, 0, 0, 0.2 ); 94 } 95 96 .mce-floatpanel.mce-popover.mce-bottom { 97 margin-top: 2px; 98 } 99 100 .mce-floatpanel .mce-arrow { 101 display: none; 102 } 103 104 .mce-menu .mce-container-body { 105 min-width: 160px; 106 } 107 108 .mce-menu-item { 109 border: none; 110 margin-bottom: 2px; 111 } 112 113 .mce-menu-has-icons i.mce-ico { 114 line-height: 16px; 115 } 116 117 /* TinyMCE panel */ 5 118 div.mce-panel { 6 119 border: 0; … … 10 123 } 11 124 125 .mce-panel.mce-menu { 126 border: 1px solid #ddd; 127 } 128 129 /* TinyMCE toolbars */ 12 130 div.mce-toolbar-grp { 13 131 border-bottom: 1px solid #dedede; … … 76 194 77 195 .mce-toolbar .mce-btn i { 78 text-shadow: 0;196 text-shadow: none; 79 197 } 80 198 … … 87 205 } 88 206 89 .mce-toolbar .mce-btn-group .mce-btn.mce-listbox {90 -webkit-border-radius: 0;91 border-radius: 0;92 direction: ltr;93 background: #fff;94 border: 1px solid #ddd;95 -webkit-box-shadow: inset 0 1px 1px -1px rgba(0, 0, 0, .2);96 box-shadow: inset 0 1px 1px -1px rgba(0, 0, 0, .2);97 }98 99 .mce-toolbar .mce-btn-group .mce-btn.mce-listbox:hover {100 background-image: none;101 border-color: #bbb;102 }103 104 207 .mce-toolbar .mce-colorbutton .mce-open { 105 208 border-right: 0; … … 107 210 108 211 .mce-toolbar .mce-colorbutton .mce-preview { 109 margin-left: -16px; 212 margin-left: -18px; 213 padding: 0; 214 width: 18px; 215 } 216 217 .mce-menubar { 218 border-color: #e5e5e5; 219 } 220 221 .mce-menubar .mce-btn:focus { 222 outline: 0; 223 } 224 225 div.mce-menu .mce-menu-item-sep, 226 .mce-menu-item-sep:hover { 227 margin: 5px 0 4px; 228 } 229 230 /* Buttons in modals */ 231 .mce-window .mce-btn { 232 color: #555; 233 background: #f7f7f7; 234 text-decoration: none; 235 font-size: 13px; 236 line-height: 26px; 237 height: 28px; 238 margin: 0; 239 padding: 0; 240 cursor: pointer; 241 border: 1px solid #ccc; 242 -webkit-appearance: none; 243 -webkit-border-radius: 3px; 244 border-radius: 3px; 245 white-space: nowrap; 246 -webkit-box-shadow: inset 0 1px 0 #fff, 0 1px 0 rgba(0,0,0,.08); 247 box-shadow: inset 0 1px 0 #fff, 0 1px 0 rgba(0,0,0,.08); 248 background-image: none; 249 } 250 251 .mce-window .mce-btn:hover { 252 background: #fafafa; 253 border-color: #999; 254 color: #222; 255 } 256 257 .mce-window .mce-btn:focus { 258 -webkit-box-shadow: 1px 1px 1px rgba(0,0,0,.2); 259 box-shadow: 1px 1px 1px rgba(0,0,0,.2); 260 } 261 262 .mce-window .mce-btn:active { 263 background: #eee; 264 border-color: #999; 265 color: #333; 266 -webkit-box-shadow: inset 0 2px 5px -3px rgba( 0, 0, 0, 0.5 ); 267 box-shadow: inset 0 2px 5px -3px rgba( 0, 0, 0, 0.5 ); 268 } 269 270 .mce-window .mce-btn.mce-disabled { 271 color: #aaa; 272 border-color: #ddd; 273 -webkit-box-shadow: none; 274 box-shadow: none; 275 text-shadow: 0 1px 0 #fff; 276 cursor: default; 277 } 278 279 .mce-window .mce-btn.mce-primary { 280 background: #2ea2cc; 281 border-color: #0074a2; 282 -webkit-box-shadow: inset 0 1px 0 rgba(120,200,230,0.5), 0 1px 0 rgba(0,0,0,.15); 283 box-shadow: inset 0 1px 0 rgba(120,200,230,0.5), 0 1px 0 rgba(0,0,0,.15); 284 color: #fff; 285 } 286 287 .mce-window .mce-btn.mce-primary:hover { 288 background: #1e8cbe; 289 border-color: #0074a2; 290 -webkit-box-shadow: inset 0 1px 0 rgba(120,200,230,0.6); 291 box-shadow: inset 0 1px 0 rgba(120,200,230,0.6); 292 color: #fff; 293 } 294 295 .mce-window .mce-btn.mce-primary:focus { 296 border-color: #0e3950; 297 -webkit-box-shadow: inset 0 1px 0 rgba(120,200,230,0.6), 1px 1px 2px rgba(0,0,0,0.4); 298 box-shadow: inset 0 1px 0 rgba(120,200,230,0.6), 1px 1px 2px rgba(0,0,0,0.4); 299 } 300 301 .mce-window .mce-btn.mce-primary:active { 302 background: #1b7aa6; 303 border-color: #005684; 304 color: rgba(255,255,255,0.95); 305 -webkit-box-shadow: inset 0 1px 0 rgba(0,0,0,0.1); 306 box-shadow: inset 0 1px 0 rgba(0,0,0,0.1); 307 } 308 309 .mce-window .mce-btn.mce-primary.mce-disabled { 310 color: #94cde7; 311 background: #298cba; 312 border-color: #1b607f; 313 text-shadow: 0 -1px 0 rgba(0,0,0,0.1); 110 314 } 111 315 112 316 /* Charmap modal */ 317 .mce-charmap { 318 margin: 3px; 319 } 320 113 321 .mce-charmap td { 114 322 padding: 0; 323 border-color: #dfdfdf; 324 cursor: pointer; 325 } 326 327 .mce-charmap td:hover { 328 background: #f3f3f3; 115 329 } 116 330 … … 121 335 } 122 336 123 /* Icons */ 124 .mce-toolbar .mce-ico { 337 /* TinyMCE tooltips */ 338 339 .mce-tooltip { 340 margin-top: 2px; 341 } 342 343 .mce-tooltip-inner { 344 box-shadow: 0 3px 5px rgba( 0, 0, 0, 0.2 ); 345 color: #fff; 346 font-size: 12px; 347 } 348 349 /* TinyMCE icons */ 350 .mce-toolbar .mce-ico, 351 .mce-toolbar .mce-caret { 125 352 color: #777; 126 353 line-height: 20px; … … 128 355 height: 20px; 129 356 text-align: center; 130 } 131 132 .mce-toolbar .mce-btn:hover .mce-ico { 357 text-shadow: none; 358 } 359 360 .mce-toolbar .mce-btn:hover .mce-ico, 361 .mce-toolbar .mce-btn.mce-active .mce-ico, 362 .mce-toolbar .mce-btn:hover .mce-caret, 363 .mce-toolbar .mce-btn.mce-active .mce-caret { 133 364 color: #333; 365 } 366 367 .mce-toolbar .mce-btn.mce-active .mce-open { 368 border-left-color: #bdbdbd; 134 369 } 135 370 … … 165 400 i.mce-i-wp-media-library, 166 401 i.mce-i-ltr, 167 i.mce-i-wp_page { 402 i.mce-i-wp_page, 403 i.mce-caret, 404 .mce-close { 168 405 font: normal 20px/1 'dashicons'; 169 406 padding: 0; … … 290 527 i.mce-i-wp_page:before { 291 528 content: '\f105'; 529 } 530 531 i.mce-caret:before { 532 content: '\f140'; 533 } 534 535 .mce-active i.mce-caret:before { 536 content: '\f142'; 537 } 538 539 .mce-close:before { 540 content: '\f158'; 541 } 542 543 .mce-toolbar .mce-btn .mce-caret { 544 border: none; 545 margin: 0 0 0 -5px; 546 width: 16px; 547 } 548 549 .mce-menubtn span { 550 margin-right: 0; 551 padding-left: 3px; 552 } 553 554 .mce-toolbar .mce-listbox .mce-caret { 555 margin-top: 0; 556 padding: 2px 3px; 557 right: 0; 558 top: 0; 559 width: 10px; 560 } 561 562 .mce-toolbar .mce-listbox:hover .mce-caret, 563 .mce-toolbar .mce-listbox.mce-active .mce-caret { 564 border-left: 1px solid #bdbdbd; 565 } 566 567 .mce-toolbar .mce-listbox .mce-caret:before { 568 margin-left: -6px; 569 } 570 571 .mce-toolbar .mce-splitbtn:hover .mce-open { 572 border-right-color: transparent; 573 } 574 575 .mce-toolbar .mce-splitbtn .mce-open.mce-active{ 576 -webkit-box-shadow: none; 577 box-shadow: none; 292 578 } 293 579 … … 440 726 border-bottom-style: solid; 441 727 border-bottom-width: 1px; 442 -webkit-border-top-right-radius: 3px;443 border-top-right-radius: 3px;444 -webkit-border-top-left-radius: 3px;445 border-top-left-radius: 3px;446 728 padding: 2px 8px 0; 447 729 min-height: 29px; -
trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js
r27110 r27190 11 11 12 12 if ( editor.theme.panel ) { 13 toolbars = editor.theme.panel.find('.toolbar ');13 toolbars = editor.theme.panel.find('.toolbar:not(.menubar)'); 14 14 } 15 15 -
trunk/src/wp-includes/js/tinymce/tiny_mce_popup.js
r26876 r27190 59 59 }); 60 60 61 self.dom.bind(window, ' ready', self._onDOMLoaded, self);61 self.dom.bind(window, 'load', self._onDOMLoaded, self); 62 62 63 63 // Enables you to skip loading the default css … … 386 386 387 387 // Restore selection in IE when focus is placed on a non textarea or input element of the type text 388 if (tinymce.isIE) { 389 document.attachEvent('onmouseup', tinyMCEPopup._restoreSelection); 390 391 // Add base target element for it since it would fail with modal dialogs 392 t.dom.add(t.dom.select('head')[0], 'base', {target : '_self'}); 388 if (tinymce.Env.ie) { 389 if ( tinymce.Env.ie < 11 ) { 390 document.attachEvent('onmouseup', tinyMCEPopup._restoreSelection); 391 392 // Add base target element for it since it would fail with modal dialogs 393 t.dom.add(t.dom.select('head')[0], 'base', {target : '_self'}); 394 } else { 395 document.addEventListener('mouseup', tinyMCEPopup._restoreSelection, false); 396 } 393 397 } 394 398 … … 437 441 document.onkeyup = tinyMCEPopup._closeWinKeyHandler; 438 442 439 t.uiWindow.getEl('head').firstChild.firstChild.data = document.title; 443 if ( 'textContent' in document ) { 444 t.uiWindow.getEl('head').firstChild.textContent = document.title; 445 } else { 446 t.uiWindow.getEl('head').firstChild.innerText = document.title; 447 } 440 448 }, 441 449 -
trunk/src/wp-includes/js/tinymce/wp-mce-help.php
r26876 r27190 16 16 <title><?php _e('Rich Editor Help'); ?></title> 17 17 <script type="text/javascript" src="tiny_mce_popup.js?ver=358-20121205"></script> 18 <?php 19 wp_admin_css( 'wp-admin', true ); 20 ?> 18 <?php wp_admin_css( 'wp-admin', true ); ?> 21 19 <style type="text/css"> 20 21 html { 22 background: #fcfcfc; 23 overflow: hidden; 24 } 25 22 26 body { 23 27 min-width: 0; 24 28 } 25 #wphead { 26 font-size: 80%; 27 border-top: 0; 28 color: #555; 29 background-color: #f1f1f1; 30 } 31 #wphead h1 { 32 font-size: 24px; 33 color: #555; 29 30 #tabs-wrap { 31 position: absolute; 32 top: 0; 33 } 34 35 #tabs { 36 box-shadow: 0 3px 5px rgba( 255, 255, 255, 0.2 ); 34 37 margin: 0; 35 padding: 10px; 36 } 37 #tabs { 38 padding: 15px 15px 3px; 39 background-color: #f1f1f1; 40 border-bottom: 1px solid #dfdfdf; 38 padding: 0; 39 position: relative; 40 -webkit-user-select: none; 41 -moz-user-select: none; 42 -ms-user-select: none; 43 user-select: none; 44 } 45 46 #tabs a { 47 -webkit-transition: none; 48 transition: none; 49 } 50 51 #tabs-wrap #tabs > a { 52 float: left; 53 font-size: 14px; 54 height: 18px; 55 line-height: 18px; 41 56 margin: 0; 42 } 43 #tabs li { 44 display: inline; 45 } 46 #tabs a.current { 57 padding: 7px 10px; 58 position: relative; 59 text-decoration: none; 60 border-right: 1px solid #ddd; 61 background-color: #eee; 62 color: inherit; 63 } 64 65 #tabs > a:active, 66 #tabs > a:focus { 67 outline: none; 68 } 69 70 #tabs-wrap #tabs .active, 71 #tabs-wrap #tabs .active:hover { 72 color: #333; 73 background: #fff; 74 border-bottom: 1px solid #fff; 75 } 76 77 #tabs .active:after { 78 display: none; 79 } 80 81 #flipper { 47 82 background-color: #fff; 48 border-color: #dfdfdf; 49 border-bottom-color: #fff; 50 color: #d54e21; 51 } 52 #tabs a { 53 color: #2583AD; 54 padding: 6px; 55 border-width: 1px 1px 0; 56 border-style: solid solid none; 57 border-color: #f1f1f1; 58 text-decoration: none; 59 } 60 #tabs a:hover { 61 color: #d54e21; 62 } 63 .wrap h2 { 64 border-bottom-color: #dfdfdf; 65 color: #555; 66 margin: 5px 0; 67 padding: 0; 68 font-size: 18px; 69 } 70 #user_info { 71 right: 5%; 72 top: 5px; 73 } 74 h3 { 75 font-size: 1.1em; 76 margin-top: 10px; 77 margin-bottom: 0px; 78 } 79 #flipper { 83 border-top: 1px solid #ddd; 84 height: 360px; 80 85 margin: 0; 81 padding: 5px 20px 10px; 82 background-color: #fff; 83 border-left: 1px solid #dfdfdf; 84 border-bottom: 1px solid #dfdfdf; 85 } 86 * html { 87 overflow-x: hidden; 88 overflow-y: scroll; 89 } 90 #flipper div p { 91 margin-top: 0.4em; 92 margin-bottom: 0.8em; 93 text-align: justify; 94 } 86 margin-top: 32px; 87 overflow-y: scroll; 88 padding: 10px 16px; 89 } 90 95 91 th { 96 92 text-align: center; 97 93 } 94 98 95 .top th { 99 96 text-decoration: underline; 100 97 } 98 101 99 .top .key { 102 100 text-align: center; 103 101 width: 5em; 104 102 } 105 .top .action { 106 text-align: left; 107 } 108 .align { 109 border-left: 3px double #333; 110 border-right: 3px double #333; 111 } 103 112 104 .keys { 105 border: 0 none; 113 106 margin-bottom: 15px; 114 107 width: 100%; 115 border: 0 none;116 } 108 } 109 117 110 .keys p { 118 111 display: inline-block; … … 120 113 padding: 0px; 121 114 } 122 .keys .left { text-align: left; } 123 .keys .center { text-align: center; } 124 .keys .right { text-align: right; } 125 td b { 126 font-family: "Times New Roman" Times serif; 127 } 128 #buttoncontainer { 115 116 .keys .left { 117 text-align: left; 118 } 119 120 .keys .center { 129 121 text-align: center; 130 margin-bottom: 20px; 131 } 132 #buttoncontainer a, #buttoncontainer a:hover { 133 border-bottom: 0px; 134 } 122 } 123 124 .keys .right { 125 text-align: right; 126 } 127 135 128 .macos .win, 136 129 .windows .mac { 137 130 display: none; 138 131 } 132 139 133 </style> 140 134 <?php if ( is_rtl() ) : ?> 141 135 <style type="text/css"> 142 #wphead, #tabs { 143 padding-left: auto; 144 padding-right: 15px; 145 } 146 #flipper { 147 margin: 5px 0 3px 10px; 148 } 149 .keys .left, .top, .action { text-align: right; } 150 .keys .right { text-align: left; } 151 td b { font-family: Tahoma, "Times New Roman", Times, serif } 136 137 .keys .left { 138 text-align: right; 139 } 140 141 .keys .right { 142 text-align: left; 143 } 144 152 145 </style> 153 146 <?php endif; ?> … … 159 152 </script> 160 153 161 <ul id="tabs"> 162 <li><a id="tab1" href="javascript:flipTab(1)" title="<?php esc_attr_e('Basics of Rich Editing'); ?>" accesskey="1" class="current"><?php _e('Basics'); ?></a></li> 163 <li><a id="tab2" href="javascript:flipTab(2)" title="<?php esc_attr_e('Advanced use of the Rich Editor'); ?>" accesskey="2"><?php _e('Advanced'); ?></a></li> 164 <li><a id="tab3" href="javascript:flipTab(3)" title="<?php esc_attr_e('Hotkeys'); ?>" accesskey="3"><?php _e('Hotkeys'); ?></a></li> 165 <li><a id="tab4" href="javascript:flipTab(4)" title="<?php esc_attr_e('About the software'); ?>" accesskey="4"><?php _e('About'); ?></a></li> 166 </ul> 154 <div id="tabs-wrap"> 155 <div id="tabs"> 156 <a id="tab1" href="javascript:flipTab(1)" title="<?php esc_attr_e('Basics of Rich Editing'); ?>" accesskey="1" class="active"><?php _e('Basics'); ?></a> 157 <a id="tab2" href="javascript:flipTab(2)" title="<?php esc_attr_e('Advanced use of the Rich Editor'); ?>" accesskey="2"><?php _e('Advanced'); ?></a> 158 <a id="tab3" href="javascript:flipTab(3)" title="<?php esc_attr_e('Hotkeys'); ?>" accesskey="3"><?php _e('Hotkeys'); ?></a> 159 <a id="tab4" href="javascript:flipTab(4)" title="<?php esc_attr_e('About the software'); ?>" accesskey="4"><?php _e('About'); ?></a> 160 </div> 161 </div> 167 162 168 163 <div id="flipper" class="wrap"> … … 173 168 <p><?php _e('WordPress includes a rich HTML editor that works well in all major web browsers used today. However editing HTML is not the same as typing text. Each web page has two major components: the structure, which is the actual HTML code and is produced by the editor as you type, and the display, that is applied to it by the currently selected WordPress theme and is defined in style.css. WordPress is producing valid XHTML 1.0 which means that inserting multiple line breaks (BR tags) after a paragraph would not produce white space on the web page. The BR tags will be removed as invalid by the internal HTML correcting functions.'); ?></p> 174 169 <p><?php _e('While using the editor, most basic keyboard shortcuts work like in any other text editor. For example: Shift+Enter inserts line break, Ctrl+C = copy, Ctrl+X = cut, Ctrl+Z = undo, Ctrl+Y = redo, Ctrl+A = select all, etc. (on Mac use the Command key instead of Ctrl). See the Hotkeys tab for all available keyboard shortcuts.'); ?></p> 175 170 <p><?php _e('If you do not like the way the rich editor works, you may turn it off from Your Profile submenu, under Users in the admin menu.'); ?></p> 176 171 </div> 177 172 … … 190 185 <div id="content3" class="hidden"> 191 186 <h2><?php _e('Writing at Full Speed'); ?></h2> 192 187 <p><?php _e('Rather than reaching for your mouse to click on the toolbar, use these access keys. Windows and Linux use Ctrl + letter. Macintosh uses Command + letter.'); ?></p> 193 188 194 189 <table class="keys"> … … 229 224 <h2><?php _e('About TinyMCE'); ?></h2> 230 225 231 226 <p><?php _e('Version:'); ?> <span id="version"></span> (<span id="date"></span>)</p> 232 227 <p><?php printf(__('TinyMCE is a platform independent web based Javascript HTML WYSIWYG editor released as Open Source under %sLGPL</a> by Moxiecode Systems AB. It has the ability to convert HTML TEXTAREA fields or other HTML elements to editor instances.'), '<a href="'.home_url('/wp-includes/js/tinymce/license.txt').'" target="_blank" title="'.esc_attr__('GNU Library General Public License').'">'); ?></p> 233 228 <p><?php _e('Copyright © 2003-2014, <a href="http://www.moxiecode.com" target="_blank">Moxiecode Systems AB</a>, All rights reserved.'); ?></p> … … 235 230 </div> 236 231 237 </div>238 239 <div class="mceActionPanel">240 <div style="margin: 8px auto; text-align: center;padding-bottom: 10px;">241 <input type="button" id="cancel" name="cancel" value="<?php esc_attr_e('Close'); ?>" title="<?php esc_attr_e('Close'); ?>" onclick="tinyMCEPopup.close();" />242 </div>243 232 </div> 244 233 <script type="text/javascript"> … … 253 242 if ( n == i ) { 254 243 c.className = ''; 255 t.className = ' current';244 t.className = 'active'; 256 245 } else { 257 246 c.className = 'hidden'; … … 261 250 } 262 251 263 264 252 tinyMCEPopup.onInit.add(function() { 253 var win = tinyMCEPopup.getWin(); 265 254 266 255 d('version').innerHTML = tinymce.majorVersion + "." + tinymce.minorVersion; 267 256 d('date').innerHTML = tinymce.releaseDate; 268 257 269 258 if ( win.fullscreen && win.fullscreen.settings.visible ) { … … 272 261 d('content3').className = 'dfw'; 273 262 } 274 263 }); 275 264 </script> 276 265 </body>
Note: See TracChangeset
for help on using the changeset viewer.