diff options
| author | Lauri Ojansivu <x@xet7.org> | 2018-06-12 21:48:46 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2018-06-12 21:48:46 +0300 |
| commit | 92a85a991b201efe6542754bd85ca70d2099f471 (patch) | |
| tree | d1c96782fff72cf8b24d5d9e10301776c1fa313f | |
| parent | f28889de592f92a115c5cc5f152d6ec87c3a3467 (diff) | |
| parent | 38af71d9c933744ba1c5bf97179d3a033f321907 (diff) | |
| download | wekan-92a85a991b201efe6542754bd85ca70d2099f471.tar.gz wekan-92a85a991b201efe6542754bd85ca70d2099f471.tar.bz2 wekan-92a85a991b201efe6542754bd85ca70d2099f471.zip | |
Merge branch 'rjevnikar-labelText' into devel
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | client/components/cards/labels.styl | 12 |
2 files changed, 14 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index cfe3e672..2249e9a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,9 @@ This release adds the following new features: * [Add Khmer language](https://github.com/wekan/wekan/commit/2156e458690d0dc34a761a48fd7fa3b54af79031); * [Modify card covers/mini-cards so that: 1) received date is shown unless there is a start date - 2) due date is shown, unless there is an end date](https://github.com/wekan/wekan/pull/1685). + 2) due date is shown, unless there is an end date](https://github.com/wekan/wekan/pull/1685); +* [Change label text colour to black for specific label colours for better + visibility](https://github.com/wekan/wekan/pull/1689). and fixes the following bugs: diff --git a/client/components/cards/labels.styl b/client/components/cards/labels.styl index 084af64c..3b481d93 100644 --- a/client/components/cards/labels.styl +++ b/client/components/cards/labels.styl @@ -3,7 +3,7 @@ // XXX Use .board-widget-labels as a flexbox container .card-label border-radius: 4px - color: white + color: white //Default white text, in select cases, changed to black to improve contrast between label colour and text display: inline-block font-weight: 700 font-size: 13px @@ -48,9 +48,11 @@ .card-label-yellow background-color: #fad900 + color: #000000 //Black text for better visibility .card-label-orange background-color: #ff9f19 + color: #000000 //Black text for better visibility .card-label-red background-color: #eb4646 @@ -63,6 +65,7 @@ .card-label-pink background-color: #ff78cb + color: #000000 //Black text for better visibility .card-label-sky background-color: #00c2e0 @@ -72,18 +75,22 @@ .card-label-lime background-color: #51e898 + color: #000000 //Black text for better visibility .card-label-silver background-color: #c0c0c0 + color: #000000 //Black text for better visibility .card-label-peachpuff background-color: #ffdab9 + color: #000000 //Black text for better visibility .card-label-crimson background-color: #dc143c .card-label-plum background-color: #dda0dd + color: #000000 //Black text for better visibility .card-label-darkgreen background-color: #006400 @@ -96,6 +103,7 @@ .card-label-gold background-color: #ffd700 + color: #000000 //Black text for better visibility .card-label-navy background-color: #000080 @@ -108,9 +116,11 @@ .card-label-paleturquoise background-color: #afeeee + color: #000000 //Black text for better visibility .card-label-mistyrose background-color: #ffe4e1 + color: #000000 //Black text for better visibility .card-label-indigo background-color: #4b0082 |