<!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>[193132] branches/safari-601-branch/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/193132">193132</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 10:49:40 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/188629">r188629</a>. rdar://problem/23221163</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchSourceWebInspectorUIChangeLog">branches/safari-601-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsVisualStyleColorPickercss">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleColorPicker.css</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsVisualStyleDetailsPanelcss">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.css</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsVisualStyleDetailsPaneljs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsVisualStylePropertyEditorLinkcss">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStylePropertyEditorLink.css</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsVisualStyleSelectorTreeItemcss">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleSelectorTreeItem.css</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsVisualStyleTimingEditorcss">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleTimingEditor.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193131 => 193132)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:49:34 UTC (rev 193131)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:49:40 UTC (rev 193132)
</span><span class="lines">@@ -1,5 +1,56 @@
</span><span class="cx"> 2015-12-02 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r188629. rdar://problem/23221163
+
+ 2015-08-18 Devin Rousso <drousso@apple.com>
+
+ Web Inspector: Add support for positioning Visual editors on non-retina displays
+ https://bugs.webkit.org/show_bug.cgi?id=148160
+
+ Reviewed by Timothy Hatcher.
+
+ Cleans up the positioning, dimensions, and widths of the
+ Visual editors on non-retina displays.
+
+ * UserInterface/Views/VisualStyleColorPicker.css:
+ (.visual-style-property-container.input-color-picker > .visual-style-property-value-container > input):
+
+ * UserInterface/Views/VisualStyleDetailsPanel.css:
+ (.sidebar > .panel.details.css-style .visual > .details-section .details-section > .content .group > .row.visual-style-separated-row):
+ (@media (-webkit-min-device-pixel-ratio: 2)):
+
+ * UserInterface/Views/VisualStyleDetailsPanel.js:
+ (WebInspector.VisualStyleDetailsPanel.prototype._clearModifiedSection):
+
+ * UserInterface/Views/VisualStylePropertyEditorLink.css:
+ (.visual-style-property-editor-link):
+ (.visual-style-property-editor-link > .visual-style-property-editor-link-border.left):
+ (.visual-style-property-editor-link.link-all > .visual-style-property-editor-link-border.left):
+ (.visual-style-property-editor-link.link-all.linked > .visual-style-property-editor-link-border):
+ (.visual-style-property-editor-link > .visual-style-property-editor-link-icon):
+ (.visual-style-property-editor-link:not(.link-all) > .visual-style-property-editor-link-icon):
+ (@media (-webkit-min-device-pixel-ratio: 2)):
+ (.visual-style-property-editor-link.link-all.linked > .visual-style-property-editor-link-border.left):
+ (.visual-style-property-editor-link.link-all.linked > .visual-style-property-editor-link-icon:hover + .visual-style-property-editor-link-border.right): Deleted.
+ (.visual-style-property-editor-link.link-all.linked > .visual-style-property-editor-link-border.right): Deleted.
+ (.visual-style-property-editor-link.link-all > .visual-style-property-editor-link-icon): Deleted.
+
+ * UserInterface/Views/VisualStyleSelectorTreeItem.css:
+ (.item.visual-style-selector-item > input[type="checkbox"]):
+ (.item.visual-style-selector-item > .icon):
+ (.item.visual-style-selector-item.selector-invalid > .titles > .title::before):
+ (@media (-webkit-min-device-pixel-ratio: 2)):
+ (.item.visual-style-selector-item > .titles):
+ (.item.visual-style-selector-item.selector-invalid > .icon): Deleted.
+
+ * UserInterface/Views/VisualStyleTimingEditor.css:
+ (.visual-style-property-container.timing-editor > .visual-style-property-value-container > .bezier-editor):
+ (@media (-webkit-min-device-pixel-ratio: 2)):
+
+
+
+2015-12-02 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r188628. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-08-18 Devin Rousso <drousso@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsVisualStyleColorPickercss"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleColorPicker.css (193131 => 193132)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleColorPicker.css 2015-12-03 18:49:34 UTC (rev 193131)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleColorPicker.css 2015-12-03 18:49:40 UTC (rev 193132)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .visual-style-property-container.input-color-picker > .visual-style-property-value-container > input {
</span><del>- margin: 1px 1.5px 3px -3px;
</del><ins>+ margin: 1px 0 3px -3px;
</ins><span class="cx"> padding: 0 3px 0 5px;
</span><span class="cx"> border-top-right-radius: 4px;
</span><span class="cx"> border-bottom-right-radius: 4px;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsVisualStyleDetailsPanelcss"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.css (193131 => 193132)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.css 2015-12-03 18:49:34 UTC (rev 193131)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.css 2015-12-03 18:49:40 UTC (rev 193132)
</span><span class="lines">@@ -69,11 +69,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .sidebar > .panel.details.css-style .visual > .details-section .details-section > .content .group > .row.visual-style-separated-row {
</span><del>- border-bottom: 0.5px solid hsl(0, 0%, 83%);
</del><ins>+ border-bottom: 1px solid hsl(0, 0%, 83%);
</ins><span class="cx"> margin-bottom: 5px;
</span><span class="cx"> padding-bottom: 2px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+@media (-webkit-min-device-pixel-ratio: 2) {
+ .sidebar > .panel.details.css-style .visual > .details-section .details-section > .content .group > .row.visual-style-separated-row {
+ border-bottom-width: 0.5px !important;
+ }
+}
+
</ins><span class="cx"> .sidebar > .panel.details.css-style .visual > .details-section .details-section > .content .group > .row > .visual-style-property-container > .visual-style-property-title {
</span><span class="cx"> width: 55px;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsVisualStyleDetailsPaneljs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.js (193131 => 193132)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.js 2015-12-03 18:49:34 UTC (rev 193131)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.js 2015-12-03 18:49:40 UTC (rev 193132)
</span><span class="lines">@@ -248,6 +248,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this._currentStyle.text = newStyleText;
</span><ins>+ group.section.element.classList.toggle("has-set-property", this._groupHasSetProperty(group));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> get _initialTextList()
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsVisualStylePropertyEditorLinkcss"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStylePropertyEditorLink.css (193131 => 193132)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStylePropertyEditorLink.css 2015-12-03 18:49:34 UTC (rev 193131)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStylePropertyEditorLink.css 2015-12-03 18:49:40 UTC (rev 193132)
</span><span class="lines">@@ -24,6 +24,8 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> .visual-style-property-editor-link {
</span><ins>+ display: flex;
+ align-items: center;
</ins><span class="cx"> position: relative;
</span><span class="cx"> min-width: 32px;
</span><span class="cx"> margin-left: 1px;
</span><span class="lines">@@ -57,31 +59,26 @@
</span><span class="cx"> border-top: 1px dashed hsl(0, 0%, 50%);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.visual-style-property-editor-link.link-all > .visual-style-property-editor-link-border.left,
-.visual-style-property-editor-link.link-all.linked > .visual-style-property-editor-link-icon:hover + .visual-style-property-editor-link-border.right {
- width: 49px;
-}
-
-.visual-style-property-editor-link.link-all.linked > .visual-style-property-editor-link-border.left {
- width: 52px;
-}
-
-.visual-style-property-editor-link.link-all.linked > .visual-style-property-editor-link-border.right {
- width: 51px;
-}
-
</del><span class="cx"> .visual-style-property-editor-link.linked > .visual-style-property-editor-link-border {
</span><span class="cx"> border-top: 1px solid black;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .visual-style-property-editor-link > .visual-style-property-editor-link-border.left {
</span><del>- left: 1px;
</del><ins>+ left: 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .visual-style-property-editor-link > .visual-style-property-editor-link-border.right {
</span><span class="cx"> right: 1px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.visual-style-property-editor-link.link-all > .visual-style-property-editor-link-border.left {
+ left: 1px;
+}
+
+.visual-style-property-editor-link.link-all.linked > .visual-style-property-editor-link-border {
+ width: 51px;
+}
+
</ins><span class="cx"> .visual-style-property-editor-link.link-all.linked > .visual-style-property-editor-link-border.left {
</span><span class="cx"> left: 0;
</span><span class="cx"> }
</span><span class="lines">@@ -100,8 +97,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .visual-style-property-editor-link > .visual-style-property-editor-link-icon {
</span><del>- width: 10px;
- height: 10px;
</del><ins>+ width: 9px;
+ height: 12px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .visual-style-property-editor-link > .visual-style-property-editor-link-icon > .unlinked-icon {
</span><span class="lines">@@ -119,9 +116,24 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .visual-style-property-editor-link:not(.link-all) > .visual-style-property-editor-link-icon {
</span><del>- margin: 5px 0 0 11px;
</del><ins>+ margin-left: 11px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.visual-style-property-editor-link.link-all > .visual-style-property-editor-link-icon {
- margin-top: 1px;
</del><ins>+@media (-webkit-min-device-pixel-ratio: 2) {
+ .visual-style-property-editor-link.link-all > .visual-style-property-editor-link-border.left,
+ .visual-style-property-editor-link.link-all.linked > .visual-style-property-editor-link-icon:hover + .visual-style-property-editor-link-border.right {
+ width: 49px;
+ }
+
+ .visual-style-property-editor-link > .visual-style-property-editor-link-border.left {
+ left: 1px;
+ }
+
+ .visual-style-property-editor-link.link-all.linked > .visual-style-property-editor-link-border.left {
+ width: 52px;
+ }
+
+ .visual-style-property-editor-link > .visual-style-property-editor-link-icon {
+ width: 10px;
+ }
</ins><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsVisualStyleSelectorTreeItemcss"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleSelectorTreeItem.css (193131 => 193132)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleSelectorTreeItem.css 2015-12-03 18:49:34 UTC (rev 193131)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleSelectorTreeItem.css 2015-12-03 18:49:40 UTC (rev 193132)
</span><span class="lines">@@ -42,8 +42,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .item.visual-style-selector-item > input[type="checkbox"] {
</span><ins>+ align-self: center;
</ins><span class="cx"> position: relative;
</span><del>- margin: 4.5px 0 4px 5px;
</del><ins>+ margin-left: 5px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> body:not(.window-inactive, .window-docked-inactive) .item.visual-style-selector-item.selected > input[type="checkbox"]:checked::before {
</span><span class="lines">@@ -58,9 +59,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .item.visual-style-selector-item > .icon {
</span><ins>+ align-self: center;
</ins><span class="cx"> width: 16px;
</span><span class="cx"> height: 16px;
</span><del>- margin: 2.5px 0 2.5px 4px;
</del><ins>+ margin-left: 4px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .item.visual-style-selector-item.modified > .icon {
</span><span class="lines">@@ -70,7 +72,6 @@
</span><span class="cx"> .item.visual-style-selector-item.selector-invalid > .icon {
</span><span class="cx"> width: 14px;
</span><span class="cx"> height: 14px;
</span><del>- margin: 3.5px 0 3.5px 5px;
</del><span class="cx"> content: url(../Images/Error.svg);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -80,14 +81,22 @@
</span><span class="cx">
</span><span class="cx"> .item.visual-style-selector-item.selector-invalid > .titles > .title::before {
</span><span class="cx"> position: absolute;
</span><del>- top: calc(50% - 0.5px);
</del><ins>+ top: 0;
</ins><span class="cx"> left: 0;
</span><span class="cx"> width: 100%;
</span><ins>+ height: 50%;
</ins><span class="cx"> border-bottom: 1px solid hsla(0, 100%, 50%, 0.6);
</span><span class="cx"> content: "";
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+@media (-webkit-min-device-pixel-ratio: 2) {
+ .item.visual-style-selector-item.selector-invalid > .titles > .title::before {
+ top: -0.5px;
+ }
+}
+
</ins><span class="cx"> .item.visual-style-selector-item > .titles {
</span><ins>+ align-self: center;
</ins><span class="cx"> overflow: hidden;
</span><span class="cx"> white-space: nowrap;
</span><span class="cx"> text-overflow: ellipsis;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsVisualStyleTimingEditorcss"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleTimingEditor.css (193131 => 193132)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleTimingEditor.css 2015-12-03 18:49:34 UTC (rev 193131)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleTimingEditor.css 2015-12-03 18:49:40 UTC (rev 193132)
</span><span class="lines">@@ -34,11 +34,17 @@
</span><span class="cx"> .visual-style-property-container.timing-editor > .visual-style-property-value-container > .bezier-editor {
</span><span class="cx"> width: 23px;
</span><span class="cx"> height: 20px;
</span><del>- margin: 0 2px 0 0.5px;
</del><ins>+ margin-right: 2px;
</ins><span class="cx"> content: url(../Images/CubicBezier.svg);
</span><span class="cx"> cursor: default;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+@media (-webkit-min-device-pixel-ratio: 2) {
+ .visual-style-property-container.timing-editor > .visual-style-property-value-container > .bezier-editor {
+ margin-left: 0.5px;
+ }
+}
+
</ins><span class="cx"> .visual-style-property-container.timing-editor > .visual-style-property-value-container > .bezier-editor:hover {
</span><span class="cx"> filter: brightness(0.9);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>