From ddeb78001c108226d335aa2e255b3e72a35ed0f6 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <bvaughn@fb.com>
Date: Thu, 21 Feb 2019 14:02:45 -0800
Subject: [PATCH] Tweaked colors based on Andrew's feedback

---
 src/devtools/views/HooksTree.css            |  8 ++++++--
 src/devtools/views/HooksTree.js             | 10 ++++++++--
 src/devtools/views/InspectedElementTree.css |  5 +++++
 src/devtools/views/InspectedElementTree.js  | 14 ++++++++------
 4 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/src/devtools/views/HooksTree.css b/src/devtools/views/HooksTree.css
index 0d2ded1859..ac326a90fb 100644
--- a/src/devtools/views/HooksTree.css
+++ b/src/devtools/views/HooksTree.css
@@ -7,17 +7,21 @@
   padding-left: 0.75rem;
 }
 
+.Header {
+  font-family: var(--font-family-sans);
+  color: var(--color-dim);
+}
+
 .NameValueRow {
   display: flex;
 }
 
 .Name {
-  color: var(--color-attribute-name);
+  color: var(--color-text-color);
   flex: 0 0 auto;
 }
 .Name:after {
   content: ': ';
-  color: var(--color-text-color);
   margin-right: 0.5rem;
 }
 
diff --git a/src/devtools/views/HooksTree.js b/src/devtools/views/HooksTree.js
index cf02c3a046..9c6eb0a9fc 100644
--- a/src/devtools/views/HooksTree.js
+++ b/src/devtools/views/HooksTree.js
@@ -19,7 +19,7 @@ export function HooksTreeView({ canEditHooks, hooks, id }: HooksTreeViewProps) {
   } else {
     return (
       <div className={styles.HooksTreeView}>
-        <div className={styles.Item}>hooks</div>
+        <div className={styles.Header}>hooks</div>
         <InnerHooksTreeView canEditHooks={canEditHooks} hooks={hooks} id={id} />
       </div>
     );
@@ -96,7 +96,12 @@ function HookView({ canEditHooks, hook, id, path = [] }: HookViewProps) {
           <div className={styles.NameValueRow}>
             <span className={styles.Name}>{name}</span>
           </div>
-          <KeyValue depth={1} name="DebugValue" value={value} />
+          <KeyValue
+            depth={1}
+            name="DebugValue"
+            nameClassName={styles.Name}
+            value={value}
+          />
           <InnerHooksTreeView
             canEditHooks={canEditHooks}
             hooks={subHooks}
@@ -141,6 +146,7 @@ function HookView({ canEditHooks, hook, id, path = [] }: HookViewProps) {
           <KeyValue
             depth={0}
             name={name}
+            nameClassName={styles.Name}
             overrideValueFn={overrideValueFn}
             value={value}
           />
diff --git a/src/devtools/views/InspectedElementTree.css b/src/devtools/views/InspectedElementTree.css
index 7516bc1393..9b4f89584a 100644
--- a/src/devtools/views/InspectedElementTree.css
+++ b/src/devtools/views/InspectedElementTree.css
@@ -6,6 +6,11 @@
   border-top: none;
 }
 
+.Header {
+  font-family: var(--font-family-sans);
+  color: var(--color-dim);
+}
+
 .Item {
   display: flex;
 }
diff --git a/src/devtools/views/InspectedElementTree.js b/src/devtools/views/InspectedElementTree.js
index a6d4351431..dde2899a6e 100644
--- a/src/devtools/views/InspectedElementTree.js
+++ b/src/devtools/views/InspectedElementTree.js
@@ -30,7 +30,7 @@ export default function InspectedElementTree({
     // TODO Add click and key handlers for toggling element open/close state.
     return (
       <div className={styles.InspectedElementTree}>
-        <div className={styles.Item}>{label}</div>
+        <div className={styles.Header}>{label}</div>
         {isEmpty && <div className={styles.Empty}>None</div>}
         {!isEmpty &&
           Object.keys((data: any)).map(name => (
@@ -51,6 +51,7 @@ export default function InspectedElementTree({
 type KeyValueProps = {|
   depth: number,
   name: string,
+  nameClassName?: string,
   overrideValueFn?: ?OverrideValueFn,
   path?: Array<any>,
   value: any,
@@ -59,6 +60,7 @@ type KeyValueProps = {|
 export function KeyValue({
   depth,
   name,
+  nameClassName = styles.Name,
   overrideValueFn,
   path = [],
   value,
@@ -87,7 +89,7 @@ export function KeyValue({
 
     children = (
       <div key="root" className={styles.Item} style={{ paddingLeft }}>
-        <span className={styles.Name}>{name}</span>
+        <span className={nameClassName}>{name}</span>
         {typeof overrideValueFn === 'function' ? (
           <EditableValue
             dataType={dataType}
@@ -104,7 +106,7 @@ export function KeyValue({
     // TODO Is this type even necessary? Can we just drop it?
     children = (
       <div key="root" className={styles.Item} style={{ paddingLeft }}>
-        <span className={styles.Name}>{name}</span>
+        <span className={nameClassName}>{name}</span>
         <span className={styles.Value}>{getMetaValueLabel(value)}</span>
       </div>
     );
@@ -126,7 +128,7 @@ export function KeyValue({
           className={styles.Item}
           style={{ paddingLeft }}
         >
-          <span className={styles.Name}>{name}</span>
+          <span className={nameClassName}>{name}</span>
           <span>Array</span>
         </div>
       );
@@ -148,7 +150,7 @@ export function KeyValue({
           className={styles.Item}
           style={{ paddingLeft }}
         >
-          <span className={styles.Name}>{name}</span>
+          <span className={nameClassName}>{name}</span>
           <span>Object</span>
         </div>
       );
@@ -239,7 +241,7 @@ export function EditableValue({
           value={dataType === 'boolean' ? undefined : inputValue}
         />
       </label>
-      {hasPendingChanges && (
+      {hasPendingChanges && dataType !== 'boolean' && (
         <Button
           className={styles.ResetButton}
           onClick={handleReset}