Title: [198748] trunk/Source/WebInspectorUI
Revision
198748
Author
mattba...@apple.com
Date
2016-03-28 10:47:53 -0700 (Mon, 28 Mar 2016)

Log Message

REGRESSION (r195303): Web Inspector: Wrong indentation in the type coverage profiler popovers
https://bugs.webkit.org/show_bug.cgi?id=155930
<rdar://problem/25377042>

Reviewed by Timothy Hatcher.

Increased specificity of TypeTreeView CSS selectors, and added new
overrides for rules made global by r195303, which don't apply to the
TypeTreeView's or its tree elements.

* UserInterface/Views/TypeTreeElement.css:
(.item.type-tree-element):
(.item.type-tree-element > .titles):
(.item.type-tree-element > .disclosure-button):
(.item.type-tree-element.parent > .disclosure-button):
(.item.type-tree-element.parent.expanded > .disclosure-button):
(.item.type-tree-element > .icon):
(.item.type-tree-element.prototype):
(.item.type-tree-element.prototype:focus):
(.item.type-tree-element.prototype + ol):
(.type-tree-element): Deleted.
(.type-tree-element > .titles): Deleted.
(.type-tree-element > .disclosure-button): Deleted.
(.type-tree-element.parent > .disclosure-button): Deleted.
(.type-tree-element.parent.expanded > .disclosure-button): Deleted.
(.type-tree-element > .icon): Deleted.
(.type-tree-element.prototype): Deleted.
(.type-tree-element.prototype:focus): Deleted.
(.type-tree-element.prototype + ol): Deleted.

* UserInterface/Views/TypeTreeView.css:
(.tree-outline.type li):

* UserInterface/Views/TypeTreeView.js:
(WebInspector.TypeTreeView):
Use custom indentation.

Modified Paths

Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (198747 => 198748)


--- trunk/Source/WebInspectorUI/ChangeLog	2016-03-28 17:46:01 UTC (rev 198747)
+++ trunk/Source/WebInspectorUI/ChangeLog	2016-03-28 17:47:53 UTC (rev 198748)
@@ -1,3 +1,42 @@
+2016-03-28  Matt Baker  <mattba...@apple.com>
+
+        REGRESSION (r195303): Web Inspector: Wrong indentation in the type coverage profiler popovers
+        https://bugs.webkit.org/show_bug.cgi?id=155930
+        <rdar://problem/25377042>
+
+        Reviewed by Timothy Hatcher.
+
+        Increased specificity of TypeTreeView CSS selectors, and added new
+        overrides for rules made global by r195303, which don't apply to the
+        TypeTreeView's or its tree elements.
+
+        * UserInterface/Views/TypeTreeElement.css:
+        (.item.type-tree-element):
+        (.item.type-tree-element > .titles):
+        (.item.type-tree-element > .disclosure-button):
+        (.item.type-tree-element.parent > .disclosure-button):
+        (.item.type-tree-element.parent.expanded > .disclosure-button):
+        (.item.type-tree-element > .icon):
+        (.item.type-tree-element.prototype):
+        (.item.type-tree-element.prototype:focus):
+        (.item.type-tree-element.prototype + ol):
+        (.type-tree-element): Deleted.
+        (.type-tree-element > .titles): Deleted.
+        (.type-tree-element > .disclosure-button): Deleted.
+        (.type-tree-element.parent > .disclosure-button): Deleted.
+        (.type-tree-element.parent.expanded > .disclosure-button): Deleted.
+        (.type-tree-element > .icon): Deleted.
+        (.type-tree-element.prototype): Deleted.
+        (.type-tree-element.prototype:focus): Deleted.
+        (.type-tree-element.prototype + ol): Deleted.
+
+        * UserInterface/Views/TypeTreeView.css:
+        (.tree-outline.type li):
+
+        * UserInterface/Views/TypeTreeView.js:
+        (WebInspector.TypeTreeView):
+        Use custom indentation.
+
 2016-03-28  Nikita Vasilyev  <nvasil...@apple.com>
 
         Web Inspector: Large repaints while typing in the console tab

Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TypeTreeElement.css (198747 => 198748)


--- trunk/Source/WebInspectorUI/UserInterface/Views/TypeTreeElement.css	2016-03-28 17:46:01 UTC (rev 198747)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TypeTreeElement.css	2016-03-28 17:47:53 UTC (rev 198748)
@@ -23,12 +23,14 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-.type-tree-element {
+.item.type-tree-element {
     margin-top: 1px;
+    height: auto;
 }
 
-.type-tree-element > .titles {
+.item.type-tree-element > .titles {
     position: relative;
+    top: auto;
     line-height: normal;
     padding-bottom: 1px;
     text-overflow: ellipsis;
@@ -38,12 +40,11 @@
     vertical-align: top;
 }
 
-.type-tree-element > .disclosure-button {
+.item.type-tree-element > .disclosure-button {
     display: inline-block;
     vertical-align: top;
 
     width: 15px;
-    height: 16px;
 
     margin-left: -1px;
     border: 0;
@@ -51,7 +52,7 @@
     -webkit-appearance: none;
 }
 
-.type-tree-element.parent > .disclosure-button {
+.item.type-tree-element.parent > .disclosure-button {
     background-color: transparent;
     background-image: url(../Images/DisclosureTriangles.svg#closed-normal);
     background-repeat: no-repeat;
@@ -59,15 +60,15 @@
     background-size: 13px 13px;
 }
 
-.type-tree-element.parent.expanded > .disclosure-button {
+.item.type-tree-element.parent.expanded > .disclosure-button {
     background-image: url(../Images/DisclosureTriangles.svg#open-normal);
 }
 
-.type-tree-element > .icon {
+.item.type-tree-element > .icon {
     display: none;
 }
 
-.type-tree-element.prototype {
+.item.type-tree-element.prototype {
     display: inline-block;
 
     border: 1px solid hsla(0, 0%, 0%, 0.06);
@@ -75,14 +76,14 @@
     border-radius: 3px;
 
     padding: 0 10px 1px 0;
-    margin: 3px 0 2px 0;
+    margin: 3px 0 2px -1px;
 }
 
-.type-tree-element.prototype:hover,
-.type-tree-element.prototype:focus {
+.item.type-tree-element.prototype:hover,
+.item.type-tree-element.prototype:focus {
     border-color: hsla(0, 0%, 0%, 0.1);
 }
 
-.type-tree-element.prototype + ol {
+.item.type-tree-element.prototype + ol {
     -webkit-padding-start: 0px;
 }

Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TypeTreeView.css (198747 => 198748)


--- trunk/Source/WebInspectorUI/UserInterface/Views/TypeTreeView.css	2016-03-28 17:46:01 UTC (rev 198747)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TypeTreeView.css	2016-03-28 17:47:53 UTC (rev 198748)
@@ -41,6 +41,7 @@
 }
 
 .tree-outline.type li {
+    padding: 0;
     white-space: nowrap;
     text-overflow: ellipsis;
     overflow: hidden;

Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TypeTreeView.js (198747 => 198748)


--- trunk/Source/WebInspectorUI/UserInterface/Views/TypeTreeView.js	2016-03-28 17:46:01 UTC (rev 198747)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TypeTreeView.js	2016-03-28 17:47:53 UTC (rev 198748)
@@ -37,6 +37,7 @@
         this._element.className = "type-tree";
 
         this._outline = new WebInspector.TreeOutline;
+        this._outline.customIndent = true;
         this._outline.element.classList.add("type");
         this._element.appendChild(this._outline.element);
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to