From ac30c39cf968da8545ec0d6567d0f837c51a7ca2 Mon Sep 17 00:00:00 2001 From: Florence Haudin Date: Mon, 10 Mar 2025 20:31:49 +0100 Subject: [PATCH 1/2] Change the order of the DeviceInfoTable and LegoBuildSpecific components. Try to improve the responsiveness of the control panel interface. --- .../components/ColorSelector.tsx | 10 +- .../components/FrankieComponent.tsx | 10 +- .../components/MoveHubComponent.tsx | 10 +- .../components/MoveHubPanel.tsx | 8 +- src/movehub-extension/components/Vernie.tsx | 2 +- .../components/VernieComponent.tsx | 12 +- style/base.css | 180 +++++++++++++----- 7 files changed, 161 insertions(+), 71 deletions(-) diff --git a/src/movehub-extension/components/ColorSelector.tsx b/src/movehub-extension/components/ColorSelector.tsx index af8fe51..fc3c9cd 100644 --- a/src/movehub-extension/components/ColorSelector.tsx +++ b/src/movehub-extension/components/ColorSelector.tsx @@ -61,12 +61,12 @@ export function ColorSelector({ device }: IMoveHubPanelProps) {

Current color

- {(selectedColor!=='lightblue') ? : } + {(selectedColor !== 'lightblue') ? : }
-
+
diff --git a/src/movehub-extension/components/FrankieComponent.tsx b/src/movehub-extension/components/FrankieComponent.tsx index d4e7d53..b2c85a3 100644 --- a/src/movehub-extension/components/FrankieComponent.tsx +++ b/src/movehub-extension/components/FrankieComponent.tsx @@ -6,8 +6,11 @@ import Frankie from './Frankie'; export function FrankieComponent({ device }: IMoveHubPanelProps) { return ( <> -
-
+
+
+ +
+

-
- -
); diff --git a/src/movehub-extension/components/MoveHubComponent.tsx b/src/movehub-extension/components/MoveHubComponent.tsx index 6937577..b4014e8 100644 --- a/src/movehub-extension/components/MoveHubComponent.tsx +++ b/src/movehub-extension/components/MoveHubComponent.tsx @@ -11,8 +11,11 @@ export interface IHubControlProps { export function MoveHubComponent({ device }: IMoveHubPanelProps) { return ( <> -
-
+
+
+ +
+

-
- -
); diff --git a/src/movehub-extension/components/MoveHubPanel.tsx b/src/movehub-extension/components/MoveHubPanel.tsx index 968770b..c5a8b54 100644 --- a/src/movehub-extension/components/MoveHubPanel.tsx +++ b/src/movehub-extension/components/MoveHubPanel.tsx @@ -15,19 +15,15 @@ export interface IHubControlProps { export function MoveHubInfos(props: { device: MoveHub }) { return ( - <> -
- -
- + ); } export function MoveHubPanel({ device }: IMoveHubPanelProps) { return (
- +
); } diff --git a/src/movehub-extension/components/Vernie.tsx b/src/movehub-extension/components/Vernie.tsx index 2946f64..e307667 100644 --- a/src/movehub-extension/components/Vernie.tsx +++ b/src/movehub-extension/components/Vernie.tsx @@ -10,7 +10,7 @@ export default function Vernie () { justifyContent: 'center' }} > - Vernie schematics + Vernie schematics
); }; diff --git a/src/movehub-extension/components/VernieComponent.tsx b/src/movehub-extension/components/VernieComponent.tsx index 6ac3c44..4a98f0b 100644 --- a/src/movehub-extension/components/VernieComponent.tsx +++ b/src/movehub-extension/components/VernieComponent.tsx @@ -8,7 +8,11 @@ export function VernieComponent({ device }: IMoveHubPanelProps) { return ( <>
+
+ +
+

-
- -
-
+
+
); diff --git a/style/base.css b/style/base.css index 2745183..a9a7ca4 100644 --- a/style/base.css +++ b/style/base.css @@ -6,20 +6,17 @@ .jp-movehub-panel-content { padding: 0 2em; - overflow: auto; + overflow-y: scroll; + width: 100%; + box-sizing: border-box; } -.vernie-control-grid-container { - display: grid; - grid-template-columns: repeat(2, 1fr); - grid-gap: 4px; - justify-content: left; +.vernie-control-grid-item-left { + justify-self: center; align-items: center; - margin-top: 50px; - gap: 16px; } -.vernie-control-grid-item-left { +.vernie-control-grid-item-center { justify-self: left; align-items: center; } @@ -29,6 +26,16 @@ align-items: center; } +.lego-build-control-grid-item-left { + justify-self: center; + align-items: center; +} + +.lego-build-control-grid-item-right { + justify-self: center; + align-items: center; +} + .move-form-main-container { display: flex; align-items: center; @@ -88,13 +95,60 @@ text-align: left; } -.manual-control-text-container { - margin: 8px 0; +.led-color-selector { + height: 24px; + padding: 0; + line-height: 18px; + border-radius: 4px; + border-color: black; + border-width: 0.5px; + margin-top: -12px; + position: absolute; + font-size: 11px; +} + +.color-selector-container { + display: flex; + justify-content: right; + gap: 10px; +} + +.lego-build-control-grid-container { + display: grid; + grid-template-columns: repeat(2, 1fr); + grid-gap: 4px; justify-content: left; + align-items: center; + margin-top: 20px; + gap: 16px; width: 100%; } -@media (width< 1200px) { +@media (max-width: 940px) { /*smaller screens*/ + .vernie-control-grid-container { + display: grid; + grid-template-columns: repeat(1, 1fr); + grid-template-rows: repeat(3, auto); + grid-gap: 4px; + justify-content: left; + align-items: center; + margin-top: 20px; + gap: 16px; + width: 100%; + } + + .lego-build-control-grid-container { + display: grid; + grid-template-columns: repeat(1, 1fr); + grid-template-rows: repeat(2, auto); + grid-gap: 4px; + justify-content: left; + align-items: center; + margin-top: 20px; + gap: 16px; + width: 100%; + } + .move-input-field-text { width: 40%; } @@ -108,17 +162,72 @@ } .led-color-text { - width: 50%; + width: 40%; + } + + .led-color-selector-container { + width: 60%; + } + + .led-color-selector { + width: 171px; + } +} + +@media (min-width: 940px) and (max-width: 1270px) { /* intermediary screens*/ + .vernie-control-grid-container { + display: grid; + grid-template-columns: repeat(2, 1fr); + grid-template-rows: repeat(2, auto); + grid-gap: 4px; + justify-content: left; + align-items: center; + margin-top: 20px; + gap: 16px; + width: 100%; + } + + .move-input-field-text { + width: 150px; + text-align: left; + } + + .move-input-field-with-1button { + width: 150px; + } + + .move-input-field-with-2buttons { + width: 150px; + } + + .led-color-text { + width: 150px; + text-align: left; + } + + .led-color-selector-container { + width: 150px; } - .color-selector-container { - width: 50%; + .led-color-selector { + width: 150px; } } -@media (width> 1200px) { +@media (min-width: 1270px) { /* larger screens */ + .vernie-control-grid-container { + display: grid; + grid-template-columns: repeat(3, 1fr); + grid-gap: 4px; + justify-content: left; + align-items: center; + margin-top: 20px; + gap: 16px; + width: 100%; + } + .move-input-field-text { - width: 200px; + width: 150px; text-align: left; } @@ -131,16 +240,16 @@ } .led-color-text { - width: 200px; + width: 150px; text-align: left; } - .color-selector-container { + .led-color-selector-container { width: 150px; } - .color-selector { - width: 110px; + .led-color-selector { + width: 150px; } } @@ -148,13 +257,13 @@ display: grid; grid-template-columns: repeat(3, 1fr); grid-gap: 0; - width: 144px; - height: 144px; + width: 210px; + height: 210px; } .manual-control-grid-item { - width: 48px; - height: 48px; + width: 70px; + height: 70px; display: flex; align-items: center; justify-content: center; @@ -187,9 +296,10 @@ border-width: 0.5px; color: var(--jp-ui-font-color1); font-size: var(--jp-ui-font-size1); - table-layout: fixed; margin-top: 16px; margin-bottom: 16px; + width: 100%; + table-layout: auto; } .custom-table-thead { @@ -226,21 +336,3 @@ font-size: var(--jp-content-font-size1); line-height: var(--jp-content-line-height); } - -.color-selector { - height: 24px; - padding: 0; - line-height: 18px; - border-radius: 4px; - border-color: black; - border-width: 0.5px; - margin-top: -12px; - position: absolute; - font-size: 11px; -} - -.color-selector-container { - display: flex; - justify-content: right; - gap: 10px; -} From 52b3a4a116ddfb573387de86f61fa8b71ecc6f54 Mon Sep 17 00:00:00 2001 From: Florence Haudin Date: Tue, 11 Mar 2025 13:40:05 +0100 Subject: [PATCH 2/2] Keep on improving the responsivess and style of the control panel. --- src/movehub-extension/components/Frankie.tsx | 2 +- .../components/FrankieComponent.tsx | 2 +- .../components/MoveHubComponent.tsx | 2 +- style/base.css | 171 +++++++----------- 4 files changed, 67 insertions(+), 110 deletions(-) diff --git a/src/movehub-extension/components/Frankie.tsx b/src/movehub-extension/components/Frankie.tsx index bba0aa4..1dc7583 100644 --- a/src/movehub-extension/components/Frankie.tsx +++ b/src/movehub-extension/components/Frankie.tsx @@ -5,7 +5,7 @@ const FrankieSVGUrl = `data:image/svg+xml;base64,${btoa(FrankieSVG)}`; export default function Frankie () { return (
- Frankie schematics + Frankie schematics
); }; diff --git a/src/movehub-extension/components/FrankieComponent.tsx b/src/movehub-extension/components/FrankieComponent.tsx index b2c85a3..bc19ce0 100644 --- a/src/movehub-extension/components/FrankieComponent.tsx +++ b/src/movehub-extension/components/FrankieComponent.tsx @@ -10,7 +10,7 @@ export function FrankieComponent({ device }: IMoveHubPanelProps) {
-
+

-
+