Index: src/wp-admin/css/ie.css =================================================================== --- src/wp-admin/css/ie.css (revision 26816) +++ src/wp-admin/css/ie.css (working copy) @@ -9,6 +9,31 @@ width: 98%; } +#wpbody-content #dashboard-widgets .postbox-container { + width: 49.5%; +} + +#wpbody-content #dashboard-widgets #postbox-container-2, +#wpbody-content #dashboard-widgets #postbox-container-3, +#wpbody-content #dashboard-widgets #postbox-container-4 { + float: right; + width: 50.5%; +} + +#dashboard-widgets #postbox-container-3 .empty-container, +#dashboard-widgets #postbox-container-4 .empty-container { + border: 0 none; + height: 0; + min-height: 0; +} + +.wp-editor-wrap .wp-editor-tools, +.wp-editor-wrap .wp-switch-editor, +.wp-editor-wrap .wp-editor-tabs, +.wp-editor-wrap .wp-editor-container { + zoom: 100%; +} + .wp-editor-wrap .wp-editor-container textarea.wp-editor-area { width: 97%; } @@ -72,14 +97,49 @@ line-height: 1px; } +#adminmenu .wp-submenu { + left: 110px; +} + #adminmenu .wp-submenu ul { margin: 0; } +.folded #wpcontent, +.folded #wpfooter { + margin-left: 170px; +} + +.folded #adminmenuback, +.folded #adminmenuwrap, +.folded #adminmenu, +.folded #adminmenu li.menu-top { + width: 150px; +} + .folded #adminmenu .wp-submenu { border-top-color: transparent; } +.folded #adminmenu .wp-menu-name { + display: block; +} + +.folded #adminmenu .wp-submenu.sub-open, +.folded #adminmenu .opensub .wp-submenu { + left: 110px; +} + +.folded #adminmenu a.wp-has-current-submenu:focus + .wp-submenu, +.folded #adminmenu .wp-has-current-submenu .wp-submenu { + top: -1px; + position: relative; +} + +.folded #adminmenu .wp-has-current-submenu .wp-submenu .wp-submenu-head { + background-color: transparent; +} + #adminmenu .wp-submenu .wp-submenu-head { border-top-color: #ddd; } @@ -118,6 +178,18 @@ padding: 0; } +#adminmenu li.wp-has-current-submenu .wp-submenu { + left: -40px; +} + +#adminmenu .wp-menu-image { + display: none !important; +} + +#adminmenu a.menu-top .wp-menu-name { + padding-left: 8px; +} + #collapse-menu { line-height: 23px; } @@ -126,6 +198,37 @@ padding-top: 7px; } + +.theme-browser .theme { + width: 30%; + margin: 0 3% 4% 0; + cursor: auto; +} + +.theme-browser .theme:hover, +.theme-browser .theme:focus { + cursor: auto; +} + +.theme-browser .theme .theme-screenshot { + height: 180px; + min-width: +} + +.theme-browser .theme .theme-actions { + position: static; + background-color: #e8e8e8; +} + +.theme-browser .theme .more-details { + display: none; +} + +.plugins td, +.plugins th { + border-top: 1px solid #ddd; +} + table.fixed th, table.fixed td { border-top: 1px solid #ddd; Index: src/wp-admin/css/wp-admin.css =================================================================== --- src/wp-admin/css/wp-admin.css (revision 26816) +++ src/wp-admin/css/wp-admin.css (working copy) @@ -1904,8 +1904,21 @@ height: 34px; } +/* No @font-face support */ +.no-font-face #adminmenu .wp-menu-image { + display: none; +} + +.no-font-face #adminmenu div.wp-menu-name { + padding: 8px 12px; +} + +.no-font-face.auto-fold #adminmenu .wp-menu-name { + margin-left: 0; +} +/* End no @font-face support */ + /* Sticky admin menu */ - .sticky-menu #adminmenuwrap { position: fixed; z-index: 99; /* Match the z-index of .wp-submenu to ensure flyout menus don't appear underneath main column elements */ Index: src/wp-includes/css/admin-bar.css =================================================================== --- src/wp-includes/css/admin-bar.css (revision 26816) +++ src/wp-includes/css/admin-bar.css (working copy) @@ -709,7 +709,48 @@ background-image: none; } +/* No @font-face support */ +.no-font-face #wpadminbar ul.ab-top-menu > li > a.ab-item { + display: block; + width: 45px; + text-align: center; + overflow: hidden; + margin: 0 3px; +} +.no-font-face #wpadminbar #wp-admin-bar-my-sites > .ab-item, +.no-font-face #wpadminbar #wp-admin-bar-site-name > .ab-item, +.no-font-face #wpadminbar #wp-admin-bar-edit > .ab-item { + text-indent: 0; +} + +.no-font-face #wpadminbar .ab-icon, +.no-font-face #wpadminbar .ab-icon:before, +.no-font-face #wpadminbar a.ab-item:before, +.no-font-face #wpadminbar #wp-admin-bar-wp-logo > .ab-item { + display: none !important; +} + +.no-font-face #wpadminbar ul.ab-top-menu > li > a > span.ab-label { + display: inline; +} + +.no-font-face #wpadminbar #wp-admin-bar-menu-toggle span.ab-icon { + display: inline !important; +} + +.no-font-face #wpadminbar #wp-admin-bar-menu-toggle span.ab-icon:before { + content: "Menu"; + font: 14px/45px sans-serif !important; + display: inline-block !important; + color: #fff; +} + +.no-font-face #wpadminbar #wp-admin-bar-site-name a.ab-item { + color: #fff; +} +/* End no @font-face */ + @media screen and ( max-width: 782px ) { /* Toolbar Touchification*/ html #wpadminbar { @@ -1001,8 +1042,6 @@ left: auto; } - - .network-admin #wpadminbar ul#wp-admin-bar-top-secondary > li#wp-admin-bar-my-account { margin-right: 0; } Index: src/wp-includes/css/editor.css =================================================================== --- src/wp-includes/css/editor.css (revision 26816) +++ src/wp-includes/css/editor.css (working copy) @@ -99,7 +99,181 @@ background: url("../js/tinymce/themes/advanced/img/icons.gif") no-repeat 20px 20px; } +/* No @font-face support */ +.no-font-face .wp_themeSkin span.mce_undo, +.no-font-face .wp_themeSkin span.mce_redo, +.no-font-face .wp_themeSkin span.mce_bullist, +.no-font-face .wp_themeSkin span.mce_numlist, +.no-font-face .wp_themeSkin span.mce_blockquote, +.no-font-face .wp_themeSkin span.mce_charmap, +.no-font-face .wp_themeSkin span.mce_bold, +.no-font-face .wp_themeSkin span.mce_italic, +.no-font-face .wp_themeSkin span.mce_underline, +.no-font-face .wp_themeSkin span.mce_justifyleft, +.no-font-face .wp_themeSkin span.mce_justifyright, +.no-font-face .wp_themeSkin span.mce_justifycenter, +.no-font-face .wp_themeSkin span.mce_justifyfull, +.no-font-face .wp_themeSkin span.mce_indent, +.no-font-face .wp_themeSkin span.mce_outdent, +.no-font-face .wp_themeSkin span.mce_link, +.no-font-face .wp_themeSkin span.mce_unlink, +.no-font-face .wp_themeSkin span.mce_help, +.no-font-face .wp_themeSkin span.mce_removeformat, +.no-font-face .wp_themeSkin span.mce_fullscreen, +.no-font-face .wp_themeSkin span.mce_wp_fullscreen, +.no-font-face .wp_themeSkin span.mce_media, +.no-font-face .wp_themeSkin span.mce_pastetext, +.no-font-face .wp_themeSkin span.mce_pasteword, +.no-font-face .wp_themeSkin span.mce_wp_help, +.no-font-face .wp_themeSkin span.mce_wp_adv, +.no-font-face .wp_themeSkin span.mce_wp_more, +.no-font-face .wp_themeSkin span.mce_strikethrough, +.no-font-face .wp_themeSkin span.mce_spellchecker, +.no-font-face .wp_themeSkin span.mce_forecolor, +.no-font-face .wp_themeSkin .mce_forecolorpicker, +.no-font-face .wp_themeSkin .mceSplitButton .mce_spellchecker span.mce_spellchecker, +.no-font-face .wp_themeSkin .mceSplitButton .mce_forecolor span.mce_forecolor, +.no-font-face .wp_themeSkin .mceSplitButton span.mce_numlist, +.no-font-face .wp_themeSkin .mceSplitButton span.mce_bullist { + -moz-transition: none; + -webkit-transition: none; + transition: none; + background-image: url('../images/wpicons.png?ver=20120720'); +} +/* Theme */ +.no-font-face .wp_themeSkin span.mce_undo {background-position:-500px -20px} +.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_undo, +.no-font-face .wp_themeSkin .mceButtonActive span.mce_undo {background-position:-500px 0} + +.no-font-face .wp_themeSkin span.mce_redo {background-position:-480px -20px} +.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_redo, +.no-font-face .wp_themeSkin .mceButtonActive span.mce_redo {background-position:-480px 0} + +.no-font-face .wp_themeSkin span.mce_bullist {background-position:-40px -20px} +.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_bullist, +.no-font-face .wp_themeSkin .mceButtonActive span.mce_bullist, +.no-font-face .wp_themeSkin .mceSplitButton:hover span.mce_bullist {background-position:-40px 0} + +.no-font-face .wp_themeSkin span.mce_numlist {background-position:-60px -20px} +.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_numlist, +.no-font-face .wp_themeSkin .mceButtonActive span.mce_numlist, +.no-font-face .wp_themeSkin .mceSplitButton:hover span.mce_numlist {background-position:-60px 0} + +.no-font-face .wp_themeSkin span.mce_blockquote {background-position:-80px -20px} +.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_blockquote, +.no-font-face .wp_themeSkin .mceButtonActive span.mce_blockquote {background-position:-80px 0} + +.no-font-face .wp_themeSkin span.mce_charmap {background-position:-420px -20px} +.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_charmap, +.no-font-face .wp_themeSkin .mceButtonActive span.mce_charmap {background-position:-420px 0} + +.no-font-face .wp_themeSkin span.mce_bold {background-position:0 -20px} +.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_bold, +.no-font-face .wp_themeSkin .mceButtonActive span.mce_bold {background-position:0 0} + +.no-font-face .wp_themeSkin span.mce_italic {background-position:-20px -20px} +.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_italic, +.no-font-face .wp_themeSkin .mceButtonActive span.mce_italic {background-position:-20px 0} + +.no-font-face .wp_themeSkin span.mce_underline {background-position:-280px -20px} +.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_underline, +.no-font-face .wp_themeSkin .mceButtonActive span.mce_underline {background-position:-280px 0} + +.no-font-face .wp_themeSkin span.mce_justifyleft {background-position:-100px -20px} +.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_justifyleft, +.no-font-face .wp_themeSkin .mceButtonActive span.mce_justifyleft {background-position:-100px 0} + +.no-font-face .wp_themeSkin span.mce_justifyright {background-position:-140px -20px} +.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_justifyright, +.no-font-face .wp_themeSkin .mceButtonActive span.mce_justifyright {background-position:-140px 0} + +.no-font-face .wp_themeSkin span.mce_justifycenter {background-position:-120px -20px} +.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_justifycenter, +.no-font-face .wp_themeSkin .mceButtonActive span.mce_justifycenter {background-position:-120px 0} + +.no-font-face .wp_themeSkin span.mce_justifyfull {background-position:-300px -20px} +.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_justifyfull, +.no-font-face .wp_themeSkin .mceButtonActive span.mce_justifyfull {background-position:-300px 0} + +.no-font-face .wp_themeSkin span.mce_indent {background-position:-460px -20px} +.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_indent, +.no-font-face .wp_themeSkin .mceButtonActive span.mce_indent {background-position:-460px 0} + +.no-font-face .wp_themeSkin span.mce_outdent {background-position:-440px -20px} +.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_outdent, +.no-font-face .wp_themeSkin .mceButtonActive span.mce_outdent {background-position:-440px 0} + +.no-font-face .wp_themeSkin span.mce_link {background-position:-160px -20px} +.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_link, +.no-font-face .wp_themeSkin .mceButtonActive span.mce_link {background-position:-160px 0} + +.no-font-face .wp_themeSkin span.mce_unlink {background-position:-180px -20px} +.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_unlink, +.no-font-face .wp_themeSkin .mceButtonActive span.mce_unlink {background-position:-180px 0} + +.no-font-face .wp_themeSkin span.mce_help {background-position:-520px -20px} +.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_help, +.no-font-face .wp_themeSkin .mceButtonActive span.mce_help {background-position:-520px 0} + +.no-font-face .wp_themeSkin span.mce_removeformat {background-position:-380px -20px} +.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_removeformat, +.no-font-face .wp_themeSkin .mceButtonActive span.mce_removeformat {background-position:-380px 0} + +.no-font-face .wp_themeSkin span.mce_strikethrough {background-position:-540px -20px;} +.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_strikethrough, +.no-font-face .wp_themeSkin .mceButtonActive span.mce_strikethrough {background-position:-540px 0} + +.no-font-face .wp_themeSkin .mceSplitButton .mce_forecolor span.mce_forecolor {background-position:-320px -20px} +.no-font-face .wp_themeSkin .mceSplitButtonEnabled:hover span.mce_forecolor, +.no-font-face .wp_themeSkin .mceSplitButtonSelected span.mce_forecolor {background-position:-320px 0} + +.no-font-face .wp_themeSkin .mce_forecolorpicker {background-position:-320px -20px} + +/* Plugins in WP */ +.no-font-face .wp_themeSkin span.mce_fullscreen {background-position:-240px -20px} +.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_fullscreen, +.no-font-face .wp_themeSkin .mceButtonActive span.mce_fullscreen {background-position:-240px 0} + +.no-font-face .wp_themeSkin span.mce_wp_fullscreen {background-position:-240px -20px} +.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_wp_fullscreen, +.no-font-face .wp_themeSkin .mceButtonActive span.mce_wp_fullscreen {background-position:-240px 0} + +.no-font-face .wp_themeSkin span.mce_media {background-position:-400px -20px} +.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_media, +.no-font-face .wp_themeSkin .mceButtonActive span.mce_media {background-position:-400px 0} + +.no-font-face .wp_themeSkin span.mce_pastetext {background-position:-340px -20px} +.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_pastetext, +.no-font-face .wp_themeSkin .mceButtonActive span.mce_pastetext {background-position:-340px 0} + +.no-font-face .wp_themeSkin span.mce_pasteword {background-position:-360px -20px} +.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_pasteword, +.no-font-face .wp_themeSkin .mceButtonActive span.mce_pasteword {background-position:-360px 0} + +.no-font-face .wp_themeSkin span.mce_spellchecker {background-position:-220px -20px} +.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_spellchecker, +.no-font-face .wp_themeSkin .mceSplitButtonEnabled:hover span.mce_spellchecker, +.no-font-face .wp_themeSkin .mceButtonActive span.mce_spellchecker, +.no-font-face .wp_themeSkin .mceSplitButtonSelected span.mce_spellchecker {background-position:-220px 0} + +.no-font-face .wp_themeSkin span.mce_wp_help {background-position:-520px -20px} +.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_wp_help, +.no-font-face .wp_themeSkin .mceButtonActive span.mce_wp_help {background-position:-520px 0} + +.no-font-face .wp_themeSkin span.mce_wp_adv {background-position:-260px -20px} +.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_wp_adv, +.no-font-face .wp_themeSkin .mceButtonActive span.mce_wp_adv {background-position:-260px 0} + +.no-font-face .wp_themeSkin span.mce_wp_more {background-position:-200px -20px} +.no-font-face .wp_themeSkin .mceButtonEnabled:hover span.mce_wp_more, +.no-font-face .wp_themeSkin .mceButtonActive span.mce_wp_more {background-position:-200px 0} + +.no-font-face .mceIcon:before { + display: none !important; +} +/* End no @font-face */ + /* Containers */ .wp_themeSkin table {} Index: src/wp-includes/js/admin-bar.js =================================================================== --- src/wp-includes/js/admin-bar.js (revision 26816) +++ src/wp-includes/js/admin-bar.js (working copy) @@ -154,6 +154,12 @@ } catch(e) {} }); } + + if ( navigator.userAgent && document.body.className.indexOf( 'no-font-face' ) === -1 && + /Android (1.0|1.1|1.5|1.6|2.0|2.1)|Nokia|Opera Mini|w(eb)?OSBrowser|webOS|UCWEB|Windows Phone OS 7|XBLWP7|ZuneWP7|MSIE 7/.test( navigator.userAgent ) ) { + + document.body.className += ' no-font-face'; + } }); } else { (function(d, w) { @@ -347,6 +353,12 @@ if ( w.location.hash ) w.scrollBy(0,-32); + + if ( navigator.userAgent && document.body.className.indexOf( 'no-font-face' ) === -1 && + /Android (1.0|1.1|1.5|1.6|2.0|2.1)|Nokia|Opera Mini|w(eb)?OSBrowser|webOS|UCWEB|Windows Phone OS 7|XBLWP7|ZuneWP7|MSIE 7/.test( navigator.userAgent ) ) { + + document.body.className += ' no-font-face'; + } }); })(document, window);