<!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>[193159] 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/193159">193159</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 10:52:20 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/188733">r188733</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="#branchessafari601branchSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs">branches/safari-601-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsVisualStyleDetailsPaneljs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.js</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 (193158 => 193159)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:52:13 UTC (rev 193158)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:52:20 UTC (rev 193159)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2015-12-02 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r188733. rdar://problem/23221163
+
+ 2015-08-20 Devin Rousso <drousso@apple.com>
+
+ Web Inspector: Add flex alignment section to Visual sidebar
+ https://bugs.webkit.org/show_bug.cgi?id=148243
+
+ Reviewed by Timothy Hatcher.
+
+ Uses select keyword pickers to contain the list of possible values. Also supports
+ the upcoming Grid layout keywords in the advanced keyword list.
+
+ * Localizations/en.lproj/localizedStrings.js:
+ * UserInterface/Views/VisualStyleDetailsPanel.js:
+ (WebInspector.VisualStyleDetailsPanel):
+ (WebInspector.VisualStyleDetailsPanel.prototype._populateFlexboxSection):
+ (WebInspector.VisualStyleDetailsPanel.prototype._populateAlignmentSection):
+
+2015-12-02 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r188732. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-08-20 Devin Rousso <drousso@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (193158 => 193159)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2015-12-03 18:52:13 UTC (rev 193158)
+++ branches/safari-601-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2015-12-03 18:52:20 UTC (rev 193159)
</span><span class="lines">@@ -52,6 +52,7 @@
</span><span class="cx"> localizedStrings["Add new breakpoint action after this action"] = "Add new breakpoint action after this action";
</span><span class="cx"> localizedStrings["Additions"] = "Additions";
</span><span class="cx"> localizedStrings["Align"] = "Align";
</span><ins>+localizedStrings["Alignment"] = "Alignment";
</ins><span class="cx"> localizedStrings["All"] = "All";
</span><span class="cx"> localizedStrings["All Changes"] = "All Changes";
</span><span class="cx"> localizedStrings["All Exceptions"] = "All Exceptions";
</span><span class="lines">@@ -506,6 +507,7 @@
</span><span class="cx"> localizedStrings["Selected Items"] = "Selected Items";
</span><span class="cx"> localizedStrings["Selected Symbol"] = "Selected Symbol";
</span><span class="cx"> localizedStrings["Selected Value"] = "Selected Value";
</span><ins>+localizedStrings["Self"] = "Self";
</ins><span class="cx"> localizedStrings["Self Time"] = "Self Time";
</span><span class="cx"> localizedStrings["Semantic Issue"] = "Semantic Issue";
</span><span class="cx"> localizedStrings["Session"] = "Session";
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsVisualStyleDetailsPaneljs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.js (193158 => 193159)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.js 2015-12-03 18:52:13 UTC (rev 193158)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.js 2015-12-03 18:52:20 UTC (rev 193159)
</span><span class="lines">@@ -70,8 +70,9 @@
</span><span class="cx"> this._generateSection("margin", WebInspector.UIString("Margin"));
</span><span class="cx"> this._generateSection("padding", WebInspector.UIString("Padding"));
</span><span class="cx"> this._generateSection("flexbox", WebInspector.UIString("Flexbox"));
</span><ins>+ this._generateSection("alignment", WebInspector.UIString("Alignment"));
</ins><span class="cx">
</span><del>- this._sections.layout = new WebInspector.DetailsSection("layout", WebInspector.UIString("Layout"), [this._groups.display.section, this._groups.position.section, this._groups.float.section, this._groups.dimensions.section, this._groups.margin.section, this._groups.padding.section, this._groups.flexbox.section]);
</del><ins>+ this._sections.layout = new WebInspector.DetailsSection("layout", WebInspector.UIString("Layout"), [this._groups.display.section, this._groups.position.section, this._groups.float.section, this._groups.dimensions.section, this._groups.margin.section, this._groups.padding.section, this._groups.flexbox.section, this._groups.alignment.section]);
</ins><span class="cx"> this._element.appendChild(this._sections.layout.element);
</span><span class="cx">
</span><span class="cx"> // Text Section
</span><span class="lines">@@ -558,8 +559,8 @@
</span><span class="cx">
</span><span class="cx"> var flexSizeRow = new WebInspector.DetailsSectionRow;
</span><span class="cx">
</span><del>- properties.flexGrow = new WebInspector.VisualStyleNumberInputBox("flex-grow", WebInspector.UIString("Grow"), this._keywords.defaults, null);
- properties.flexShrink = new WebInspector.VisualStyleNumberInputBox("flex-shrink", WebInspector.UIString("Shrink"), this._keywords.defaults, null);
</del><ins>+ properties.flexGrow = new WebInspector.VisualStyleNumberInputBox("flex-grow", WebInspector.UIString("Grow"), this._keywords.defaults);
+ properties.flexShrink = new WebInspector.VisualStyleNumberInputBox("flex-shrink", WebInspector.UIString("Shrink"), this._keywords.defaults);
</ins><span class="cx">
</span><span class="cx"> flexSizeRow.element.appendChild(properties.flexGrow.element);
</span><span class="cx"> flexSizeRow.element.appendChild(properties.flexShrink.element);
</span><span class="lines">@@ -576,6 +577,41 @@
</span><span class="cx"> this._populateSection(group, [flexboxGroup]);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ _populateAlignmentSection()
+ {
+ var group = this._groups.alignment;
+ var properties = group.properties;
+ var alignmentKeywords = ["Initial", "Auto", "Flex Start", "Flex End", "Center", "Stretch"];
+ var advancedAlignmentKeywords = ["Start", "End", "Left", "Right", "Baseline", "Last Baseline"];
+
+ var contentRow = new WebInspector.DetailsSectionRow;
+ var contentKeywords = {
+ basic: alignmentKeywords.concat(["Space Between", "Space Around"]),
+ advanced: advancedAlignmentKeywords.concat(["Space Evenly"])
+ };
+
+ properties.justifyContent = new WebInspector.VisualStyleKeywordPicker("justify-content", WebInspector.UIString("Horizontal"), contentKeywords);
+ properties.alignContent = new WebInspector.VisualStyleKeywordPicker("align-content", WebInspector.UIString("Vertical"), contentKeywords);
+
+ contentRow.element.appendChild(properties.justifyContent.element);
+ contentRow.element.appendChild(properties.alignContent.element);
+
+ var itemsRow = new WebInspector.DetailsSectionRow;
+ var itemKeywords = {
+ basic: alignmentKeywords,
+ advanced: ["Self Start", "Self End"].concat(advancedAlignmentKeywords)
+ };
+
+ properties.alignItems = new WebInspector.VisualStyleKeywordPicker("align-items", WebInspector.UIString("Children"), itemKeywords);
+ properties.alignSelf = new WebInspector.VisualStyleKeywordPicker("align-self", WebInspector.UIString("Self"), itemKeywords);
+
+ itemsRow.element.appendChild(properties.alignItems.element);
+ itemsRow.element.appendChild(properties.alignSelf.element);
+
+ var alignmentGroup = new WebInspector.DetailsSectionGroup([contentRow, itemsRow]);
+ this._populateSection(group, [alignmentGroup]);
+ }
+
</ins><span class="cx"> _populateTextStyleSection()
</span><span class="cx"> {
</span><span class="cx"> var group = this._groups.textStyle;
</span></span></pre>
</div>
</div>
</body>
</html>