Ticket #26369: 26369.5.patch

src/wp-admin/css/wp-admin.css

@@ -1904 +1904 @@
         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 {

src/wp-admin/includes/misc.php

@@ -645 +645 @@
 }
 add_action('admin_head', '_ipad_meta');
 
+function _admin_font_face_test( $body_class ) {
+        if ( wp_is_mobile() && ! _font_face_support() ) {
+                if ( ! empty( $body_class ) )
+                        $body_class .= ' ';
+
+                $body_class .= 'no-font-face';
+        }
+
+        return $body_class;
+}
+add_filter( 'admin_body_class', '_admin_font_face_test' );
+
 /**
  * Check lock status for posts displayed on the Posts screen
  *

src/wp-includes/class-wp-admin-bar.php

@@ -351 +351 @@
                                 $class .= ' ie8';
                         elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 9' ) )
                                 $class .= ' ie9';
-                } elseif ( wp_is_mobile() ) {
+                }
+
+                if ( wp_is_mobile() ) {
                         $class .= ' mobile';
+
+                        if ( ! _font_face_support() ) {
+                                $class .= ' no-font-face';
+                        }
                 }
 
                 ?>
@@ -449 +455 @@
 
                         echo $node->title;
 
+                        if ( ! empty( $node->meta['title'] ) ) {
+                                ?><span class="ab-label-hidden"><?php echo esc_html( $node->meta['title'] ); ?></span><?php
+                        }
+
                         if ( $has_link ) :
                                 ?></a><?php
                         else:

src/wp-includes/css/admin-bar.css

@@ -697 +697 @@
         background-image: none;
 }
 
+/* No @font-face support */
+#wpadminbar span.ab-label-hidden {
+        display: none;
+}
 
+#wpadminbar.no-font-face span.ab-label-hidden {
+        display: inline;
+}
+
+#wpadminbar.no-font-face ul.ab-top-menu > li > a.ab-item {
+        display: block;
+        width: 45px;
+        text-align: center;
+        overflow: hidden;
+        margin: 0 3px;
+}
+
+#wpadminbar.no-font-face #wp-admin-bar-my-sites > .ab-item,
+#wpadminbar.no-font-face #wp-admin-bar-site-name > .ab-item,
+#wpadminbar.no-font-face #wp-admin-bar-edit > .ab-item {
+        text-indent: 0;
+}
+
+#wpadminbar.no-font-face .ab-icon,
+#wpadminbar.no-font-face .ab-icon:before,
+#wpadminbar.no-font-face a.ab-item:before {
+        display: none !important;
+}
+
+#wpadminbar.no-font-face ul.ab-top-menu > li > a > span.ab-label {
+        display: none;
+}
+
 @media screen and ( max-width: 782px ) {
         /* Toolbar Touchification*/
         html #wpadminbar {
@@ -986 +1018 @@
                 left: auto;
         }
 
-
-
         .network-admin #wpadminbar ul#wp-admin-bar-top-secondary > li#wp-admin-bar-my-account {
                 margin-right: 0;
         }
@@ -1043 +1073 @@
         #wpadminbar li#wp-admin-bar-updates {
                 display: none;
         }
-}
- No newline at end of file
+}

src/wp-includes/css/editor.css

@@ -99 +99 @@
         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 {}
 

src/wp-includes/vars.php

@@ -139 +139 @@
 
         return $is_mobile;
 }
+
+function _font_face_support() {
+        $pattern = '/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/';
+
+        if ( preg_match( $pattern, $_SERVER['HTTP_USER_AGENT'] ) )
+                return false;
+
+        return true;
+}