Fixed multiple orders for the same household bug, fixed overlay-page …

…scrolling
darksoil-studio · Sep 3, 2024 · 926fd18 · 926fd18
1 parent 90848a3
commit 926fd18
Show file tree

Hide file tree

Showing 9 changed files with 149 additions and 149 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tests/package.json b/tests/package.json
@@ -6,7 +6,7 @@
   },
   "dependencies": {
     "@darksoil-studio/notifications": "github:darksoil-studio/notifications#d23ad31d94ad18a7bd140272102c78fca96365cc&path:ui",
-    "@darksoil-studio/roles": "github:darksoil-studio/roles#0447285387f203bb769631f6aeebdb4d6dc632f6&path:ui",
+    "@darksoil-studio/roles": "github:darksoil-studio/roles#b6eb55cff89657597d4e456c1e4e3f91f75a5cfb&path:ui",
     "@holochain-open-dev/profiles": "github:holochain-open-dev/profiles#6000dc6c04194429f2768517670366c411c4a03a&path:ui",
     "@holochain-open-dev/signals": "^0.300.7",
     "@holochain-open-dev/utils": "^0.300.2",

diff --git a/ui/package.json b/ui/package.json
@@ -13,8 +13,8 @@
   },
   "dependencies": {
     "@darksoil-studio/notifications": "github:darksoil-studio/notifications#d23ad31d94ad18a7bd140272102c78fca96365cc&path:ui",
-    "@darksoil-studio/roles": "github:darksoil-studio/roles#0447285387f203bb769631f6aeebdb4d6dc632f6&path:ui",
-    "@darksoil-studio/tasks": "github:darksoil-studio/tasks#f059d7ba4852d6087704341fea6bcd653a19357a&path:ui",
+    "@darksoil-studio/roles": "github:darksoil-studio/roles#b6eb55cff89657597d4e456c1e4e3f91f75a5cfb&path:ui",
+    "@darksoil-studio/tasks": "github:darksoil-studio/tasks#dbf6bde9a904e56e72d6e3307b075c340899e2b4&path:ui",
     "@holochain-open-dev/elements": "^0.300.1",
     "@holochain-open-dev/file-storage": "github:holochain-open-dev/file-storage#c503070441d29a1c448abf1b0949762fe4ef314d&path:ui",
     "@holochain-open-dev/profiles": "github:holochain-open-dev/profiles#6000dc6c04194429f2768517670366c411c4a03a&path:ui",

diff --git a/ui/src/overlay-page.ts b/ui/src/overlay-page.ts
@@ -40,11 +40,17 @@ export class OverlayPage extends SignalWatcher(LitElement) {
           ></sl-icon-button>
           <span>${this.title}</span>
         </div>
-        <div
-          class="column"
-          style="flex: 1; margin-top: 12px; align-items: center"
-        >
-          <slot></slot>
+        <div class="flex-scrollable-parent" style="flex:1">
+          <div class="flex-scrollable-container" style="flex:1">
+            <div class="flex-scrollable-y" style="height: 100%;">
+              <div
+                class="column"
+                style="min-height: 100%; margin: 16px; align-items: center"
+              >
+                <slot></slot>
+              </div>
+            </div>
+          </div>
         </div>
       </div>
     `;

diff --git a/ui/src/plenty/orders/elements/create-producer-delivery.ts b/ui/src/plenty/orders/elements/create-producer-delivery.ts
@@ -97,7 +97,7 @@ export class CreateProducerDelivery extends SignalWatcher(LitElement) {
       callback(items, items.length);
     };
     return html`
-      <div class="column" style="width: 1200px; padding: 16px">
+      <div class="column" style="width: 1200px;">
         <sl-card style="flex: 1">
           <div class="column" style="flex: 1; margin: -20px">
             <vaadin-grid