Changeset 28043
- Timestamp:
- 04/08/2014 07:48:55 AM (11 years ago)
- Location:
- trunk/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-admin/js/wp-fullscreen.js
r27857 r28043 310 310 if ( pixels && pixels.toString().indexOf('%') !== -1 ) { 311 311 s.$editorContainer.css( 'width', pixels ); 312 s.$statusbar.css( 'width', pixels ); 312 313 313 314 if ( s.$dfwTitle ) { … … 321 322 width = $('#wp-fullscreen-body').data('theme-width') || 800; 322 323 s.$editorContainer.width( width ); 324 s.$statusbar.width( width ); 323 325 324 326 if ( s.$dfwTitle ) { … … 343 345 344 346 s.$editorContainer.width( width ); 347 s.$statusbar.width( width ); 345 348 346 349 if ( s.$dfwTitle ) { … … 363 366 ps.subscribe( 'showing', function() { 364 367 $body.addClass( 'wp-fullscreen-active' ); 365 366 368 s.$dfwWrap.addClass( 'wp-fullscreen-wrap' ); 367 s.$editorContainer.append( $('#wp-fullscreen-status') );368 369 369 370 if ( s.$dfwTitle ) { … … 413 414 ps.subscribe( 'hiding', function() { // This event occurs while the overlay blocks the DFW UI. 414 415 $body.removeClass( 'wp-fullscreen-active' ); 415 $( '#wp-fullscreen-body' ).append( $('#wp-fullscreen-status') );416 416 417 417 if ( s.$dfwTitle ) { … … 475 475 s.toolbar = toolbar = $('#fullscreen-topbar'); 476 476 s.$fullscreenFader = $('#fullscreen-fader'); 477 s.$statusbar = $('#wp-fullscreen-status'); 477 478 s.hasTinymce = typeof tinymce !== 'undefined'; 478 479 -
trunk/src/wp-includes/class-wp-editor.php
r28032 r28043 1264 1264 1265 1265 <div id="wp-fullscreen-save"> 1266 <input type="button" class="button -primary right" value="<?php echo $save; ?>" onclick="wp.editor.fullscreen.save();" />1266 <input type="button" class="button button-primary right" value="<?php echo $save; ?>" onclick="wp.editor.fullscreen.save();" /> 1267 1267 <span class="spinner"></span> 1268 1268 <span class="wp-fullscreen-saved-message"><?php if ( $post->post_status == 'publish' ) _e('Updated.'); else _e('Saved.'); ?></span> … … 1273 1273 </div> 1274 1274 </div> 1275 <div id="wp-fullscreen-status"> 1276 <div id="wp-fullscreen-count"><?php printf( __( 'Word count: %s' ), '<span class="word-count">0</span>' ); ?></div> 1277 <div id="wp-fullscreen-tagline"><?php _e('Just write.'); ?></div> 1275 <div id="wp-fullscreen-statusbar"> 1276 <div id="wp-fullscreen-status"> 1277 <div id="wp-fullscreen-count"><?php printf( __( 'Word count: %s' ), '<span class="word-count">0</span>' ); ?></div> 1278 <div id="wp-fullscreen-tagline"><?php _e('Just write.'); ?></div> 1279 </div> 1278 1280 </div> 1279 1281 </div> -
trunk/src/wp-includes/css/editor.css
r27983 r28043 1502 1502 -moz-box-sizing: border-box; 1503 1503 box-sizing: border-box; 1504 max-width: 100% !important;1504 max-width: 100%; 1505 1505 } 1506 1506 … … 1512 1512 } 1513 1513 1514 #wp-fullscreen-statusbar { 1515 position: fixed; 1516 left: 0; 1517 right: 0; 1518 bottom: 0; 1519 height: 30px; 1520 z-index: 100020; 1521 background: #fff; 1522 transition-property: height; 1523 transition-duration: 0.2s; 1524 } 1525 1514 1526 #wp-fullscreen-status { 1515 margin: auto;1516 -webkit-transition: opacity 0.4s;1517 transition: opacity 0.4s;1527 margin: 0 auto; 1528 padding: 0; 1529 border-top: 1px dashed #ccc; 1518 1530 } 1519 1531 … … 1532 1544 1533 1545 .wp-fullscreen-active .wp-editor-container { 1534 margin: auto; 1546 margin: 0 auto 30px; 1547 border-bottom: 0; 1535 1548 } 1536 1549 … … 1545 1558 1546 1559 #wp-fullscreen-tagline { 1547 color: # bbb;1560 color: #888; 1548 1561 font-size: 18px; 1549 1562 float: right; 1550 padding -top: 5px;1563 padding: 4px 0 0; 1551 1564 } 1552 1565 … … 1576 1589 #wp-fullscreen-mode-bar, 1577 1590 #wp-fullscreen-button-bar, 1578 #wp-fullscreen-close, 1579 #wp-fullscreen-count { 1591 #wp-fullscreen-close { 1580 1592 float: left; 1593 } 1594 1595 #wp-fullscreen-count, 1596 #wp-fullscreen-tagline { 1597 display: inline-block; 1581 1598 } 1582 1599 … … 1587 1604 #wp-fullscreen-save { 1588 1605 float: right; 1589 padding: 2px 2px 0 5px; 1606 padding: 2px 0 0; 1607 min-width: 95px; 1590 1608 } 1591 1609 1592 1610 #wp-fullscreen-count, 1593 1611 #wp-fullscreen-close { 1594 padding -top: 6px;1612 padding: 5px 0 0; 1595 1613 } 1596 1614 … … 1598 1616 margin: auto; 1599 1617 padding: 0; 1618 min-width: 550px; 1600 1619 } 1601 1620 … … 1646 1665 } 1647 1666 1648 #wp-fullscreen-save img,1649 1667 #wp-fullscreen-save span { 1650 padding-right: 4px;1651 line-height: 26px;1652 1668 display: none; 1669 margin: 5px 6px 0; 1670 float: left; 1653 1671 } 1654 1672 … … 1671 1689 -------------------------------------------------------------- */ 1672 1690 1673 .wp-fullscreen-active #wp-fullscreen-status,1674 1691 .wp-fullscreen-active #fullscreen-topbar { 1675 1692 -webkit-transition-duration: 0.8s; … … 1679 1696 } 1680 1697 1681 .wp-fullscreen-active.wp-dfw-show-ui #wp-fullscreen-status, 1698 .wp-fullscreen-active #wp-fullscreen-statusbar { 1699 height: 0; 1700 } 1701 1682 1702 .wp-fullscreen-active.wp-dfw-show-ui #fullscreen-topbar { 1683 1703 -webkit-transition-duration: 0.4s; … … 1685 1705 opacity: 1; 1686 1706 filter: alpha(opacity=100); 1707 } 1708 1709 .wp-fullscreen-active.wp-dfw-show-ui #wp-fullscreen-statusbar { 1710 height: 30px; 1687 1711 } 1688 1712 … … 1750 1774 } 1751 1775 1752 .wp-dfw-touch #wp-fullscreen-status {1753 opacity: 1;1776 .wp-dfw-touch #wp-fullscreen-statusbar { 1777 height: 30px; 1754 1778 } 1755 1779 … … 1760 1784 #wp-fullscreen-button-bar, 1761 1785 #wp-fullscreen-save { 1762 float: none;1763 1786 display: inline-block; 1764 1787 } … … 1770 1793 #wp-fullscreen-central-toolbar { 1771 1794 width: auto !important; 1795 min-width: 0; 1772 1796 } 1773 1797 … … 1788 1812 } 1789 1813 1814 #wp-fullscreen-save { 1815 position: absolute; 1816 right: 10px; 1817 } 1818 } 1819 1820 @media screen and ( max-width: 480px ) { 1821 #wp_fs_help { 1822 display: none; 1823 } 1824 1790 1825 .wp-fullscreen-wrap .wp-editor-container, 1791 1826 .wp-fullscreen-title { 1792 max-width: 700px; 1793 } 1794 1795 .wp-fullscreen-saved-message { 1796 display: none !important; 1827 width: 480px !important; 1828 } 1829 1830 body.wp-fullscreen-active { 1831 width: 480px; 1832 overflow: auto; 1833 } 1834 1835 #fullscreen-topbar, 1836 .wp-fullscreen-wrap { 1837 width: 480px; 1838 } 1839 1840 #wp-fullscreen-status { 1841 width: auto !important; 1842 max-width: 100%; 1843 padding: 0 10px; 1797 1844 } 1798 1845 }
Note: See TracChangeset
for help on using the changeset viewer.