From f3f497f40fff89e3554a95837ef3d56d16fc5499 Mon Sep 17 00:00:00 2001 From: Brian Vaughn Date: Fri, 8 Feb 2019 20:27:10 -0500 Subject: [PATCH] Cleaned up CSS vars and reduced font size a bit --- src/devtools/views/Element.css | 2 +- src/devtools/views/SelectedElement.css | 2 +- src/devtools/views/Tree.css | 2 +- src/devtools/views/Tree.js | 6 +++++- src/devtools/views/root.css | 5 +++-- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/devtools/views/Element.css b/src/devtools/views/Element.css index b9a909c9b8..0c52b4f83e 100644 --- a/src/devtools/views/Element.css +++ b/src/devtools/views/Element.css @@ -5,7 +5,7 @@ cursor: pointer; position: relative; white-space: nowrap; - line-height: 20px; + line-height: var(--line-height-data); display: flex; align-items: center; } diff --git a/src/devtools/views/SelectedElement.css b/src/devtools/views/SelectedElement.css index 0f96d3e2a3..54611b8aa5 100644 --- a/src/devtools/views/SelectedElement.css +++ b/src/devtools/views/SelectedElement.css @@ -11,7 +11,7 @@ flex: 0 0 42px; display: flex; align-items: center; - font-size: 16px; + font-size: var(--font-size-large); border-bottom: 1px solid var(--color-border); padding: 0.5rem; } diff --git a/src/devtools/views/Tree.css b/src/devtools/views/Tree.css index 5373266a5a..f43c12e7a2 100644 --- a/src/devtools/views/Tree.css +++ b/src/devtools/views/Tree.css @@ -10,7 +10,7 @@ flex: 0 0 42px; display: flex; align-items: center; - font-size: 16px; + font-size: var(--font-size-large); border-bottom: 1px solid var(--color-border); padding: 0.5rem; } diff --git a/src/devtools/views/Tree.js b/src/devtools/views/Tree.js index d2c543277f..aaf151e17c 100644 --- a/src/devtools/views/Tree.js +++ b/src/devtools/views/Tree.js @@ -79,6 +79,10 @@ export default function Tree(props: Props) { [baseDepth, numElements, getElementAtIndex] ); + const itemSize = parseInt( + getComputedStyle(document.body).getPropertyValue('--line-height-data') + ); + return (
@@ -98,7 +102,7 @@ export default function Tree(props: Props) { height={height} itemCount={numElements} itemData={itemData} - itemSize={20} + itemSize={itemSize} ref={listRef} width={width} > diff --git a/src/devtools/views/root.css b/src/devtools/views/root.css index 76400d25c2..0487da7b47 100644 --- a/src/devtools/views/root.css +++ b/src/devtools/views/root.css @@ -45,8 +45,9 @@ --color-tree-node-selected: var(--theme-light-tree-node-selected); --color-tree-node-hover: var(--theme-light-tree-node-hover); - --font-size-normal: 12px; - --line-height-data: 1.5rem; + --font-size-normal: 11px; + --font-size-large: 15px; + --line-height-data: 18px; /* GitHub.com system fonts */ --font-family-monospace: 'SFMono-Regular', Consolas, 'Liberation Mono', Menlo,