6 files changed, 81 insertions, 12 deletions

diff --git a/client/src/app/+my-account/my-account.component.scss b/client/src/app/+my-account/my-account.component.scss
index d452a2b21..fd47aec86 100644
--- a/client/src/app/+my-account/my-account.component.scss
+++ b/client/src/app/+my-account/my-account.component.scss
@@ -1,5 +1,3 @@
-
-
 .row {
   flex-direction: column;
   width: 100%;
diff --git a/client/src/app/shared/buttons/action-dropdown.component.html b/client/src/app/shared/buttons/action-dropdown.component.html
index 14cfe9a22..0efc01d38 100644
--- a/client/src/app/shared/buttons/action-dropdown.component.html
+++ b/client/src/app/shared/buttons/action-dropdown.component.html
@@ -1,4 +1,4 @@
-<div class="dropdown-root" ngbDropdown [placement]="placement" *ngIf="areActionsDisplayed(actions, entry)">
+<div class="dropdown-root" ngbDropdown [placement]="placement" container="body" *ngIf="areActionsDisplayed(actions, entry)">
   <div
     class="action-button" [ngClass]="{ small: buttonSize === 'small', grey: theme === 'grey', orange: theme === 'orange', 'button-styled': buttonStyled }"
     ngbDropdownToggle role="button"
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index ab0bf0a08..f54fecda8 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -267,7 +267,7 @@ table {
   top: #{-($header-height + 20px)};
 }
 
-@media screen and (max-width: #{map-get($grid-breakpoints, xxl)}) {
+@media screen and (max-width: #{breakpoint(xxl)}) {
   .main-col {
     &.expanded {
       .margin-content {
@@ -278,7 +278,7 @@ table {
   }
 }
 
-@media screen and (max-width: #{map-get($grid-breakpoints, lg)}) {
+@media screen and (max-width: #{breakpoint(lg)}) {
   /* the following applies from 500px to 900px and is partially overriden from 500px to 800px by changes below to $small-view */
   .main-col {
     &, &.expanded {
@@ -343,6 +343,40 @@ table {
   }
 }
 
+// overflow-databale responsive rules
+@media screen and (max-width: #{breakpoint(xxl)}) {
+  .main-col {
+    &.expanded {
+      @include overflow-datatable(breakpoint(lg), $expanded-horizontal-margins/2);
+    }
+
+    &:not(.expanded) {
+      @include overflow-datatable(breakpoint(lg), $not-expanded-horizontal-margins + $menu-width/2);
+    }
+  }
+}
+
+@media screen and (max-width: #{breakpoint(lg)}) {
+  .main-col {
+    &.expanded {
+      @include overflow-datatable(breakpoint(lg), $expanded-horizontal-margins/3);
+    }
+
+    &:not(.expanded) {
+      @include overflow-datatable(breakpoint(lg), $not-expanded-horizontal-margins + $menu-width/2);
+    }
+  }
+}
+
+@media screen and (max-width: $small-view) {
+  .main-col {
+    &:not(.expanded),
+    &.expanded {
+      @include overflow-datatable(breakpoint(lg), 15px);
+    }
+  }
+}
+
 @media screen and (min-width: $small-view) and (max-width: #{$small-view + $menu-width}) {
   .main-col {
     &:not(.expanded) {
diff --git a/client/src/sass/bootstrap.scss b/client/src/sass/bootstrap.scss
index eee3db8fc..377c85070 100644
--- a/client/src/sass/bootstrap.scss
+++ b/client/src/sass/bootstrap.scss
@@ -66,7 +66,7 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
 }
 
 
-@media screen and (min-width: #{map-get($grid-breakpoints, md)}) {
+@media screen and (min-width: #{breakpoint(md)}) {
   .modal:before {
     vertical-align: middle;
     content: " ";
diff --git a/client/src/sass/include/_bootstrap-variables.scss b/client/src/sass/include/_bootstrap-variables.scss
index d536eac86..6aa5c2474 100644
--- a/client/src/sass/include/_bootstrap-variables.scss
+++ b/client/src/sass/include/_bootstrap-variables.scss
@@ -17,6 +17,10 @@ $grid-breakpoints: (
   xxl: 1600px
 );
 
+@function breakpoint($label) {
+  @return map-get($grid-breakpoints, $label);
+}
+
 $container-max-widths: (
   sm: 420px,
   md: 720px,
diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss
index 8444f9357..b8e685aba 100644
--- a/client/src/sass/primeng-custom.scss
+++ b/client/src/sass/primeng-custom.scss
@@ -80,7 +80,7 @@ p-table {
           my-edit-button,
           my-delete-button,
           my-button {
-            display: block !important;
+            display: inline-block !important;
           }
         }
       }
@@ -160,14 +160,20 @@ p-table {
     my-delete-button,
     my-button {
       display: none !important;
+      margin-left: 5px;
 
       &.show {
-        display: block !important;
+        display: inline-block !important;
       }
-    }
 
-    my-edit-button + my-delete-button {
-      margin-left: 5px;
+      // keep displaying on touchscreen
+      @media not all and (hover: hover) and (pointer: fine) {
+        display: inline-block !important;
+      }
+
+      :first-child {
+        margin-left: 0
+      }
     }
   }
 
@@ -241,7 +247,7 @@ p-table {
           &.focus-within,
           &:focus {
             box-shadow: #{$focus-box-shadow-form} var(--mainColorLightest) !important;
-          } 
+          }
         }
 
         a {
@@ -266,6 +272,33 @@ p-table {
   }
 }
 
+// overflow data table
+@mixin overflow-datatable ($table-min-width, $horizontal-margins) {
+  p-table {
+    .ui-table-wrapper {
+      overflow-x: auto;
+      max-width: calc(100vw - #{$horizontal-margins * 2});
+
+      table {
+        min-width: $table-min-width;
+      }
+    }
+
+    p-paginator .ui-paginator-bottom {
+      display: block;
+
+      .ui-paginator-current {
+        position: relative;
+        display: block;
+      }
+
+      a, .ui-paginator-pages {
+        vertical-align: middle;
+      }
+    }
+  }
+}
+
 // multiselect customizations
 p-multiselect {
   .ui-multiselect {