[webkit-changes] [152262] branches/safari-537-branch/Source/WebInspectorUI

Mon, 01 Jul 2013 14:15:09 -0700

Title: [152262] branches/safari-537-branch/Source/WebInspectorUI
Revision
152262
Author
[email protected]
Date
2013-07-01 14:16:15 -0700 (Mon, 01 Jul 2013)

Log Message

Merged r152200.  <rdar://problem/14308488>


Modified Paths

Diff

Modified: branches/safari-537-branch/Source/WebInspectorUI/ChangeLog (152261 => 152262)


--- branches/safari-537-branch/Source/WebInspectorUI/ChangeLog	2013-07-01 21:13:49 UTC (rev 152261)
+++ branches/safari-537-branch/Source/WebInspectorUI/ChangeLog	2013-07-01 21:16:15 UTC (rev 152262)
@@ -1,5 +1,22 @@
 2013-07-01  Lucas Forschler  <[email protected]>
 
+        Merge r152200
+
+    2013-06-28  Dean Jackson  <[email protected]>
+
+            Update Apple System fonts in auto-complete
+            https://bugs.webkit.org/show_bug.cgi?id=118205
+            <rdar://problem/14308488>
+
+            Reviewed by Joseph Pecoraro.
+
+            Update for the new Apple System font names, and remove some invalid entries.
+
+            * UserInterface/CSSKeywordCompletions.js: General cleanup. Note that
+            "apple-system-short-caption2" looks like it was accidentally omitted. It wasn't :)
+
+2013-07-01  Lucas Forschler  <[email protected]>
+
         Merge r152092
 
     2013-06-27  Matthew Holden  <[email protected]>

Modified: branches/safari-537-branch/Source/WebInspectorUI/UserInterface/CSSKeywordCompletions.js (152261 => 152262)


--- branches/safari-537-branch/Source/WebInspectorUI/UserInterface/CSSKeywordCompletions.js	2013-07-01 21:13:49 UTC (rev 152261)
+++ branches/safari-537-branch/Source/WebInspectorUI/UserInterface/CSSKeywordCompletions.js	2013-07-01 21:16:15 UTC (rev 152262)
@@ -332,7 +332,11 @@
         "-webkit-control", "status-bar", "italic", "oblique", "small-caps", "normal", "bold", "bolder", "lighter",
         "100", "200", "300", "400", "500", "600", "700", "800", "900", "xx-small", "x-small", "small", "medium",
         "large", "x-large", "xx-large", "-webkit-xxx-large", "smaller", "larger", "serif", "sans-serif", "cursive",
-        "fantasy", "monospace", "-webkit-body", "-webkit-pictograph", "-webkit-system-font", "-apple-system-headline1", "-apple-system-headline2", "-apple-system-headline3", "-apple-system-emphasizedbody", "-apple-system-body", "-apple-system-subheadline", "-apple-system-footnote", "-apple-system-emphasizedcaption1", "-apple-system-caption1", "-apple-system-emphasizedcaption2", "-apple-system-caption2"
+        "fantasy", "monospace", "-webkit-body", "-webkit-pictograph", "-webkit-system-font", "-apple-system-headline",
+        "-apple-system-body", "-apple-system-subheadline", "-apple-system-footnote", "-apple-system-caption1",
+        "-apple-system-caption2", "-apple-system-short-headline", "-apple-system-short-body",
+        "-apple-system-short-subheadline", "-apple-system-short-footnote", "-apple-system-short-caption1",
+        "-apple-system-tall-body"
     ],
     "dominant-baseline": [
         "middle", "auto", "central", "text-before-edge", "text-after-edge", "ideographic", "alphabetic", "hanging",

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to