From b34c03c5b0dd9a011db9788d0444900de44a0a32 Mon Sep 17 00:00:00 2001 From: Helen Hou-Sandi Date: Tue, 17 May 2016 01:44:36 +0000 Subject: [PATCH] System font: The stack does not work with the `font` shorthand property. see #36753. git-svn-id: https://develop.svn.wordpress.org/trunk@37442 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/css/customize-controls.css | 3 ++- src/wp-includes/css/admin-bar.css | 19 +++++++++++++++---- src/wp-includes/css/wp-embed-template.css | 10 ++++++++-- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/src/wp-admin/css/customize-controls.css b/src/wp-admin/css/customize-controls.css index 0a626118b4..46d424c245 100644 --- a/src/wp-admin/css/customize-controls.css +++ b/src/wp-admin/css/customize-controls.css @@ -1137,7 +1137,8 @@ body.cheatin h1 { border-bottom: 1px solid #ddd; clear: both; color: #666; - font: 24px -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen-Sans", "Ubuntu", "Cantarell", "Helvetica Neue", sans-serif; + font-size: 24px; + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen-Sans", "Ubuntu", "Cantarell", "Helvetica Neue", sans-serif; margin: 30px 0 0 0; padding: 0; padding-bottom: 7px; diff --git a/src/wp-includes/css/admin-bar.css b/src/wp-includes/css/admin-bar.css index 30a833f1a6..b70077c476 100644 --- a/src/wp-includes/css/admin-bar.css +++ b/src/wp-includes/css/admin-bar.css @@ -7,7 +7,10 @@ text-shadow: none; text-transform: none; letter-spacing: normal; - font: normal 13px/32px -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen-Sans", "Ubuntu", "Cantarell", "Helvetica Neue", sans-serif; + font-size: 13px; + font-weight: normal; + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen-Sans", "Ubuntu", "Cantarell", "Helvetica Neue", sans-serif; + line-height: 32px; -webkit-border-radius: 0; border-radius: 0; -webkit-box-sizing: content-box; @@ -79,7 +82,10 @@ html:lang(he-il) .rtl #wpadminbar * { #wpadminbar { direction: ltr; color: #ccc; - font: normal 13px/32px -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen-Sans", "Ubuntu", "Cantarell", "Helvetica Neue", sans-serif; + font-size: 13px; + font-weight: normal; + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen-Sans", "Ubuntu", "Cantarell", "Helvetica Neue", sans-serif; + line-height: 32px; height: 32px; position: fixed; top: 0; @@ -618,7 +624,9 @@ html:lang(he-il) .rtl #wpadminbar * { #wpadminbar > #wp-toolbar > #wp-admin-bar-top-secondary > #wp-admin-bar-search #adminbarsearch input.adminbar-input { position: relative; z-index: 30; - font: 13px/24px -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen-Sans", "Ubuntu", "Cantarell", "Helvetica Neue", sans-serif; + font-size: 13px; + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen-Sans", "Ubuntu", "Cantarell", "Helvetica Neue", sans-serif; + line-height: 24px; height: 24px; width: 24px; max-width: none; @@ -798,7 +806,10 @@ html:lang(he-il) .rtl #wpadminbar * { } #wpadminbar * { - font: normal 14px/32px -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen-Sans", "Ubuntu", "Cantarell", "Helvetica Neue", sans-serif; + font-size: 14px; + font-weight: normal; + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen-Sans", "Ubuntu", "Cantarell", "Helvetica Neue", sans-serif; + line-height: 32px; } #wpadminbar .quicklinks > ul > li > a, diff --git a/src/wp-includes/css/wp-embed-template.css b/src/wp-includes/css/wp-embed-template.css index 607d13f837..3397396ee1 100644 --- a/src/wp-includes/css/wp-embed-template.css +++ b/src/wp-includes/css/wp-embed-template.css @@ -59,7 +59,10 @@ body { .wp-embed { padding: 25px; - font: 400 14px/1.5 -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen-Sans", "Ubuntu", "Cantarell", "Helvetica Neue", sans-serif; + font-size: 14px; + font-weight: 400; + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen-Sans", "Ubuntu", "Cantarell", "Helvetica Neue", sans-serif; + line-height: 1.5; color: #82878c; background: white; border: 1px solid #e5e5e5; @@ -307,7 +310,10 @@ p.wp-embed-share-description { height: 28px; margin: 0 0 10px 0; padding: 0 5px; - font: 400 14px/1.5 -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen-Sans", "Ubuntu", "Cantarell", "Helvetica Neue", sans-serif; + font-size: 14px; + font-weight: 400; + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen-Sans", "Ubuntu", "Cantarell", "Helvetica Neue", sans-serif; + line-height: 1.5; resize: none; cursor: text; }