Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(776)

Unified Diff: Source/core/inspector/InspectorOverlayPage.html

Issue 1259413003: Revert of Devtools UI: Update inspect element node description label UI (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/inspector/InspectorOverlayPage.html
diff --git a/Source/core/inspector/InspectorOverlayPage.html b/Source/core/inspector/InspectorOverlayPage.html
index bf65c201eaf4c192d62ae4c6d210f5f82d898bbd..0e880340df2fff312baefc3aed4e58420cdc2b98 100644
--- a/Source/core/inspector/InspectorOverlayPage.html
+++ b/Source/core/inspector/InspectorOverlayPage.html
@@ -32,30 +32,20 @@
body {
margin: 0;
padding: 0;
+}
+
+body.platform-mac {
font-size: 11px;
-}
-
-body.platform-mac {
- font-family: 'Helvetica Neue', 'Lucida Grande', sans-serif;
+ font-family: Menlo, Monaco;
}
body.platform-windows {
- font-family: 'Segoe UI', Tahoma, sans-serif;
+ font-size: 12px;
+ font-family: Consolas, Lucida Console;
}
body.platform-linux {
- font-family: Ubuntu, Arial, sans-serif;
-}
-
-body.platform-mac .monospace {
- font-family: Menlo, Monaco;
-}
-
-body.platform-windows .monospace {
- font-family: Consolas, Lucida Console;
-}
-
-body.platform-linux .monospace {
+ font-size: 11px;
font-family: dejavu sans mono;
}
@@ -69,10 +59,6 @@
.dimmed {
background-color: rgba(0, 0, 0, 0.31);
-}
-
-.hidden {
- display: none !important;
}
#canvas, #labels-canvas {
@@ -136,38 +122,13 @@
-webkit-mask-size: 18px 10px;
}
-#tooltip-container {
- -webkit-filter: drop-shadow(0 1px 2px hsla(0, 0%, 0%, 0.2)) drop-shadow(0 2px 6px hsla(0, 0%, 0%, 0.2));
-}
-
-#element-tooltip,
-#element-tooltip-arrow {
+.px {
+ color: rgb(128, 128, 128);
+}
+
+#element-title {
position: absolute;
z-index: 10;
- -webkit-user-select: none;
-}
-
-#element-tooltip {
- background-color: hsl(0, 0%, 98%);
- font-size: 11px;
- line-height: 14px;
- padding: 8px 10px;
- border-radius: 2px;
- color: white;
- display: flex;
- align-content: stretch;
- box-sizing: border-box;
- max-width: calc(100% - 4px);
-}
-
-#element-tooltip-arrow {
- border: solid;
- border-color: hsl(0, 0%, 98%) transparent;
- border-width: 0 8px 8px 8px;
-}
-
-#element-tooltip-arrow.tooltip-arrow-top {
- border-width: 8px 8px 0 8px;
}
#tag-name {
@@ -176,36 +137,13 @@
}
#node-id {
+ /* Keep this in sync with view-source.css (.html-attribute-value) */
+ color: rgb(26, 26, 166);
+}
+
+#class-name {
+ /* Keep this in sync with view-source.css (.html-attribute-name) */
color: rgb(153, 69, 0);
-}
-
-#class-name {
- color: rgb(26, 26, 166);
-}
-
-#element-description {
- flex: 1 1;
- word-wrap: break-word;
-}
-
-#dimensions {
- border-left: 1px solid hsl(0, 0%, 85%);
- padding-left: 12px;
- margin-left: 12px;
- float: right;
- flex: 0 0 auto;
- white-space: nowrap;
- display: flex;
- align-items: center;
- color: hsl(0, 0%, 35%);
-}
-
-#node-width {
- margin-right: 2px;
-}
-
-#node-height {
- margin-left: 2px;
}
.editor-anchor {
@@ -416,7 +354,7 @@
window._controlsVisible = false;
document.querySelector(".controls-line").style.visibility = "hidden";
- document.getElementById("tooltip-container").classList.add("hidden");
+ document.getElementById("element-title").style.visibility = "hidden";
var editor = document.getElementById("editor");
editor.style.visibility = "hidden";
editor.textContent = "";
@@ -426,59 +364,75 @@
function _drawElementTitle(elementInfo, bounds)
{
- // Reset position before measuring to ensure line-wraps are consistent.
- var elementTitle = document.getElementById("element-tooltip");
- elementTitle.style.top = "0";
- elementTitle.style.left = "0";
- document.getElementById("tooltip-container").classList.remove("hidden");
-
document.getElementById("tag-name").textContent = elementInfo.tagName;
document.getElementById("node-id").textContent = elementInfo.idValue ? "#" + elementInfo.idValue : "";
- document.getElementById("node-id").classList.toggle("hidden", !elementInfo.idValue);
var className = elementInfo.className;
if (className && className.length > 50)
className = className.substring(0, 50) + "\u2026";
document.getElementById("class-name").textContent = className || "";
- document.getElementById("class-name").classList.toggle("hidden", !className);
document.getElementById("node-width").textContent = elementInfo.nodeWidth;
document.getElementById("node-height").textContent = elementInfo.nodeHeight;
-
- var titleWidth = elementTitle.offsetWidth;
- var titleHeight = elementTitle.offsetHeight;
- var arrowRadius = 8;
- var pageMargin = 2;
-
- var boxX = Math.max(pageMargin, bounds.minX + (bounds.maxX - bounds.minX) / 2 - titleWidth / 2);
- boxX = Math.min(boxX, canvasWidth - titleWidth - pageMargin);
-
- var boxY = bounds.minY - arrowRadius - titleHeight;
- var onTop = true;
- if (boxY < 0) {
- boxY = bounds.maxY + arrowRadius;
- onTop = false;
- } else if (bounds.minY > canvasHeight) {
- boxY = canvasHeight - arrowRadius - titleHeight;
- }
-
- elementTitle.style.top = boxY + "px";
- elementTitle.style.left = boxX + "px";
-
- var tooltipArrow = document.getElementById("element-tooltip-arrow");
- // Center arrow if possible. Otherwise, try the bounds of the element.
- var arrowX = bounds.minX + (bounds.maxX - bounds.minX) / 2 - arrowRadius;
- var tooltipBorderRadius = 2;
- if (arrowX < pageMargin + tooltipBorderRadius)
- arrowX = bounds.maxX - arrowRadius * 2;
- else if (arrowX + arrowRadius * 2 > canvasWidth - pageMargin - tooltipBorderRadius)
- arrowX = bounds.minX;
- // Hide arrow if element is completely off the sides of the page.
- var arrowHidden = arrowX < pageMargin + tooltipBorderRadius || arrowX + arrowRadius * 2 > canvasWidth - pageMargin - tooltipBorderRadius;
- tooltipArrow.classList.toggle("hidden", arrowHidden);
- if (!arrowHidden) {
- tooltipArrow.classList.toggle("tooltip-arrow-top", onTop);
- tooltipArrow.style.top = (onTop ? boxY + titleHeight : boxY - arrowRadius) + "px";
- tooltipArrow.style.left = arrowX + "px";
- }
+ var elementTitle = document.getElementById("element-title");
+
+ var titleWidth = elementTitle.offsetWidth + 6;
+ var titleHeight = elementTitle.offsetHeight + 4;
+
+ var anchorTop = bounds.minY;
+ var anchorBottom = bounds.maxY;
+ var anchorLeft = bounds.minX;
+
+ const arrowHeight = 7;
+ var renderArrowUp = false;
+ var renderArrowDown = false;
+
+ var boxX = Math.max(2, anchorLeft);
+ if (boxX + titleWidth > canvasWidth)
+ boxX = canvasWidth - titleWidth - 2;
+
+ var boxY;
+ if (anchorTop > canvasHeight) {
+ boxY = canvasHeight - titleHeight - arrowHeight;
+ renderArrowDown = true;
+ } else if (anchorBottom < 0) {
+ boxY = arrowHeight;
+ renderArrowUp = true;
+ } else if (anchorBottom + titleHeight + arrowHeight < canvasHeight) {
+ boxY = anchorBottom + arrowHeight - 4;
+ renderArrowUp = true;
+ } else if (anchorTop - titleHeight - arrowHeight > 0) {
+ boxY = anchorTop - titleHeight - arrowHeight + 3;
+ renderArrowDown = true;
+ } else
+ boxY = arrowHeight;
+
+ context.save();
+ context.translate(0.5, 0.5);
+ context.beginPath();
+ context.moveTo(boxX, boxY);
+ if (renderArrowUp) {
+ context.lineTo(boxX + 2 * arrowHeight, boxY);
+ context.lineTo(boxX + 3 * arrowHeight, boxY - arrowHeight);
+ context.lineTo(boxX + 4 * arrowHeight, boxY);
+ }
+ context.lineTo(boxX + titleWidth, boxY);
+ context.lineTo(boxX + titleWidth, boxY + titleHeight);
+ if (renderArrowDown) {
+ context.lineTo(boxX + 4 * arrowHeight, boxY + titleHeight);
+ context.lineTo(boxX + 3 * arrowHeight, boxY + titleHeight + arrowHeight);
+ context.lineTo(boxX + 2 * arrowHeight, boxY + titleHeight);
+ }
+ context.lineTo(boxX, boxY + titleHeight);
+ context.closePath();
+ context.fillStyle = "rgb(255, 255, 194)";
+ context.fill();
+ context.strokeStyle = "rgb(128, 128, 128)";
+ context.stroke();
+
+ context.restore();
+
+ elementTitle.style.visibility = "visible";
+ elementTitle.style.top = (boxY + 3) + "px";
+ elementTitle.style.left = (boxX + 3) + "px";
}
function _drawRulers(bounds, rulerAtRight, rulerAtBottom)
@@ -884,12 +838,9 @@
</body>
<canvas id="canvas" class="fill"></canvas>
<canvas id="labels-canvas" class="fill"></canvas>
-<div id="tooltip-container" class="hidden">
- <div id="element-tooltip">
- <div id="element-description"><span id="tag-name"></span><span id="node-id"></span><span id="class-name"></span></div>
- <div id="dimensions"><span id="node-width"></span>&#xD7;<span id="node-height"></span></div>
- </div>
- <div id="element-tooltip-arrow"></div>
+<div id="element-title">
+ <span id="tag-name"></span><span id="node-id"></span><span id="class-name"></span>
+ <span id="node-width"></span><span class="px">px</span><span class="px"> &#xD7; </span><span id="node-height"></span><span class="px">px</span>
</div>
<div id="editor" class="fill"></div>
<div id="log"></div>
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698