<!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>[210756] 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/210756">210756</a></dd>
<dt>Author</dt> <dd>nvasilyev@apple.com</dd>
<dt>Date</dt> <dd>2017-01-13 19:07:31 -0800 (Fri, 13 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: the 'lock' icon for non-editable rules in the Style Rules sidebar lacks a tooltip
https://bugs.webkit.org/show_bug.cgi?id=166909
<rdar://problem/29959406>
Reviewed by Matt Baker.
Convert the lock icon from a pseudo-element to an 'img' element and add a title attribute.
* Localizations/en.lproj/localizedStrings.js:
* UserInterface/Views/CSSStyleDeclarationSection.css:
(.style-declaration-section.locked > .header > .locked-icon):
(.style-declaration-section.locked > .header::before): Deleted.
* UserInterface/Views/CSSStyleDeclarationSection.js:
(WebInspector.CSSStyleDeclarationSection):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs">trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationSectioncss">trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationSectionjs">trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (210755 => 210756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2017-01-14 02:53:57 UTC (rev 210755)
+++ trunk/Source/WebInspectorUI/ChangeLog 2017-01-14 03:07:31 UTC (rev 210756)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2017-01-13 Nikita Vasilyev <nvasilyev@apple.com>
+
+ Web Inspector: the 'lock' icon for non-editable rules in the Style Rules sidebar lacks a tooltip
+ https://bugs.webkit.org/show_bug.cgi?id=166909
+ <rdar://problem/29959406>
+
+ Reviewed by Matt Baker.
+
+ Convert the lock icon from a pseudo-element to an 'img' element and add a title attribute.
+
+ * Localizations/en.lproj/localizedStrings.js:
+ * UserInterface/Views/CSSStyleDeclarationSection.css:
+ (.style-declaration-section.locked > .header > .locked-icon):
+ (.style-declaration-section.locked > .header::before): Deleted.
+ * UserInterface/Views/CSSStyleDeclarationSection.js:
+ (WebInspector.CSSStyleDeclarationSection):
+
</ins><span class="cx"> 2017-01-12 Nikita Vasilyev <nvasilyev@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r209711): Web Inspector: in Elements Tab, selecting a deeply nested DOM element causes navigation bar buttons to be pushed off the leading edge
</span></span></pre></div>
<a id="trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (210755 => 210756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2017-01-14 02:53:57 UTC (rev 210755)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2017-01-14 03:07:31 UTC (rev 210756)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> localizedStrings["%s Prototype"] = "%s Prototype";
</span><span class="cx"> localizedStrings["%s \u2013 %s"] = "%s \u2013 %s";
</span><span class="cx"> localizedStrings["%s \u2014 %s"] = "%s \u2014 %s";
</span><ins>+localizedStrings["%s cannot be modified"] = "%s cannot be modified";
</ins><span class="cx"> localizedStrings["%s delay"] = "%s delay";
</span><span class="cx"> localizedStrings["%s interval"] = "%s interval";
</span><span class="cx"> localizedStrings["(Index)"] = "(Index)";
</span><span class="lines">@@ -746,6 +747,7 @@
</span><span class="cx"> localizedStrings["Style"] = "Style";
</span><span class="cx"> localizedStrings["Style Attribute"] = "Style Attribute";
</span><span class="cx"> localizedStrings["Style Rules"] = "Style Rules";
</span><ins>+localizedStrings["Style rule"] = "Style rule";
</ins><span class="cx"> localizedStrings["Styles"] = "Styles";
</span><span class="cx"> localizedStrings["Styles Invalidated"] = "Styles Invalidated";
</span><span class="cx"> localizedStrings["Styles Recalculated"] = "Styles Recalculated";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationSectioncss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.css (210755 => 210756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.css 2017-01-14 02:53:57 UTC (rev 210755)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.css 2017-01-14 03:07:31 UTC (rev 210756)
</span><span class="lines">@@ -60,16 +60,12 @@
</span><span class="cx"> line-height: 12px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.style-declaration-section.locked > .header::before {
</del><ins>+.style-declaration-section.locked > .header > .locked-icon {
</ins><span class="cx"> float: right;
</span><span class="cx"> width: 8px;
</span><span class="cx"> height: 10px;
</span><span class="cx"> margin-left: 5px;
</span><del>- content: "";
- background-image: url(../Images/Locked.svg);
- background-repeat: no-repeat;
- background-position: center;
- background-size: 8px 10px;
</del><ins>+ content: url(../Images/Locked.svg);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .style-declaration-section > .header > .icon {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationSectionjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.js (210755 => 210756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.js 2017-01-14 02:53:57 UTC (rev 210755)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.js 2017-01-14 03:07:31 UTC (rev 210756)
</span><span class="lines">@@ -47,6 +47,18 @@
</span><span class="cx"> this._headerElement = document.createElement("div");
</span><span class="cx"> this._headerElement.classList.add("header");
</span><span class="cx">
</span><ins>+ if (!style.editable) {
+ let lockedIconElement = this._headerElement.createChild("img", "locked-icon");
+
+ let styleLabel;
+ if (style.ownerRule && style.ownerRule.type === WebInspector.CSSStyleSheet.Type.UserAgent)
+ styleLabel = WebInspector.UIString("User Agent Stylesheet");
+ else
+ styleLabel = WebInspector.UIString("Style rule");
+
+ lockedIconElement.title = WebInspector.UIString("%s cannot be modified").format(styleLabel);
+ }
+
</ins><span class="cx"> this._iconElement = this._headerElement.createChild("img", "icon");
</span><span class="cx">
</span><span class="cx"> if (this.selectorEditable) {
</span></span></pre>
</div>
</div>
</body>
</html>