2
0
Эх сурвалжийг харах

Merge pull request #4330 from mfilser/list_not_moveable_when_lists_require_scrolling

Lists now moveable when swimlane requires scrolling
Lauri Ojansivu 3 жил өмнө
parent
commit
1d13040305

+ 2 - 1
client/components/lists/list.styl

@@ -4,7 +4,6 @@
   box-sizing: border-box
   box-sizing: border-box
   display: flex
   display: flex
   flex-direction: column
   flex-direction: column
-  flex: 0 0 270px
   position: relative
   position: relative
   // Even if this background color is the same as the body we can't leave it
   // Even if this background color is the same as the body we can't leave it
   // transparent, because that won't work during a list drag.
   // transparent, because that won't work during a list drag.
@@ -12,6 +11,8 @@
   border-left: 1px solid darken(white, 20%)
   border-left: 1px solid darken(white, 20%)
   padding: 0
   padding: 0
   float: left
   float: left
+  min-width: 270px
+  max-width: 270px
 
 
   &:first-child
   &:first-child
     margin-left: 5px
     margin-left: 5px

+ 2 - 0
client/components/swimlanes/swimlanes.js

@@ -54,6 +54,7 @@ function initSortable(boardComponent, $listsDom) {
   };
   };
 
 
   $listsDom.sortable({
   $listsDom.sortable({
+    connectWith: '.board-canvas',
     tolerance: 'pointer',
     tolerance: 'pointer',
     helper: 'clone',
     helper: 'clone',
     items: '.js-list:not(.js-list-composer)',
     items: '.js-list:not(.js-list-composer)',
@@ -61,6 +62,7 @@ function initSortable(boardComponent, $listsDom) {
     distance: 7,
     distance: 7,
     start(evt, ui) {
     start(evt, ui) {
       ui.placeholder.height(ui.helper.height());
       ui.placeholder.height(ui.helper.height());
+      ui.placeholder.width(ui.helper.width());
       EscapeActions.executeUpTo('popup-close');
       EscapeActions.executeUpTo('popup-close');
       boardComponent.setIsDragging(true);
       boardComponent.setIsDragging(true);
     },
     },

+ 5 - 0
client/components/swimlanes/swimlanes.styl

@@ -36,6 +36,11 @@
 // Minimize swimlanes end https://www.w3schools.com/howto/howto_js_accordion.asp
 // Minimize swimlanes end https://www.w3schools.com/howto/howto_js_accordion.asp
 */
 */
 
 
+@media screen and (min-width: 801px)
+  .swimlane.ui-sortable
+    // swimlane must have max width, otherwise lists are not sortable if there are too much lists and the swimlane "scrollable"
+    width: max-content
+
 [class=swimlane]
 [class=swimlane]
   position: sticky
   position: sticky
   left: 0
   left: 0