diff options
| author | Lauri Ojansivu <x@xet7.org> | 2020-05-17 00:52:21 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2020-05-17 00:52:21 +0300 |
| commit | 213b7b4819a612b5ceb664e448abe14ff0560664 (patch) | |
| tree | 26e436e73087a59ffb4db544324196058aa72e87 | |
| parent | 62f06a792f57383d6c996967116b0e9fe77b0894 (diff) | |
| parent | 7a576f9ae45149d25200450dcf085960f39b8099 (diff) | |
| download | wekan-213b7b4819a612b5ceb664e448abe14ff0560664.tar.gz wekan-213b7b4819a612b5ceb664e448abe14ff0560664.tar.bz2 wekan-213b7b4819a612b5ceb664e448abe14ff0560664.zip | |
Merge branch 'helioguardabaxo-master'
| -rw-r--r-- | client/components/boards/boardColors.styl | 19 | ||||
| -rw-r--r-- | models/boards.js | 3 | ||||
| -rw-r--r-- | server/migrations.js | 3 |
3 files changed, 23 insertions, 2 deletions
diff --git a/client/components/boards/boardColors.styl b/client/components/boards/boardColors.styl index dddf988b..6b3994ff 100644 --- a/client/components/boards/boardColors.styl +++ b/client/components/boards/boardColors.styl @@ -526,3 +526,22 @@ setBoardClear(color1,color2) .board-color-clearblue setBoardClear(rgb(73, 155, 234),rgb(0, 174, 204)) + +/* + Alternate "Natural" Styling +*/ +.board-color-natural + setBoardColor(#596557) + + &#header-quick-access + background-color: #2d392b + + .ui-sortable + background-color:#dedede + + .list-header + background-color: #c9cfc3 + border-bottom: 6px solid #c9cfc3 + + .swimlane .swimlane-header-wrap + background-color: #c2c0ab diff --git a/models/boards.js b/models/boards.js index 8e247504..edfc7240 100644 --- a/models/boards.js +++ b/models/boards.js @@ -255,7 +255,8 @@ Boards.attachSchema( 'dark', 'relax', 'corteza', - 'clearblue' + 'clearblue', + 'natural', ], // eslint-disable-next-line consistent-return autoValue() { diff --git a/server/migrations.js b/server/migrations.js index 6eed0606..ccf875df 100644 --- a/server/migrations.js +++ b/server/migrations.js @@ -119,7 +119,8 @@ Migrations.add('use-css-class-for-boards-colors', () => { '#2C3E51': 'dark', '#27AE61': 'relax', '#568BA2': 'corteza', - '#499BEA': 'clearblue' + '#499BEA': 'clearblue', + '#596557': 'natural', }; Boards.find().forEach(board => { const oldBoardColor = board.background.color; |