diff options
author | Lauri Ojansivu <x@xet7.org> | 2019-07-01 17:23:41 -0400 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2019-07-01 17:23:41 -0400 |
commit | 34b2168d0dda253dedabbee47031873efa4ae446 (patch) | |
tree | 274092388923e0e26cd483d5eedfc011bdd32d68 /client/components/cards | |
parent | 2c90e7c585c6bcde9bf29c7d5ed54276b1ce082e (diff) | |
download | wekan-34b2168d0dda253dedabbee47031873efa4ae446.tar.gz wekan-34b2168d0dda253dedabbee47031873efa4ae446.tar.bz2 wekan-34b2168d0dda253dedabbee47031873efa4ae446.zip |
Add Wekan v2.95-v2.97 master branch features and fixes to meteor-1.8 branch.
Thanks to xet7 !
Diffstat (limited to 'client/components/cards')
-rw-r--r-- | client/components/cards/cardDetails.styl | 7 | ||||
-rw-r--r-- | client/components/cards/minicard.jade | 5 | ||||
-rw-r--r-- | client/components/cards/minicard.styl | 9 |
3 files changed, 18 insertions, 3 deletions
diff --git a/client/components/cards/cardDetails.styl b/client/components/cards/cardDetails.styl index c1d6b7e1..bafaa94b 100644 --- a/client/components/cards/cardDetails.styl +++ b/client/components/cards/cardDetails.styl @@ -86,6 +86,11 @@ display: flex flex-wrap: wrap margin: 15px 0 + & ~ .js-open-inlined-form + .viewer + background-color #ffffff !important + padding 15px !important + border 1px solid #000000 !important .card-details-item margin-right: 0.5em @@ -134,7 +139,7 @@ input[type="submit"].attachment-add-link-submit .card-details-canvas width: 100% padding-left: 0px; - + .card-details-header .close-card-details margin-right: 0px diff --git a/client/components/cards/minicard.jade b/client/components/cards/minicard.jade index 442d3c6c..bc362982 100644 --- a/client/components/cards/minicard.jade +++ b/client/components/cards/minicard.jade @@ -74,7 +74,10 @@ template(name="minicard") if comments.count .badge(title="{{_ 'card-comments-title' comments.count }}") span.badge-icon.fa.fa-comment-o.badge-comment - span.badge-text= comments.count + = ' ' + = comments.count + //span.badge-comment.badge-text + //| {{_ 'comment'}} if getDescription .badge.badge-state-image-only(title=getDescription) span.badge-icon.fa.fa-align-left diff --git a/client/components/cards/minicard.styl b/client/components/cards/minicard.styl index e3d1ff20..1a1516e5 100644 --- a/client/components/cards/minicard.styl +++ b/client/components/cards/minicard.styl @@ -144,7 +144,14 @@ .badge-text vertical-align: middle &.badge-comment - margin-bottom: 0.1rem + display: block + border-radius: 4px + padding: 1px 3px + margin-bottom: 0.3rem + color: #ff0000 + background-color: #ffffff + font-weight: bold + font-size: 11pt .badge-text font-size: 0.9em |