Skip to content

Commit f1fc4da

Browse files
rockbaer2007rockbaer2007
committed
fix: move expert controls above grid
1 parent 11f6c4c commit f1fc4da

8 files changed

Lines changed: 67 additions & 54 deletions

File tree

‎atlas-plugins/homeassistant-card-editor/atlas-plugin.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"de": "Home Assistant Karten-Editor",
66
"en": "Home Assistant Card Editor"
77
},
8-
"version": "0.2.0-alpha.81",
8+
"version": "0.2.0-alpha.82",
99
"description": "Visual Expert card editor with Home Assistant entity selection and HACS-oriented export.",
1010
"descriptionI18n": {
1111
"de": "Visueller Expert-Editor für Home-Assistant-Karten mit Entitätsauswahl und HACS-orientiertem Export.",

‎atlas/config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: "ATLAS"
2-
version: "0.1.192"
2+
version: "0.1.193"
33
slug: "atlas"
44
description: "ATLAS Administration and Home Assistant Plugins preview"
55
url: "https://github.com/rockbaer2007/atlas"

‎examples/admin-demo/app.bundle.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/status-demo/index.html‎

Lines changed: 59 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1241,26 +1241,27 @@
12411241

12421242
.expert-editor-controls {
12431243
display: grid;
1244-
grid-template-columns: repeat(3, minmax(0, 244px));
1244+
grid-template-columns: repeat(2, minmax(0, 1fr));
12451245
gap: 8px;
12461246
align-items: end;
12471247
}
12481248

12491249
.expert-output-toolbar {
1250-
display: flex;
1251-
justify-content: flex-end;
1252-
margin-top: 14px;
1250+
display: none;
12531251
}
12541252

12551253
.expert-output-grid {
12561254
display: grid;
1257-
grid-template-columns: minmax(420px, 0.9fr) minmax(320px, 0.72fr) minmax(460px, 1.18fr);
1255+
grid-template-columns: repeat(3, minmax(0, 1fr));
12581256
gap: 12px;
12591257
align-items: start;
1260-
margin-top: 8px;
1258+
margin-bottom: 10px;
12611259
}
12621260

12631261
.expert-output-column {
1262+
display: grid;
1263+
gap: 8px;
1264+
align-content: start;
12641265
min-width: 0;
12651266
}
12661267

@@ -1269,7 +1270,9 @@
12691270
}
12701271

12711272
.expert-output-column.ha-card-preview pre {
1272-
min-height: 188px;
1273+
min-height: 0;
1274+
max-height: 220px;
1275+
overflow: auto;
12731276
}
12741277

12751278
.expert-output-column.expert-detail-column {
@@ -1324,10 +1327,13 @@
13241327

13251328
.expert-grid-top-controls {
13261329
display: grid;
1327-
grid-template-columns: repeat(2, minmax(88px, 128px)) minmax(132px, 192px);
1330+
grid-template-columns: repeat(2, minmax(0, 1fr));
13281331
gap: 8px;
13291332
align-items: end;
1330-
justify-content: start;
1333+
}
1334+
1335+
.expert-grid-zoom-control {
1336+
grid-column: 1 / -1;
13311337
}
13321338

13331339
.expert-grid-axis-control {
@@ -1366,11 +1372,11 @@
13661372
}
13671373

13681374
.expert-editor-controls .wide {
1369-
grid-column: span 2;
1375+
grid-column: 1 / -1;
13701376
}
13711377

13721378
.expert-editor-controls .span-2 {
1373-
grid-column: span 2;
1379+
grid-column: 1 / -1;
13741380
}
13751381

13761382
.expert-editor-controls .field-pair {
@@ -1393,7 +1399,7 @@
13931399

13941400
.expert-number-controls {
13951401
display: grid;
1396-
grid-template-columns: repeat(4, 72px);
1402+
grid-template-columns: repeat(4, minmax(0, 1fr));
13971403
gap: 8px;
13981404
align-items: end;
13991405
}
@@ -1411,7 +1417,7 @@
14111417
}
14121418

14131419
.expert-number-controls input {
1414-
width: 72px;
1420+
width: 100%;
14151421
min-height: 34px;
14161422
padding: 6px 4px;
14171423
text-align: center;
@@ -1443,7 +1449,14 @@
14431449
}
14441450

14451451
.expert-output-grid .expert-editor-actions button {
1446-
flex: 0 0 184px;
1452+
flex: 1 1 calc(50% - 6px);
1453+
min-width: 0;
1454+
}
1455+
1456+
.expert-editor-status {
1457+
display: grid;
1458+
gap: 8px;
1459+
margin-top: 10px;
14471460
}
14481461

14491462
@media (max-width: 720px) {
@@ -3672,35 +3685,28 @@ <h2 class="entity-section-title" data-i18n="heading.expertEditor">Expert editor
36723685
<div id="expert-template-palette" class="expert-template-palette" aria-label="Expert editor templates" data-i18n-aria-label="aria.expertTemplates"></div>
36733686
</aside>
36743687
<section class="expert-editor-surface" aria-label="Expert editor surface" data-i18n-aria-label="aria.expertSurface">
3675-
<div class="expert-grid-frame">
3676-
<div class="expert-grid-top-controls">
3677-
<div class="expert-grid-axis-control expert-grid-columns-control">
3678-
<label for="expert-grid-columns" data-i18n="label.gridColumns">X</label>
3679-
<input id="expert-grid-columns" type="range" min="0" max="5" value="0">
3680-
<output id="expert-grid-columns-output" for="expert-grid-columns">0</output>
3681-
</div>
3682-
<div class="expert-grid-axis-control expert-grid-rows-control">
3683-
<label for="expert-grid-rows" data-i18n="label.gridRows">Y</label>
3684-
<input id="expert-grid-rows" type="range" min="0" max="5" value="0">
3685-
<output id="expert-grid-rows-output" for="expert-grid-rows">0</output>
3686-
</div>
3687-
<div class="expert-grid-axis-control expert-grid-zoom-control">
3688-
<label for="expert-grid-zoom" data-i18n="label.gridZoom">Zoom</label>
3689-
<input id="expert-grid-zoom" type="range" min="75" max="150" step="5" value="100">
3690-
<output id="expert-grid-zoom-output" for="expert-grid-zoom">100%</output>
3691-
</div>
3692-
</div>
3693-
<div class="expert-grid-body">
3694-
<div class="expert-editor-canvas-row">
3695-
<div id="expert-editor-dropzone" class="expert-editor-dropzone"></div>
3696-
</div>
3697-
</div>
3698-
</div>
3699-
<div class="expert-output-toolbar">
3700-
<button id="reset-expert-preview" class="preview-reset-button" type="button" data-i18n="button.resetPreview">Reset preview</button>
3701-
</div>
37023688
<div class="expert-output-grid">
3689+
<div class="expert-output-column expert-detail-column">
3690+
<aside id="expert-selected-card-details" class="expert-selected-card-details" aria-live="polite"></aside>
3691+
</div>
37033692
<div class="expert-output-column">
3693+
<div class="expert-grid-top-controls">
3694+
<div class="expert-grid-axis-control expert-grid-columns-control">
3695+
<label for="expert-grid-columns" data-i18n="label.gridColumns">X</label>
3696+
<input id="expert-grid-columns" type="range" min="0" max="5" value="0">
3697+
<output id="expert-grid-columns-output" for="expert-grid-columns">0</output>
3698+
</div>
3699+
<div class="expert-grid-axis-control expert-grid-rows-control">
3700+
<label for="expert-grid-rows" data-i18n="label.gridRows">Y</label>
3701+
<input id="expert-grid-rows" type="range" min="0" max="5" value="0">
3702+
<output id="expert-grid-rows-output" for="expert-grid-rows">0</output>
3703+
</div>
3704+
<div class="expert-grid-axis-control expert-grid-zoom-control">
3705+
<label for="expert-grid-zoom" data-i18n="label.gridZoom">Zoom</label>
3706+
<input id="expert-grid-zoom" type="range" min="75" max="150" step="5" value="100">
3707+
<output id="expert-grid-zoom-output" for="expert-grid-zoom">100%</output>
3708+
</div>
3709+
</div>
37043710
<div class="expert-editor-controls">
37053711
<div class="field-pair">
37063712
<label for="expert-card-name" data-i18n="label.expertCardName">Expert card name</label>
@@ -3754,19 +3760,26 @@ <h2 class="entity-section-title" data-i18n="heading.expertEditor">Expert editor
37543760
<button id="edit-expert-field" type="button" data-i18n="button.editSelected">Edit selected</button>
37553761
<button id="arrange-expert-fields" type="button" data-i18n="button.autoArrange">Auto arrange</button>
37563762
<button id="reset-expert-surface-size" type="button" data-i18n="button.resetSize">Reset size</button>
3763+
<button id="reset-expert-preview" class="preview-reset-button" type="button" data-i18n="button.resetPreview">Reset preview</button>
37573764
<button id="clear-expert-fields" type="button" data-i18n="button.clearPreview">Clear preview</button>
37583765
</div>
37593766
</div>
3760-
<div class="expert-output-column expert-detail-column">
3761-
<aside id="expert-selected-card-details" class="expert-selected-card-details" aria-live="polite"></aside>
3762-
<output id="expert-editor-summary" aria-live="polite"></output>
3763-
<div id="expert-field-list" class="expert-field-list" aria-live="polite"></div>
3764-
</div>
37653767
<div class="expert-output-column ha-card-preview">
37663768
<label for="expert-editor-preview" data-i18n="label.expertHaCardCode">Expert HA card code</label>
37673769
<pre id="expert-editor-preview" aria-live="polite"></pre>
37683770
</div>
37693771
</div>
3772+
<div class="expert-grid-frame">
3773+
<div class="expert-grid-body">
3774+
<div class="expert-editor-canvas-row">
3775+
<div id="expert-editor-dropzone" class="expert-editor-dropzone"></div>
3776+
</div>
3777+
</div>
3778+
</div>
3779+
<div class="expert-editor-status">
3780+
<output id="expert-editor-summary" aria-live="polite"></output>
3781+
<div id="expert-field-list" class="expert-field-list" aria-live="polite"></div>
3782+
</div>
37703783
</section>
37713784
</div>
37723785
</div>

‎packages/homeassistant/src/HomeAssistantCardEditorAppRelease.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ export function createHomeAssistantCardEditorAppReleaseReadiness(): HomeAssistan
126126
kind: "atlas.homeassistant.card-editor.app-release-readiness",
127127
appId: "atlas.homeassistant.card-editor",
128128
name: "ATLAS Home Assistant Card Editor",
129-
version: "0.2.0-alpha.81",
129+
version: "0.2.0-alpha.82",
130130
releaseChannel: "local-preview",
131131
summary,
132132
entrypoints: [

‎packages/homeassistant/src/HomeAssistantCardEditorPlugin.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export function createHomeAssistantCardEditorPlugin(): RuntimePlugin {
6666
de: "ATLAS Home Assistant Karten-Editor",
6767
en: "ATLAS Home Assistant Card Editor",
6868
},
69-
version: "0.2.0-alpha.81",
69+
version: "0.2.0-alpha.82",
7070
description: "Reference plugin for Expert Home Assistant card editing, entity selection and HACS-oriented exports.",
7171
descriptionI18n: {
7272
de: "Referenz-Plugin für Expert-Home-Assistant-Kartenbearbeitung, Entitätsauswahl und HACS-orientierte Exporte.",

‎packages/homeassistant/tests/homeassistant-card-editor-plugin.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ describe("Home Assistant card editor plugin", () => {
2424
expect(plugin.manifest).toMatchObject({
2525
id: HomeAssistantCardEditorPluginId,
2626
name: "ATLAS Home Assistant Card Editor",
27-
version: "0.2.0-alpha.81",
27+
version: "0.2.0-alpha.82",
2828
extensionPoints: [
2929
HomeAssistantCardEditorExtensionPoints.cardEditor,
3030
HomeAssistantCardEditorExtensionPoints.cardTarget,

‎packaging/home-assistant-app/atlas/config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: "ATLAS"
2-
version: "0.1.192"
2+
version: "0.1.193"
33
slug: "atlas"
44
description: "ATLAS Administration and Home Assistant Plugins preview"
55
url: "https://github.com/rockbaer2007/atlas"

0 commit comments

Comments
 (0)