Merge branch 'rjevnikar-labelText' into devel

This commit is contained in:
Lauri Ojansivu 2018-06-12 21:48:46 +03:00
commit 92a85a991b
2 changed files with 14 additions and 2 deletions

View file

@ -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:

View file

@ -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