Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (157599 => 157600)
--- trunk/Source/WebInspectorUI/ChangeLog 2013-10-17 21:21:02 UTC (rev 157599)
+++ trunk/Source/WebInspectorUI/ChangeLog 2013-10-17 21:29:33 UTC (rev 157600)
@@ -1,5 +1,23 @@
2013-10-17 Antoine Quint <grao...@apple.com>
+ Web Inspector: logged objects are highlighted in blue
+ https://bugs.webkit.org/show_bug.cgi?id=122897
+
+ Reviewed by Joseph Pecoraro.
+
+ Switch to using the system highlight color for the background selected messages.
+ Also removing SVG assets no longer needed since we won't be showing white prompt
+ and result icons anymore as well as a few generated canvas states.
+
+ * UserInterface/Images/UserInputPromptPreviousSelected.svg: Removed.
+ * UserInterface/Images/UserInputResultSelected.svg: Removed.
+ * UserInterface/LogContentView.css:
+ (.console-messages:focus .console-item.selected):
+ * UserInterface/Main.js:
+ (WebInspector._generateDisclosureTriangleImages):
+
+2013-10-17 Antoine Quint <grao...@apple.com>
+
Web Inspector: allow front-end to trigger the system beep sound to signal an error
https://bugs.webkit.org/show_bug.cgi?id=122955
Deleted: trunk/Source/WebInspectorUI/UserInterface/Images/UserInputPromptPreviousSelected.svg (157599 => 157600)
--- trunk/Source/WebInspectorUI/UserInterface/Images/UserInputPromptPreviousSelected.svg 2013-10-17 21:21:02 UTC (rev 157599)
+++ trunk/Source/WebInspectorUI/UserInterface/Images/UserInputPromptPreviousSelected.svg 2013-10-17 21:29:33 UTC (rev 157600)
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright © 2013 Apple Inc. All rights reserved. -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
- <path fill="white" d="M 7.910156 5.402344 C 7.859375 5.535156 7.78125 5.65625 7.675781 5.765625 L 4.730469 8.710938 C 4.324219 9.117188 3.664062 9.117188 3.257812 8.710938 C 2.851562 8.304688 2.851562 7.644531 3.257812 7.238281 L 5.484375 5.011719 L 3.265625 2.792969 C 2.859375 2.386719 2.859375 1.726562 3.265625 1.320312 C 3.671875 0.914062 4.332031 0.914062 4.738281 1.320312 L 7.683594 4.265625 C 7.992188 4.574219 8.066406 5.023438 7.910156 5.402344 Z"/>
-</svg>
Deleted: trunk/Source/WebInspectorUI/UserInterface/Images/UserInputResultSelected.svg (157599 => 157600)
--- trunk/Source/WebInspectorUI/UserInterface/Images/UserInputResultSelected.svg 2013-10-17 21:21:02 UTC (rev 157599)
+++ trunk/Source/WebInspectorUI/UserInterface/Images/UserInputResultSelected.svg 2013-10-17 21:29:33 UTC (rev 157600)
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright © 2013 Apple Inc. All rights reserved. -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
- <path fill="white" d="M 3.515625 5.011719 L 5.742188 7.238281 C 6.148438 7.644531 6.148438 8.304688 5.742188 8.710938 C 5.335938 9.117188 4.675781 9.117188 4.269531 8.710938 L 1.324219 5.765625 C 1.21875 5.65625 1.140625 5.535156 1.089844 5.402344 C 0.933594 5.023438 1.007812 4.574219 1.316406 4.265625 L 4.261719 1.320312 C 4.667969 0.914062 5.328125 0.914062 5.734375 1.320312 C 6.140625 1.726562 6.140625 2.386719 5.734375 2.792969 Z M 7 6 C 6.445312 6 6 5.550781 6 5 C 6 4.449219 6.445312 4 7 4 C 7.554688 4 8 4.449219 8 5 C 8 5.550781 7.554688 6 7 6 Z"/>
-</svg>
Modified: trunk/Source/WebInspectorUI/UserInterface/LogContentView.css (157599 => 157600)
--- trunk/Source/WebInspectorUI/UserInterface/LogContentView.css 2013-10-17 21:21:02 UTC (rev 157599)
+++ trunk/Source/WebInspectorUI/UserInterface/LogContentView.css 2013-10-17 21:29:33 UTC (rev 157600)
@@ -57,21 +57,13 @@
}
.console-messages:focus .console-item.selected {
- background-color: rgb(56, 121, 217);
+ background-color: highlight;
}
-.console-messages:focus .console-item.selected * {
- color: white !important;
-}
-
.console-user-command-result.console-log-level::before {
background-image: url(Images/UserInputResult.svg);
}
-.console-messages:focus .console-item.selected .console-user-command-result.console-log-level::before {
- background-image: url(Images/UserInputResultSelected.svg);
-}
-
.console-message, .console-user-command {
position: relative;
padding: 2px 12px 2px 18px;
@@ -134,18 +126,10 @@
left: 3px;
}
-.console-messages:focus .console-item.selected .console-group-title::before {
- background-image: -webkit-canvas(disclosure-triangle-small-open-selected);
-}
-
.console-group.collapsed .console-group-title::before {
background-image: -webkit-canvas(disclosure-triangle-small-closed-normal);
}
-.console-messages:focus .console-group.collapsed .console-item.selected .console-group-title::before {
- background-image: -webkit-canvas(disclosure-triangle-small-closed-selected);
-}
-
.console-group.collapsed > .console-group-messages {
display: none;
}
@@ -162,11 +146,6 @@
color: red !important;
}
-.console-messages:focus .console-item.selected .console-message-text,
-.console-messages:focus .console-item.selected .section .header .title {
- color: white !important;
-}
-
.console-debug-level .console-message-text {
color: blue;
}
@@ -194,10 +173,6 @@
background-image: url(Images/UserInputPromptPrevious.svg);
}
-.console-messages:focus .console-item.selected .console-user-command::before {
- background-image: url(Images/UserInputPromptPreviousSelected.svg);
-}
-
.console-user-command > .console-message-text {
color: rgb(0, 128, 255);
}
@@ -233,22 +208,6 @@
left: 1px;
}
-.console-messages:focus .console-item.selected .section .header::before {
- background-image: -webkit-canvas(disclosure-triangle-tiny-closed-selected);
-}
-
-.console-messages:focus .console-item.selected .section.expanded .header::before {
- background-image: -webkit-canvas(disclosure-triangle-tiny-open-selected);
-}
-
-.console-messages:focus .console-item.selected .properties-tree li.parent::before {
- background-image: -webkit-canvas(disclosure-triangle-tiny-closed-selected);
-}
-
-.console-messages:focus .console-item.selected .properties-tree li.parent.expanded::before {
- background-image: -webkit-canvas(disclosure-triangle-tiny-open-selected);
-}
-
.console-group-messages .section .header .title {
color: black;
font-weight: normal;
@@ -402,22 +361,6 @@
word-wrap: break-word;
}
-.outline-disclosure ol:focus li.selected {
- color: white;
-}
-
-.outline-disclosure ol.search-match-found li.selected {
- color: white;
-}
-
-.outline-disclosure ol:focus li.selected * {
- color: inherit;
-}
-
-.outline-disclosure ol.search-match-found li.selected * {
- color: inherit;
-}
-
.outline-disclosure li.parent {
margin-left: -12px
}
@@ -442,18 +385,10 @@
padding-right: 2px;
}
-.console-messages:focus .console-item.selected .outline-disclosure li.parent::before {
- background-image: -webkit-canvas(disclosure-triangle-tiny-closed-selected);
-}
-
.outline-disclosure li.parent.expanded::before {
background-image: -webkit-canvas(disclosure-triangle-tiny-open-normal);
}
-.console-messages:focus .console-item.selected .outline-disclosure li.parent.expanded::before {
- background-image: -webkit-canvas(disclosure-triangle-tiny-open-selected);
-}
-
.outline-disclosure ol.children {
display: none;
}
Modified: trunk/Source/WebInspectorUI/UserInterface/Main.js (157599 => 157600)
--- trunk/Source/WebInspectorUI/UserInterface/Main.js 2013-10-17 21:21:02 UTC (rev 157599)
+++ trunk/Source/WebInspectorUI/UserInterface/Main.js 2013-10-17 21:29:33 UTC (rev 157600)
@@ -1455,12 +1455,12 @@
var specifications = {};
specifications["normal"] = {fillColor: [0, 0, 0, 0.5]};
specifications["normal-active"] = {fillColor: [0, 0, 0, 0.7]};
- specifications["selected"] = {fillColor: [255, 255, 255, 0.8]};
- specifications["selected-active"] = {fillColor: [255, 255, 255, 1]};
generateColoredImagesForCSS("Images/DisclosureTriangleSmallOpen.svg", specifications, 13, 13, "disclosure-triangle-small-open-");
generateColoredImagesForCSS("Images/DisclosureTriangleSmallClosed.svg", specifications, 13, 13, "disclosure-triangle-small-closed-");
+ specifications["selected"] = {fillColor: [255, 255, 255, 0.8]};
+
generateColoredImagesForCSS("Images/DisclosureTriangleTinyOpen.svg", specifications, 8, 8, "disclosure-triangle-tiny-open-");
generateColoredImagesForCSS("Images/DisclosureTriangleTinyClosed.svg", specifications, 8, 8, "disclosure-triangle-tiny-closed-");
}
Modified: trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj (157599 => 157600)
--- trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj 2013-10-17 21:21:02 UTC (rev 157599)
+++ trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj 2013-10-17 21:29:33 UTC (rev 157600)
@@ -536,9 +536,7 @@
<None Include="..\UserInterface\Images\UpDownArrows.svg" />
<None Include="..\UserInterface\Images\UserInputPrompt.svg" />
<None Include="..\UserInterface\Images\UserInputPromptPrevious.svg" />
- <None Include="..\UserInterface\Images\UserInputPromptPreviousSelected.svg" />
<None Include="..\UserInterface\Images\UserInputResult.svg" />
- <None Include="..\UserInterface\Images\UserInputResultSelected.svg" />
<None Include="..\UserInterface\Images\Warning.svg" />
<None Include="..\UserInterface\Images\Weight.svg" />
<None Include="..\UserInterface\ImageUtilities.js" />
Modified: trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters (157599 => 157600)
--- trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters 2013-10-17 21:21:02 UTC (rev 157599)
+++ trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters 2013-10-17 21:29:33 UTC (rev 157600)
@@ -1695,15 +1695,9 @@
<None Include="..\UserInterface\Images\UserInputPromptPrevious.svg">
<Filter>Images</Filter>
</None>
- <None Include="..\UserInterface\Images\UserInputPromptPreviousSelected.svg">
- <Filter>Images</Filter>
- </None>
<None Include="..\UserInterface\Images\UserInputResult.svg">
<Filter>Images</Filter>
</None>
- <None Include="..\UserInterface\Images\UserInputResultSelected.svg">
- <Filter>Images</Filter>
- </None>
<None Include="..\UserInterface\Images\Warning.svg">
<Filter>Images</Filter>
</None>
