浏览代码

Fix Login Page Error, Lists can't move anymore, reverted incomplete Change Lists Width.

Thanks to johnnytolengo, gda140 and xet7 !

Fixes #4592,
related #4558
Lauri Ojansivu 2 年之前
父节点
当前提交
d37adbb046
共有 5 个文件被更改,包括 280 次插入259 次删除
  1. 1 1
      .meteor/packages
  2. 8 4
      client/components/lists/list.css
  3. 9 2
      client/components/swimlanes/swimlanes.js
  4. 259 249
      package-lock.json
  5. 3 3
      package.json

+ 1 - 1
.meteor/packages

@@ -80,7 +80,7 @@ konecty:mongo-counter
 percolate:synced-cron
 cfs:filesystem
 ostrio:cookies
-ostrio:files@2.0.1!
+ostrio:files@2.0.1
 rajit:bootstrap3-datepicker-fi
 rajit:bootstrap3-datepicker-ar
 rajit:bootstrap3-datepicker-bg

+ 8 - 4
client/components/lists/list.css

@@ -6,10 +6,14 @@
   background: #dedede;
   border-left: 1px solid #ccc;
   padding: 0;
-  float: left;
-  width: 270px;   /* Orinal width: 270px. Changes not saved yet: */
-  resize: both;   /* - List width and height resizeable */
-  overflow: auto; /* - List width and height resizeable */
+  float: left;  
+  min-width: 270px;
+  max-width: 270px;
+  /* Reverted incomplete change list width: */
+  /* https://github.com/wekan/wekan/issues/4558 */
+  /* Orinal width: 270px. Changes not saved yet: */
+  /*resize: both;  - List width and height resizeable */
+  /* overflow: auto; - List width and height resizeable */
 }
 .list:first-child {
   margin-left: 5px;

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

@@ -77,11 +77,18 @@ function initSortable(boardComponent, $listsDom) {
       const listDomElement = ui.item.get(0);
       const list = Blaze.getData(listDomElement);
 
+/*
+      Reverted incomplete change list width,
+      removed from below Lists.update:
+       https://github.com/wekan/wekan/issues/4558
+          $set: {
+            width: list._id.width(),
+            height: list._id.height(),
+*/
+
       Lists.update(list._id, {
         $set: {
           sort: sortIndex.base,
-          width: list._id.width(),
-          height: list._id.height(),
         },
       });
 

文件差异内容过多而无法显示
+ 259 - 249
package-lock.json


+ 3 - 3
package.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v6.30.0",
+  "version": "v6.28.0",
   "description": "Open-Source kanban",
   "private": true,
   "repository": {
@@ -24,7 +24,7 @@
     "@babel/core": "^7.15.5",
     "@babel/runtime": "^7.15.4",
     "@mapbox/node-pre-gyp": "^1.0.8",
-    "@wekanteam/markdown-it-mermaid": "^0.5.5",
+    "@wekanteam/markdown-it-mermaid": "^0.5.4",
     "ajv": "^6.12.6",
     "babel-runtime": "^6.26.0",
     "bcryptjs": "^2.4.3",
@@ -39,7 +39,7 @@
     "i18next": "^21.6.16",
     "i18next-sprintf-postprocessor": "^0.2.2",
     "jQuery": "^1.7.4",
-    "jquery-ui": "^1.13.2",
+    "jquery-ui": "^1.13.0",
     "jquery-ui-touch-punch": "^0.2.3",
     "jszip": "^3.7.1",
     "ldapjs": "^2.3.1",

部分文件因为文件数量过多而无法显示