<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[209921] trunk/Source/WebInspectorUI</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/209921">209921</a></dd>
<dt>Author</dt> <dd>mattbaker@apple.com</dd>
<dt>Date</dt> <dd>2016-12-16 08:56:17 -0800 (Fri, 16 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Modernize find banner UI
https://bugs.webkit.org/show_bug.cgi?id=165939
Reviewed by Timothy Hatcher.
The find banner should have a modern appearance, matching Xcode.
* UserInterface/Views/FindBanner.css:
(.find-banner > input[type="search"]):
(.find-banner > button):
Use standard border colors.
(.find-banner > button:disabled > .glyph):
Disabled previous / next glyphs should be lighter.
(.find-banner > button:active:not(:disabled)):
Update depressed button style: flat colors, no text color change.
(.find-banner > button.segmented):
(.find-banner > button.segmented.left):
(.find-banner > button:not(:active).segmented.right:before):
(.find-banner > button.segmented.left:active + button.segmented.right,):
(.find-banner > button.segmented.left:active + button.segmented.right:before):
(.find-banner > button.segmented.right):
(.find-banner.console-find-banner > input[type="search"]):
(.find-banner.console-find-banner > :matches(input[type="search"], button)):
(.find-banner > button:disabled): Deleted.
(.find-banner > button.segmented:active): Deleted.
Overlapping button borders are no longer an issue.
* UserInterface/Views/FindBanner.js:
(WebInspector.FindBanner):
Insert previous / next buttons after the input field in the DOM.
(WebInspector.FindBanner.prototype.get delegate):
(WebInspector.FindBanner.prototype.set delegate):
(WebInspector.FindBanner.prototype.get inputField):
(WebInspector.FindBanner.prototype.get searchQuery):
(WebInspector.FindBanner.prototype.set searchQuery):
(WebInspector.FindBanner.prototype.get numberOfResults):
Inline simple getters and setters.
* UserInterface/Views/Variables.css:
(:root):
Add button colors.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsFindBannercss">trunk/Source/WebInspectorUI/UserInterface/Views/FindBanner.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsFindBannerjs">trunk/Source/WebInspectorUI/UserInterface/Views/FindBanner.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsVariablescss">trunk/Source/WebInspectorUI/UserInterface/Views/Variables.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (209920 => 209921)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-12-16 16:43:16 UTC (rev 209920)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-12-16 16:56:17 UTC (rev 209921)
</span><span class="lines">@@ -1,3 +1,47 @@
</span><ins>+2016-12-16 Matt Baker <mattbaker@apple.com>
+
+ Web Inspector: Modernize find banner UI
+ https://bugs.webkit.org/show_bug.cgi?id=165939
+
+ Reviewed by Timothy Hatcher.
+
+ The find banner should have a modern appearance, matching Xcode.
+
+ * UserInterface/Views/FindBanner.css:
+ (.find-banner > input[type="search"]):
+ (.find-banner > button):
+ Use standard border colors.
+ (.find-banner > button:disabled > .glyph):
+ Disabled previous / next glyphs should be lighter.
+ (.find-banner > button:active:not(:disabled)):
+ Update depressed button style: flat colors, no text color change.
+ (.find-banner > button.segmented):
+ (.find-banner > button.segmented.left):
+ (.find-banner > button:not(:active).segmented.right:before):
+ (.find-banner > button.segmented.left:active + button.segmented.right,):
+ (.find-banner > button.segmented.left:active + button.segmented.right:before):
+ (.find-banner > button.segmented.right):
+ (.find-banner.console-find-banner > input[type="search"]):
+ (.find-banner.console-find-banner > :matches(input[type="search"], button)):
+ (.find-banner > button:disabled): Deleted.
+ (.find-banner > button.segmented:active): Deleted.
+ Overlapping button borders are no longer an issue.
+
+ * UserInterface/Views/FindBanner.js:
+ (WebInspector.FindBanner):
+ Insert previous / next buttons after the input field in the DOM.
+ (WebInspector.FindBanner.prototype.get delegate):
+ (WebInspector.FindBanner.prototype.set delegate):
+ (WebInspector.FindBanner.prototype.get inputField):
+ (WebInspector.FindBanner.prototype.get searchQuery):
+ (WebInspector.FindBanner.prototype.set searchQuery):
+ (WebInspector.FindBanner.prototype.get numberOfResults):
+ Inline simple getters and setters.
+
+ * UserInterface/Views/Variables.css:
+ (:root):
+ Add button colors.
+
</ins><span class="cx"> 2016-12-15 Matt Baker <mattbaker@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: console search bar jumps, behaves poorly at narrow widths
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsFindBannercss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/FindBanner.css (209920 => 209921)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/FindBanner.css 2016-12-16 16:43:16 UTC (rev 209920)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/FindBanner.css 2016-12-16 16:56:17 UTC (rev 209921)
</span><span class="lines">@@ -73,13 +73,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .find-banner > input[type="search"] {
</span><del>- margin: 1px 4px;
</del><ins>+ margin: 1px -1px 1px 6px;
</ins><span class="cx">
</span><span class="cx"> width: 30vw;
</span><span class="cx"> min-width: 143px;
</span><span class="cx"> max-width: 210px;
</span><span class="cx"> height: 19px;
</span><del>-
</del><span class="cx"> vertical-align: top;
</span><span class="cx">
</span><span class="cx"> -webkit-appearance: none;
</span><span class="lines">@@ -86,8 +85,8 @@
</span><span class="cx">
</span><span class="cx"> outline: none;
</span><span class="cx">
</span><del>- border: 1px solid hsl(0, 0%, 57%);
- border-radius: 4px;
</del><ins>+ border: 1px solid var(--border-color);
+ border-radius: 4px 0 0 4px;
</ins><span class="cx"> background-color: white;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -100,12 +99,10 @@
</span><span class="cx"> -webkit-appearance: none;
</span><span class="cx">
</span><span class="cx"> border-radius: 4px;
</span><del>- border: 1px solid hsl(0, 0%, 57%);
</del><ins>+ border: 1px solid var(--border-color);
+ color: var(--glyph-color);
+ background-color: var(--button-background-color);
</ins><span class="cx">
</span><del>- background-color: white;
- background-image: none;
- box-shadow: none;
-
</del><span class="cx"> line-height: 11px;
</span><span class="cx">
</span><span class="cx"> height: 19px;
</span><span class="lines">@@ -124,26 +121,44 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .find-banner > button:disabled > .glyph {
</span><del>- opacity: 0.65;
</del><ins>+ opacity: 0.4;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .find-banner > button:active:not(:disabled) {
</span><del>- border: 1px solid hsl(0, 0%, 55%);
- background-image: linear-gradient(to bottom, hsl(0, 0%, 78%), hsl(0, 0%, 85%));
- box-shadow: hsla(0, 0%, 100%, 0.33) 0 1px 0, inset hsl(0, 0%, 64%) 0 1px 1px;
</del><ins>+ border: 1px solid var(--border-color-dark);
+ background-color: var(--button-background-color-pressed);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.find-banner > button:disabled {
- border: 1px solid hsl(0, 0%, 76%);
- background-image: none;
</del><ins>+.find-banner > button.segmented {
+ margin: 1px 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .find-banner > button.segmented.left {
</span><del>- border-top-right-radius: 0;
- border-bottom-right-radius: 0;
- margin-right: 0;
</del><ins>+ border-radius: 0;
+ border-right: none;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+.find-banner > button:not(:active).segmented.right:before {
+ content: "";
+ position: relative;
+ display: block;
+ float: left;
+ width: 1px;
+ height: 13px;
+ right: 6px;
+ top: -1px;
+ background-color: var(--border-color);
+}
+
+.find-banner > button.segmented.left:active + button.segmented.right,
+.find-banner > button.segmented.right:active {
+ border-left: solid 1px var(--border-color-dark);
+}
+
+.find-banner > button.segmented.left:active + button.segmented.right:before {
+ display: none;
+}
+
</ins><span class="cx"> .find-banner > button.segmented.left > .glyph {
</span><span class="cx"> background-image: url(../Images/BackForwardArrows.svg#back-arrow-normal);
</span><span class="cx"> }
</span><span class="lines">@@ -156,6 +171,7 @@
</span><span class="cx"> border-top-left-radius: 0;
</span><span class="cx"> border-bottom-left-radius: 0;
</span><span class="cx"> margin-left: -1px;
</span><ins>+ border-left: none;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .find-banner > button.segmented.right > .glyph {
</span><span class="lines">@@ -177,11 +193,6 @@
</span><span class="cx"> background-repeat: no-repeat;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.find-banner > button.segmented:active {
- z-index: var(--z-index-header);
- position: relative;
-}
-
</del><span class="cx"> .find-banner > label {
</span><span class="cx"> margin: 0 6px;
</span><span class="cx"> line-height: 21px;
</span><span class="lines">@@ -199,16 +210,17 @@
</span><span class="cx">
</span><span class="cx"> .find-banner.console-find-banner > input[type="search"] {
</span><span class="cx"> padding-top: 0;
</span><del>- margin: 1px 6px;
</del><span class="cx"> outline: none;
</span><del>- -webkit-appearance: none;
</del><span class="cx"> border: 1px solid hsla(0, 0%, 0%, 0.35);
</span><del>- border-radius: 3px;
</del><ins>+ border-radius: 3px 0 0 3px;
</ins><span class="cx"> background-color: hsla(0, 0%, 100%, 0.2);
</span><span class="cx"> background-clip: padding-box;
</span><del>- height: 22px;
</del><span class="cx"> }
</span><span class="cx">
</span><ins>+.find-banner.console-find-banner > :matches(input[type="search"], button) {
+ height: 22px;
+}
+
</ins><span class="cx"> .find-banner.console-find-banner > input[type="search"]::placeholder {
</span><span class="cx"> color: hsla(0, 0%, 0%, 0.35);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsFindBannerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/FindBanner.js (209920 => 209921)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/FindBanner.js 2016-12-16 16:43:16 UTC (rev 209920)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/FindBanner.js 2016-12-16 16:56:17 UTC (rev 209921)
</span><span class="lines">@@ -39,6 +39,17 @@
</span><span class="cx"> this._resultCountLabel = document.createElement("label");
</span><span class="cx"> this.element.appendChild(this._resultCountLabel);
</span><span class="cx">
</span><ins>+ this._inputField = document.createElement("input");
+ this._inputField.type = "search";
+ this._inputField.spellcheck = false;
+ this._inputField.incremental = true;
+ this._inputField.setAttribute("results", 5);
+ this._inputField.setAttribute("autosave", "inspector-search");
+ this._inputField.addEventListener("keydown", this._inputFieldKeyDown.bind(this), false);
+ this._inputField.addEventListener("keyup", this._inputFieldKeyUp.bind(this), false);
+ this._inputField.addEventListener("search", this._inputFieldSearch.bind(this), false);
+ this.element.appendChild(this._inputField);
+
</ins><span class="cx"> this._previousResultButton = document.createElement("button");
</span><span class="cx"> this._previousResultButton.classList.add(WebInspector.FindBanner.SegmentedButtonStyleClassName);
</span><span class="cx"> this._previousResultButton.classList.add(WebInspector.FindBanner.LeftSegmentButtonStyleClassName);
</span><span class="lines">@@ -46,7 +57,7 @@
</span><span class="cx"> this._previousResultButton.addEventListener("click", this._previousResultButtonClicked.bind(this));
</span><span class="cx"> this.element.appendChild(this._previousResultButton);
</span><span class="cx">
</span><del>- var previousResultButtonGlyphElement = document.createElement("div");
</del><ins>+ let previousResultButtonGlyphElement = document.createElement("div");
</ins><span class="cx"> previousResultButtonGlyphElement.classList.add(WebInspector.FindBanner.SegmentGlyphStyleClassName);
</span><span class="cx"> this._previousResultButton.appendChild(previousResultButtonGlyphElement);
</span><span class="cx">
</span><span class="lines">@@ -57,21 +68,10 @@
</span><span class="cx"> this._nextResultButton.addEventListener("click", this._nextResultButtonClicked.bind(this));
</span><span class="cx"> this.element.appendChild(this._nextResultButton);
</span><span class="cx">
</span><del>- var nextResultButtonGlyphElement = document.createElement("div");
</del><ins>+ let nextResultButtonGlyphElement = document.createElement("div");
</ins><span class="cx"> nextResultButtonGlyphElement.classList.add(WebInspector.FindBanner.SegmentGlyphStyleClassName);
</span><span class="cx"> this._nextResultButton.appendChild(nextResultButtonGlyphElement);
</span><span class="cx">
</span><del>- this._inputField = document.createElement("input");
- this._inputField.type = "search";
- this._inputField.spellcheck = false;
- this._inputField.incremental = true;
- this._inputField.setAttribute("results", 5);
- this._inputField.setAttribute("autosave", "inspector-search");
- this._inputField.addEventListener("keydown", this._inputFieldKeyDown.bind(this), false);
- this._inputField.addEventListener("keyup", this._inputFieldKeyUp.bind(this), false);
- this._inputField.addEventListener("search", this._inputFieldSearch.bind(this), false);
- this.element.appendChild(this._inputField);
-
</del><span class="cx"> if (fixed)
</span><span class="cx"> this._clearAndBlurKeyboardShortcut = new WebInspector.KeyboardShortcut(null, WebInspector.KeyboardShortcut.Key.Escape, this._clearAndBlur.bind(this), this.element);
</span><span class="cx"> else {
</span><span class="lines">@@ -97,36 +97,13 @@
</span><span class="cx">
</span><span class="cx"> // Public
</span><span class="cx">
</span><del>- get delegate()
- {
- return this._delegate;
- }
</del><ins>+ get delegate() { return this._delegate; }
+ set delegate(newDelegate) { this._delegate = newDelegate || null; }
+ get inputField() { return this._inputField; }
+ get searchQuery() { return this._inputField.value || ""; }
+ set searchQuery(query) { this._inputField.value = query || ""; }
+ get numberOfResults() { return this._numberOfResults; }
</ins><span class="cx">
</span><del>- set delegate(newDelegate)
- {
- this._delegate = newDelegate || null;
- }
-
- get inputField()
- {
- return this._inputField;
- }
-
- get searchQuery()
- {
- return this._inputField.value || "";
- }
-
- set searchQuery(query)
- {
- this._inputField.value = query || "";
- }
-
- get numberOfResults()
- {
- return this._numberOfResults;
- }
-
</del><span class="cx"> set numberOfResults(numberOfResults)
</span><span class="cx"> {
</span><span class="cx"> if (numberOfResults === undefined || isNaN(numberOfResults))
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsVariablescss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/Variables.css (209920 => 209921)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/Variables.css 2016-12-16 16:43:16 UTC (rev 209920)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/Variables.css 2016-12-16 16:56:17 UTC (rev 209921)
</span><span class="lines">@@ -48,6 +48,10 @@
</span><span class="cx">
</span><span class="cx"> --border-color: hsl(0, 0%, 70%);
</span><span class="cx"> --border-color-dark: hsl(0, 0%, 57%);
</span><ins>+
+ --button-background-color: white;
+ --button-background-color-pressed: hsl(0, 0%, 85%);
+
</ins><span class="cx"> --panel-background-color: hsl(0, 0%, 94%);
</span><span class="cx"> --panel-background-color-light: hsl(0, 0%, 96%);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>