Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

module/execution/control.php

@@ -2895,11 +2895,7 @@ class execution extends control
             $this->execution->unlinkStory($executionID, $storyID);
 
             /* if kanban then reload and if ajax request then send result. */
-            if(isonlybody())
-            {
-                return print(js::reload('parent'));
-            }
-            elseif(helper::isAjaxRequest())
+            if(helper::isAjaxRequest())
             {
                 if(dao::isError())
                 {
@@ -2913,7 +2909,7 @@ class execution extends control
                 }
                 return $this->send($response);
             }
-            return print(js::locate($this->app->session->storyList, 'parent'));
+            return print(js::reload('parent'));
         }
     }
 

module/kanban/css/view.css

@@ -82,6 +82,7 @@
 .kanban-item .has-color .info > .user .lable-teamSumCount,
 .kanban-item .has-color .info > .label-light {color: #FFFFFF;}
 .kanban-item .has-color .info > .label-pri {border-color: #FFFFFF;}
+.kanban-item .has-color .progress-box > .progress-number {color: #FFFFFF;}
 .kanban-item .item-more {position: absolute; right: 6px; top: 0px;}
 
 .kanban-card {height: auto !important; padding: 8px 14px !important; min-height: 60px;}