diff options
author | Sam X. Chen <sam.xi.chen@gmail.com> | 2019-08-29 22:08:41 -0400 |
---|---|---|
committer | Sam X. Chen <sam.xi.chen@gmail.com> | 2019-08-29 22:08:41 -0400 |
commit | 58155288fb27e0486f298b00798a550516d4d0ef (patch) | |
tree | 122b069c26cb41c4e607b462669033139282d2a9 /client/components/cards | |
parent | dd0682328bc26bbe852fb19a85131e4017c547b0 (diff) | |
parent | d1ab787215adb83064a5be4678e7073ba71fbb22 (diff) | |
download | wekan-58155288fb27e0486f298b00798a550516d4d0ef.tar.gz wekan-58155288fb27e0486f298b00798a550516d4d0ef.tar.bz2 wekan-58155288fb27e0486f298b00798a550516d4d0ef.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'client/components/cards')
-rw-r--r-- | client/components/cards/cardDetails.styl | 4 | ||||
-rw-r--r-- | client/components/cards/checklists.styl | 3 | ||||
-rw-r--r-- | client/components/cards/labels.styl | 3 | ||||
-rw-r--r-- | client/components/cards/minicard.styl | 12 |
4 files changed, 17 insertions, 5 deletions
diff --git a/client/components/cards/cardDetails.styl b/client/components/cards/cardDetails.styl index 4bba2d4d..cd475072 100644 --- a/client/components/cards/cardDetails.styl +++ b/client/components/cards/cardDetails.styl @@ -99,7 +99,9 @@ &.card-details-item-end, &.card-details-item-customfield, &.card-details-item-name - max-width: 50% + display: block + word-wrap: break-word + max-width: 48% flex-grow: 1 .card-details-item-title diff --git a/client/components/cards/checklists.styl b/client/components/cards/checklists.styl index d48c1851..8ac37a15 100644 --- a/client/components/cards/checklists.styl +++ b/client/components/cards/checklists.styl @@ -128,6 +128,9 @@ textarea.js-add-checklist-item, textarea.js-edit-checklist-item & .viewer p margin-bottom: 2px + display: block + word-wrap: break-word + max-width: 420px .js-delete-checklist-item margin: 0 0 0.5em 1.33em diff --git a/client/components/cards/labels.styl b/client/components/cards/labels.styl index 3b481d93..9d7c7553 100644 --- a/client/components/cards/labels.styl +++ b/client/components/cards/labels.styl @@ -10,9 +10,10 @@ margin-right: 4px margin-bottom: 5px padding: 3px 8px - max-width: 100% + max-width: 210px min-width: 8px overflow: ellipsis + word-wrap: break-word height: 18px vertical-align: bottom diff --git a/client/components/cards/minicard.styl b/client/components/cards/minicard.styl index 242367b4..c4172572 100644 --- a/client/components/cards/minicard.styl +++ b/client/components/cards/minicard.styl @@ -81,6 +81,7 @@ .minicard-labels float: right display: flex + flex-wrap: wrap .minicard-label width: 11px @@ -92,8 +93,11 @@ .minicard-custom-field display:flex; .minicard-custom-field-item - max-width:50%; - flex-grow:1; + flex-grow: 1 + display: block + word-wrap: break-word + max-width: 100px + margin-right: 4px .handle width: 20px; height: 20px; @@ -111,7 +115,9 @@ p:last-child margin-bottom: 0 .viewer - display: inline-block + display: block + word-wrap: break-word + max-width: 230px .dates display: flex; flex-direction: row; |