[webkit-changes] [193006] branches/safari-601-branch/Source/WebInspectorUI

Thu, 03 Dec 2015 10:37:15 -0800

Title: [193006] branches/safari-601-branch/Source/WebInspectorUI
Revision
193006
Author
[email protected]
Date
2015-12-03 10:30:06 -0800 (Thu, 03 Dec 2015)

Log Message

Merge r186748. rdar://problem/23221163


Modified Paths

Diff

Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193005 => 193006)


--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog	2015-12-03 18:30:01 UTC (rev 193005)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog	2015-12-03 18:30:06 UTC (rev 193006)
@@ -1,5 +1,18 @@
 2015-12-01  Timothy Hatcher  <[email protected]>
 
+        Merge r186748. rdar://problem/23221163
+
+    2015-07-12  Timothy Hatcher  <[email protected]>
+
+            Web Inspector: Add -apple-system-monospaced-numbers to font and font-family autocomplete
+            https://bugs.webkit.org/show_bug.cgi?id=146865
+
+            Reviewed by Daniel Bates.
+
+            * UserInterface/Models/CSSKeywordCompletions.js:
+
+2015-12-01  Timothy Hatcher  <[email protected]>
+
         Merge r186724. rdar://problem/23221163
 
     2015-07-11  Nikita Vasilyev  <[email protected]>

Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js (193005 => 193006)


--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js	2015-12-03 18:30:01 UTC (rev 193005)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js	2015-12-03 18:30:06 UTC (rev 193006)
@@ -379,7 +379,7 @@
         "-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", "-apple-system",
+        "fantasy", "monospace", "-webkit-body", "-webkit-pictograph", "-apple-system", "-apple-system-monospaced-numbers",
         "-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",
@@ -479,7 +479,7 @@
     ],
     "font-family": [
         "serif", "sans-serif", "cursive", "fantasy", "monospace", "-webkit-body", "-webkit-pictograph",
-        "-apple-system", "-apple-system-headline", "-apple-system-body",
+        "-apple-system", "-apple-system-monospaced-numbers", "-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",

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

Reply via email to