Merge branch 'master' into fix-smart-macro-download

UltimateHackingKeyboard · May 29, 2024 · 113625a · 113625a
2 parents 2ee12e8 + f597016
commit 113625a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/packages/uhk-web/src/app/components/macro/action-editor/macro-action-editor.component.html b/packages/uhk-web/src/app/components/macro/action-editor/macro-action-editor.component.html
@@ -50,7 +50,7 @@
             ></macro-command-tab>
         </div>
     </div>
-    <div class="row">
+    <div class="row editor__actions-row">
         <div class="col-12 editor__actions-container">
             <div class="d-flex justify-content-end editor__actions">
                 <button class="btn btn-sm btn-default me-2" type="button" (click)="onCancelClick()"> Cancel </button>

diff --git a/packages/uhk-web/src/app/components/macro/action-editor/macro-action-editor.component.scss b/packages/uhk-web/src/app/components/macro/action-editor/macro-action-editor.component.scss
@@ -87,7 +87,10 @@
     }
 
     &__actions {
-        float: right;
+        &-row {
+            margin-left: -0.5rem;
+            margin-right: -1.25rem;
+        }
 
         &-container {
             background: var(--color-macro-bg);

diff --git a/packages/uhk-web/src/app/components/macro/list/macro-list.component.ts b/packages/uhk-web/src/app/components/macro/list/macro-list.component.ts
@@ -51,7 +51,7 @@ const CANCEL_ACTION_ANIMATION_TIMEOUT = ANIMATION_TIME + 25;
         trigger('togglerNew', [
             transition(':enter', [
                 style({ height: 0, overflow: 'hidden', offset: 0 }),
-                animate(`${ANIMATION_TIME}ms ease-out`, style({ height: '*', overflow: 'unset', offset: 1 })
+                animate(`${ANIMATION_TIME}ms ease-out`, style({ height: '*', offset: 1 })
                 )
             ]),
             transition(':leave', [