From 34b2168d0dda253dedabbee47031873efa4ae446 Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Mon, 1 Jul 2019 17:23:41 -0400
Subject: Add Wekan v2.95-v2.97 master branch features and fixes to meteor-1.8
 branch.

Thanks to xet7 !
---
 models/boards.js        | 8 +++++++-
 models/trelloCreator.js | 6 +++---
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'models')

diff --git a/models/boards.js b/models/boards.js
index 5c0b58e7..3750473e 100644
--- a/models/boards.js
+++ b/models/boards.js
@@ -238,7 +238,12 @@ Boards.attachSchema(
         'pomegranate',
         'pumpkin',
         'wisteria',
+        'moderatepink',
+        'strongcyan',
+        'limegreen',
         'midnight',
+        'dark',
+        'relax',
       ],
       // eslint-disable-next-line consistent-return
       autoValue() {
@@ -1223,7 +1228,8 @@ if (Meteor.isServer) {
    * @description This allows to create a board.
    *
    * The color has to be chosen between `belize`, `nephritis`, `pomegranate`,
-   * `pumpkin`, `wisteria`, `midnight`:
+   * `pumpkin`, `wisteria`, `moderatepink`, `strongcyan`,
+   * `limegreen`, `midnight`, `dark`, `relax`:
    *
    * <img src="https://wekan.github.io/board-colors.png" width="40%" alt="Wekan logo" />
    *
diff --git a/models/trelloCreator.js b/models/trelloCreator.js
index 0472fe31..cb1a6a67 100644
--- a/models/trelloCreator.js
+++ b/models/trelloCreator.js
@@ -484,9 +484,9 @@ export class TrelloCreator {
       green: 'nephritis',
       red: 'pomegranate',
       purple: 'wisteria',
-      pink: 'pomegranate',
-      lime: 'nephritis',
-      sky: 'belize',
+      pink: 'moderatepink',
+      lime: 'limegreen',
+      sky: 'strongcyan',
       grey: 'midnight',
     };
     const wekanColor = mapColors[trelloColorCode];
-- 
cgit v1.2.3-1-g7c22