From 882286c0e3216f6063758bb8f6ef6ea23a8629d4 Mon Sep 17 00:00:00 2001 From: Aaron Fenyes Date: Wed, 13 Nov 2024 16:36:03 -0800 Subject: [PATCH 1/2] Write out "constraint" in HTML element classes --- app-proto/main.css | 16 ++++++++-------- app-proto/src/outline.rs | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app-proto/main.css b/app-proto/main.css index 204c8c8..a78efd9 100644 --- a/app-proto/main.css +++ b/app-proto/main.css @@ -61,12 +61,12 @@ summary.selected { background-color: #444; } -summary > div, .cst { +summary > div, .constraint { padding-top: 4px; padding-bottom: 4px; } -.elt, .cst { +.elt, .constraint { display: flex; flex-grow: 1; padding-left: 8px; @@ -91,7 +91,7 @@ details[open]:has(li) .elt-switch::after { flex-grow: 1; } -.cst-label { +.constraint-label { flex-grow: 1; } @@ -107,26 +107,26 @@ details[open]:has(li) .elt-switch::after { width: 56px; } -.cst { +.constraint { font-style: italic; } -.cst.invalid { +.constraint.invalid { color: #f58fc2; } -.cst > input[type=checkbox] { +.constraint > input[type=checkbox] { margin: 0px 8px 0px 0px; } -.cst > input[type=text] { +.constraint > input[type=text] { color: inherit; background-color: inherit; border: 1px solid #555; border-radius: 2px; } -.cst.invalid > input[type=text] { +.constraint.invalid > input[type=text] { border-color: #70495c; } diff --git a/app-proto/src/outline.rs b/app-proto/src/outline.rs index f3951b5..8f2e6d7 100644 --- a/app-proto/src/outline.rs +++ b/app-proto/src/outline.rs @@ -44,12 +44,12 @@ fn ConstraintOutlineItem(constraint_key: ConstraintKey, element_key: ElementKey) }; let other_subject_label = assembly.elements.with(|elts| elts[other_subject].label.clone()); let class = constraint.lorentz_prod_valid.map( - |&lorentz_prod_valid| if lorentz_prod_valid { "cst" } else { "cst invalid" } + |&lorentz_prod_valid| if lorentz_prod_valid { "constraint" } else { "constraint invalid" } ); view! { li(class=class.get()) { input(r#type="checkbox", bind:checked=constraint.active) - div(class="cst-label") { (other_subject_label) } + div(class="constraint-label") { (other_subject_label) } LorentzProductInput(constraint=constraint) div(class="status") } From 3f3c1739cb42dde22c4b20f9198e73d793e3d2a3 Mon Sep 17 00:00:00 2001 From: Aaron Fenyes Date: Wed, 13 Nov 2024 16:40:39 -0800 Subject: [PATCH 2/2] Write out "element" in HTML element classes Write out "representation" too. --- app-proto/main.css | 14 +++++++------- app-proto/src/outline.rs | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app-proto/main.css b/app-proto/main.css index a78efd9..26cdac0 100644 --- a/app-proto/main.css +++ b/app-proto/main.css @@ -66,28 +66,28 @@ summary > div, .constraint { padding-bottom: 4px; } -.elt, .constraint { +.element, .constraint { display: flex; flex-grow: 1; padding-left: 8px; padding-right: 8px; } -.elt-switch { +.element-switch { width: 18px; padding-left: 2px; text-align: center; } -details:has(li) .elt-switch::after { +details:has(li) .element-switch::after { content: '▸'; } -details[open]:has(li) .elt-switch::after { +details[open]:has(li) .element-switch::after { content: '▾'; } -.elt-label { +.element-label { flex-grow: 1; } @@ -95,11 +95,11 @@ details[open]:has(li) .elt-switch::after { flex-grow: 1; } -.elt-rep { +.element-representation { display: flex; } -.elt-rep > div { +.element-representation > div { padding: 2px 0px 0px 0px; font-size: 10pt; font-variant-numeric: tabular-nums; diff --git a/app-proto/src/outline.rs b/app-proto/src/outline.rs index 8f2e6d7..ee1603f 100644 --- a/app-proto/src/outline.rs +++ b/app-proto/src/outline.rs @@ -115,11 +115,11 @@ fn ElementOutlineItem(key: ElementKey, element: assembly::Element) -> View { } ) { div( - class="elt-switch", + class="element-switch", on:click=|event: MouseEvent| event.stop_propagation() ) div( - class="elt", + class="element", on:click={ move |event: MouseEvent| { if event.shift_key() { @@ -139,8 +139,8 @@ fn ElementOutlineItem(key: ElementKey, element: assembly::Element) -> View { } } ) { - div(class="elt-label") { (label) } - div(class="elt-rep") { + div(class="element-label") { (label) } + div(class="element-representation") { Indexed( list=rep_components, view=|coord_str| view! {