Ticket #28655: 28655.3.diff
| File 28655.3.diff, 9.2 KB (added by , 12 years ago) |
|---|
-
src/wp-admin/css/colors/_admin.scss
453 453 color: $menu-highlight-text; 454 454 } 455 455 456 .theme-install-overlay .close-full-overlay:hover, 457 .theme-install-overlay .close-full-overlay:focus, 458 .theme-install-overlay .previous-theme:hover, 459 .theme-install-overlay .previous-theme:focus, 460 .theme-install-overlay .next-theme:hover, 461 .theme-install-overlay .next-theme:focus { 462 background-color: $menu-highlight-background; 463 color: $menu-highlight-text; 464 } 465 456 466 /* Widgets */ 457 467 458 468 .widgets-chooser li.widgets-chooser-selected { … … 472 482 color: $menu-highlight-text; 473 483 } 474 484 485 .customize-controls-close:focus, 486 .customize-controls-close:hover, 475 487 .control-panel-back:focus, 476 488 .control-panel-back:hover { 477 489 background-color: $menu-highlight-background; -
src/wp-admin/css/customize-controls.css
170 170 width: 100%; 171 171 } 172 172 173 .customize-controls-close { 174 display: block; 175 position: absolute; 176 top: 0; 177 left: 0; 178 width: 45px; 179 height: 45px; 180 padding-right: 2px; 181 background: #eee; 182 border-right: 1px solid #ddd; 183 color: #444; 184 cursor: pointer; 185 -webkit-transition: color ease-in .1s; 186 transition: color ease-in .1s; 187 } 188 173 189 .control-panel-back { 174 190 display: block; 175 191 position: fixed; … … 190 206 display: none; 191 207 } 192 208 209 .customize-controls-close:focus, 210 .customize-controls-close:hover, 193 211 .control-panel-back:focus, 194 212 .control-panel-back:hover { 195 213 background-color: #0074a2; … … 197 215 outline: none; 198 216 } 199 217 218 .customize-controls-close:before { 219 font: normal 32px/1 dashicons; 220 content: "\f335"; 221 position: relative; 222 top: 8px; 223 left: 8px; 224 } 225 200 226 .control-panel-back:before { 201 227 font: normal 29px/1 dashicons; 202 228 content: "\f340"; … … 217 243 height: 22px; 218 244 } 219 245 220 #customize-header-actions a.back {221 position: relative;222 left: 0;223 -webkit-transition: left ease-in-out .18s;224 transition: left ease-in-out .18s;225 }226 227 .in-sub-panel #customize-header-actions a.back {228 left: -120px;229 }230 231 246 .wp-full-overlay-sidebar .wp-full-overlay-header { 232 247 -webkit-transition: padding ease-in-out .18s; 233 248 transition: padding ease-in-out .18s; -
src/wp-admin/css/themes.css
1617 1617 overflow: auto; 1618 1618 } 1619 1619 1620 /* Close Link */ 1621 .wp-full-overlay .close-full-overlay { 1620 /* Close & Navigation Links */ 1621 .theme-install-overlay .wp-full-overlay-sidebar .wp-full-overlay-header { 1622 padding: 0; 1623 } 1624 1625 .theme-install-overlay .close-full-overlay, 1626 .theme-install-overlay .previous-theme, 1627 .theme-install-overlay .next-theme { 1628 display: block; 1629 position: relative; 1630 float: left; 1631 width: 45px; 1632 height: 45px; 1633 padding-right: 2px; 1634 background: #eee; 1635 border-right: 1px solid #ddd; 1636 color: #444; 1637 cursor: pointer; 1622 1638 text-decoration: none; 1639 -webkit-transition: color ease-in .1s; 1640 transition: color ease-in .1s; 1623 1641 } 1624 1642 1643 .theme-install-overlay .close-full-overlay:hover, 1644 .theme-install-overlay .close-full-overlay:focus, 1645 .theme-install-overlay .previous-theme:hover, 1646 .theme-install-overlay .previous-theme:focus, 1647 .theme-install-overlay .next-theme:hover, 1648 .theme-install-overlay .next-theme:focus { 1649 background-color: #0074a2; 1650 color: #fff; 1651 outline: none; 1652 -webkit-box-shadow: none; 1653 box-shadow: none; 1654 } 1655 1656 .theme-install-overlay .close-full-overlay:before { 1657 font: normal 30px/1 dashicons; 1658 content: "\f335"; 1659 position: relative; 1660 top: 9px; 1661 left: 9px; 1662 } 1663 1664 .theme-install-overlay .previous-theme:before { 1665 font: normal 20px/1 dashicons; 1666 content: "\f340"; 1667 position: relative; 1668 top: 6px; 1669 left: 14px; 1670 } 1671 1672 .theme-install-overlay .next-theme:before { 1673 font: normal 20px/1 dashicons; 1674 content: "\f344"; 1675 position: relative; 1676 top: 6px; 1677 left: 13px; 1678 } 1679 1680 .theme-install-overlay .previous-theme.disabled, 1681 .theme-install-overlay .next-theme.disabled, 1682 .theme-install-overlay .previous-theme.disabled:hover, 1683 .theme-install-overlay .previous-theme.disabled:focus, 1684 .theme-install-overlay .next-theme.disabled:hover, 1685 .theme-install-overlay .next-theme.disabled:focus { 1686 color: #bbb; 1687 background: #eee; 1688 cursor: default; 1689 } 1690 1691 .rtl .theme-install-overlay .previous-theme:before { 1692 content: "\f344"; 1693 } 1694 1695 .rtl .theme-install-overlay .next-theme:before { 1696 content: "\f340"; 1697 } 1698 1625 1699 /* Collapse Button */ 1626 1700 .wp-full-overlay a.collapse-sidebar { 1627 1701 position: absolute; … … 1704 1778 display: none; 1705 1779 } 1706 1780 1707 .wp-full-overlay .theme-navigation {1708 padding: 10px 20px;1709 position: absolute;1710 bottom: 10px;1711 text-align: left;1712 }1713 .wp-full-overlay .theme-navigation .next-theme {1714 float: right;1715 }1716 .wp-full-overlay.no-navigation .theme-navigation {1717 display: none;1718 }1719 1720 1781 /* Animations */ 1721 1782 .wp-full-overlay, 1722 1783 .wp-full-overlay-sidebar, … … 1845 1906 max-width: 100%; 1846 1907 } 1847 1908 1848 .theme-install-overlay .wp-full-overlay-header {1849 margin-top: 9px;1850 }1851 1852 1909 .theme-install-overlay .wp-full-overlay-header .theme-install { 1853 1910 float: right; 1911 margin: 8px 10px 0 0; 1854 1912 /* For when .theme-install is a span rather than a.button-primary (already installed theme) */ 1855 1913 line-height: 26px; 1856 1914 } 1857 1915 1858 1916 .theme-install-overlay .wp-full-overlay-sidebar { 1859 background: # EEE;1860 border-right: 1px solid # DDD;1917 background: #eee; 1918 border-right: 1px solid #ddd; 1861 1919 } 1862 1920 1921 .theme-install-overlay .wp-full-overlay-sidebar-content { 1922 background: #fff; 1923 border-top: 1px solid #ddd; 1924 border-bottom: 1px solid #ddd; 1925 } 1926 1863 1927 .theme-install-overlay .wp-full-overlay-main { 1864 1928 background: #fff url(../images/spinner.gif) no-repeat center center; 1865 1929 -webkit-background-size: 20px 20px; -
src/wp-admin/customize.php
108 108 submit_button( $save_text, 'primary save', 'save', false ); 109 109 ?> 110 110 <span class="spinner"></span> 111 <a class=" back button" href="<?php echo esc_url( $return ? $return : admin_url( 'themes.php' ) ); ?>">112 < ?php _e( 'Cancel' ); ?>111 <a class="customize-controls-close" href="<?php echo esc_url( $return ? $return : admin_url( 'themes.php' ) ); ?>"> 112 <span class="screen-reader-text"><?php _e( 'Cancel' ); ?></span> 113 113 </a> 114 114 </div> 115 115 -
src/wp-admin/js/customize-controls.js
1041 1041 1042 1042 state.bind( 'change', function() { 1043 1043 var save = $('#save'), 1044 back = $('.back');1044 close = $('.customize-controls-close .screen-reader-text'); 1045 1045 1046 1046 if ( ! activated() ) { 1047 1047 save.val( api.l10n.activate ).prop( 'disabled', false ); 1048 back.text( api.l10n.cancel );1048 close.text( api.l10n.cancel ); 1049 1049 1050 1050 } else if ( saved() ) { 1051 1051 save.val( api.l10n.saved ).prop( 'disabled', true ); 1052 back.text( api.l10n.close );1052 close.text( api.l10n.close ); 1053 1053 1054 1054 } else { 1055 1055 save.val( api.l10n.save ).prop( 'disabled', false ); 1056 back.text( api.l10n.cancel );1056 close.text( api.l10n.cancel ); 1057 1057 } 1058 1058 }); 1059 1059 -
src/wp-admin/js/theme.js
767 767 768 768 this.$el.fadeIn( 200, function() { 769 769 $( 'body' ).addClass( 'theme-installer-active full-overlay-active' ); 770 $( '. close-full-overlay' ).focus();770 $( '.theme-install' ).focus(); 771 771 }); 772 772 }, 773 773 -
src/wp-admin/theme-install.php
209 209 <script id="tmpl-theme-preview" type="text/template"> 210 210 <div class="wp-full-overlay-sidebar"> 211 211 <div class="wp-full-overlay-header"> 212 <a href="#" class="close-full-overlay button-secondary"><?php _e( 'Close' ); ?></a> 212 <a href="#" class="close-full-overlay"><span class="screen-reader-text"><?php _e( 'Close' ); ?></span></a> 213 <a href="#" class="previous-theme"><span class="screen-reader-text"><?php _ex( 'Previous', 'Button label for a theme' ); ?></span></a> 214 <a href="#" class="next-theme"><span class="screen-reader-text"><?php _ex( 'Next', 'Button label for a theme' ); ?></span></a> 213 215 <# if ( data.installed ) { #> 214 216 <a href="#" class="button button-primary theme-install disabled"><?php _ex( 'Installed', 'theme' ); ?></a> 215 217 <# } else { #> … … 246 248 <span class="collapse-sidebar-label"><?php _e( 'Collapse' ); ?></span> 247 249 <span class="collapse-sidebar-arrow"></span> 248 250 </a> 249 <div class="theme-navigation">250 <a class="previous-theme button" href="#"><?php _ex( 'Previous', 'Button label for a theme' ); ?></a>251 <a class="next-theme button" href="#"><?php _ex( 'Next', 'Button label for a theme' ); ?></a>252 </div>253 251 </div> 254 252 </div> 255 253 <div class="wp-full-overlay-main">