From 0721a24ef85d1d0e67ea5ce9cea29a3554e0eda3 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Wed, 20 Jul 2022 15:23:49 -0500
Subject: [PATCH] firmware/installPybricksDialog: fix some layout issues

---
 .../InstallPybricksDialog.tsx                 | 21 ++++++++++++-------
 .../installPybricksDialog.scss                | 12 ++++++++---
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/firmware/installPybricksDialog/InstallPybricksDialog.tsx b/src/firmware/installPybricksDialog/InstallPybricksDialog.tsx
index 3dd1a85c..664ff4f2 100644
--- a/src/firmware/installPybricksDialog/InstallPybricksDialog.tsx
+++ b/src/firmware/installPybricksDialog/InstallPybricksDialog.tsx
@@ -155,14 +155,19 @@ const AcceptLicensePanel: React.VoidFunctionComponent<AcceptLicensePanelProps> =
         <div className={dialogBody}>
             <div className="pb-firmware-installPybricksDialog-license">
                 <div className="pb-firmware-installPybricksDialog-license-text">
-                    {data && <pre>{data.licenseText}</pre>}
-                    {!data && (
-                        <NonIdealState>
-                            {(error &&
-                                i18n.translate(
-                                    I18nId.LicensePanelLicenseTextError,
-                                )) || <Spinner />}
-                        </NonIdealState>
+                    {data ? (
+                        <pre>{data.licenseText}</pre>
+                    ) : (
+                        <NonIdealState
+                            icon={error ? 'error' : <Spinner />}
+                            description={
+                                error
+                                    ? i18n.translate(
+                                          I18nId.LicensePanelLicenseTextError,
+                                      )
+                                    : undefined
+                            }
+                        />
                     )}
                 </div>
                 <Checkbox
diff --git a/src/firmware/installPybricksDialog/installPybricksDialog.scss b/src/firmware/installPybricksDialog/installPybricksDialog.scss
index 3ea0a378..a031effc 100644
--- a/src/firmware/installPybricksDialog/installPybricksDialog.scss
+++ b/src/firmware/installPybricksDialog/installPybricksDialog.scss
@@ -1,22 +1,28 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) 2022 The Pybricks Authors
 
+@use '@blueprintjs/core/lib/scss/variables' as bp;
+
 .pb-firmware-installPybricksDialog {
     &-body {
-        min-height: 250px;
+        min-height: bp.$pt-grid-size * 25;
     }
 
     &-license {
         display: flex;
         flex-direction: column;
-        gap: 10px;
+        gap: bp.$pt-grid-size;
         min-height: inherit;
 
         &-text {
             flex-grow: 1;
             min-height: 0;
-            max-height: 200px;
+            max-height: bp.$pt-grid-size * 20;
             overflow: auto;
+
+            & .#{bp.$ns}-non-ideal-state {
+                min-height: bp.$pt-grid-size * 20;
+            }
         }
     }
 }