From e68ccf853266fb9c4039d25891ef41b0eebe73fc Mon Sep 17 00:00:00 2001 From: Martin Filser Date: Sun, 13 Jun 2021 10:31:36 +0200 Subject: [PATCH 1/5] Card Details, maximize and minimize of icon works - Card isn't maximized yet --- client/components/cards/cardDetails.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js index 10d5a9511..ecc72f7c4 100644 --- a/client/components/cards/cardDetails.js +++ b/client/components/cards/cardDetails.js @@ -412,11 +412,11 @@ BlazeComponent.extendComponent({ 'click #toggleButton'() { Meteor.call('toggleSystemMessages'); }, - 'click #js-maximize-card-details'() { + 'click .js-maximize-card-details'() { Meteor.call('toggleCardMaximized'); autosize($('.card-details')); }, - 'click #js-minimize-card-details'() { + 'click .js-minimize-card-details'() { Meteor.call('toggleCardMaximized'); autosize($('.card-details')); }, From 7238a65a6f36e808edbe8b76f35cc7d8dca3f5db Mon Sep 17 00:00:00 2001 From: Martin Filser Date: Sun, 13 Jun 2021 10:59:14 +0200 Subject: [PATCH 2/5] Card Details, more space at maximize icon --- client/components/cards/cardDetails.styl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/components/cards/cardDetails.styl b/client/components/cards/cardDetails.styl index 9a57a25bd..052a7fafb 100644 --- a/client/components/cards/cardDetails.styl +++ b/client/components/cards/cardDetails.styl @@ -169,7 +169,7 @@ if isMiniScreen .maximize-card-details, .minimize-card-details font-size: 24px - padding: 5px + padding: 5px 10px 5px 10px margin-right: -8px .close-card-details-mobile-web From 92122e1fdd9a8ba66efcf58f52fc0490695cbe68 Mon Sep 17 00:00:00 2001 From: Martin Filser Date: Mon, 14 Jun 2021 10:47:05 +0200 Subject: [PATCH 3/5] Card Details, maximize and minimize of card works now --- client/components/cards/cardDetails.jade | 2 +- client/components/cards/cardDetails.styl | 104 +++++++++++------------ 2 files changed, 51 insertions(+), 55 deletions(-) diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade index 4aabf2eed..e9587a558 100644 --- a/client/components/cards/cardDetails.jade +++ b/client/components/cards/cardDetails.jade @@ -1,5 +1,5 @@ template(name="cardDetails") - section.card-details.js-card-details: .card-details-canvas + section.card-details.js-card-details(class='{{#if cardMaximized}}card-details-maximized{{/if}}'): .card-details-canvas .card-details-header(class='{{#if colorClass}}card-details-{{colorClass}}{{/if}}') +inlinedForm(classNames="js-card-details-title") +editCardTitleForm diff --git a/client/components/cards/cardDetails.styl b/client/components/cards/cardDetails.styl index 052a7fafb..4d2de5047 100644 --- a/client/components/cards/cardDetails.styl +++ b/client/components/cards/cardDetails.styl @@ -86,62 +86,58 @@ avatar-radius = 50% // Other card details -unless isMiniScreen - if cardMaximized - .card-details - padding: 0 - flex-shrink: 0 - flex-basis: calc(100% - 20px) - will-change: flex-basis - overflow-y: scroll - overflow-x: scroll - background: darken(white, 3%) - border-radius: bottom 3px - z-index: 1000 !important - animation: flexGrowIn 0.1s - box-shadow: 0 0 7px 0 darken(white, 30%) - transition: flex-basis 0.1s - box-sizing: border-box - position: absolute - top: 0 - left: 0 - height: calc(100% - 20px) - width: calc(100% - 20px) - float: left - - .card-details-left - position: absolute - float: left - top: 60px - left: 20px - width: 47% - - .card-details-right - position: absolute - float: right - top: 20px - left: 50% - - .card-details-header - width: 47% - -if isMiniScreen - .card-details - padding: 0 - flex-shrink: 0 - flex-basis: 600px - will-change: flex-basis - overflow-y: scroll - overflow-x: hidden - background: darken(white, 3%) - border-radius: bottom 3px - z-index: 20 !important - animation: flexGrowIn 0.1s - box-shadow: 0 0 7px 0 darken(white, 30%) - transition: flex-basis 0.1s - box-sizing: border-box +.card-details-maximized + padding: 0 + flex-shrink: 0 + flex-basis: calc(100% - 20px) + will-change: flex-basis + overflow-y: scroll + overflow-x: scroll + background: darken(white, 3%) + border-radius: bottom 3px + z-index: 1000 !important + animation: flexGrowIn 0.1s + box-shadow: 0 0 7px 0 darken(white, 30%) + transition: flex-basis 0.1s + box-sizing: border-box + position: absolute + top: 0 + left: 0 + height: calc(100% - 20px) + width: calc(100% - 20px) + float: left + + .card-details-left + position: absolute + float: left + top: 60px + left: 20px + width: 47% + + .card-details-right + position: absolute + float: right + top: 20px + left: 50% + + .card-details-header + width: 47% .card-details + padding: 0 + flex-shrink: 0 + flex-basis: 600px + will-change: flex-basis + overflow-y: scroll + overflow-x: hidden + background: darken(white, 3%) + border-radius: bottom 3px + z-index: 20 !important + animation: flexGrowIn 0.1s + box-shadow: 0 0 7px 0 darken(white, 30%) + transition: flex-basis 0.1s + box-sizing: border-box + .mCustomScrollBox padding-left: 0 From 49e31707e5a7d506b2cc8ce8103f6c955820cf2c Mon Sep 17 00:00:00 2001 From: Martin Filser Date: Mon, 14 Jun 2021 10:53:30 +0200 Subject: [PATCH 4/5] Card Details, minicard is now hidden --- client/components/cards/cardDetails.styl | 74 ++++++++++++------------ 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/client/components/cards/cardDetails.styl b/client/components/cards/cardDetails.styl index 4d2de5047..486b211a0 100644 --- a/client/components/cards/cardDetails.styl +++ b/client/components/cards/cardDetails.styl @@ -86,43 +86,6 @@ avatar-radius = 50% // Other card details -.card-details-maximized - padding: 0 - flex-shrink: 0 - flex-basis: calc(100% - 20px) - will-change: flex-basis - overflow-y: scroll - overflow-x: scroll - background: darken(white, 3%) - border-radius: bottom 3px - z-index: 1000 !important - animation: flexGrowIn 0.1s - box-shadow: 0 0 7px 0 darken(white, 30%) - transition: flex-basis 0.1s - box-sizing: border-box - position: absolute - top: 0 - left: 0 - height: calc(100% - 20px) - width: calc(100% - 20px) - float: left - - .card-details-left - position: absolute - float: left - top: 60px - left: 20px - width: 47% - - .card-details-right - position: absolute - float: right - top: 20px - left: 50% - - .card-details-header - width: 47% - .card-details padding: 0 flex-shrink: 0 @@ -274,6 +237,43 @@ avatar-radius = 50% .activities padding-top: 10px +.card-details-maximized + padding: 0 + flex-shrink: 0 + flex-basis: calc(100% - 20px) + will-change: flex-basis + overflow-y: scroll + overflow-x: scroll + background: darken(white, 3%) + border-radius: bottom 3px + z-index: 1000 !important + animation: flexGrowIn 0.1s + box-shadow: 0 0 7px 0 darken(white, 30%) + transition: flex-basis 0.1s + box-sizing: border-box + position: absolute + top: 0 + left: 0 + height: calc(100% - 20px) + width: calc(100% - 20px) + float: left + + .card-details-left + position: absolute + float: left + top: 60px + left: 20px + width: 47% + + .card-details-right + position: absolute + float: right + top: 20px + left: 50% + + .card-details-header + width: 47% + input[type="text"].attachment-add-link-input float: left margin: 0 0 8px From b98a46b78c45c2fed7f4a5dce637a67c531d3c5d Mon Sep 17 00:00:00 2001 From: Martin Filser Date: Mon, 14 Jun 2021 11:03:27 +0200 Subject: [PATCH 5/5] forms.styl, wrong indentation --- client/components/forms/forms.styl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/components/forms/forms.styl b/client/components/forms/forms.styl index a6103776c..d41ea4e62 100644 --- a/client/components/forms/forms.styl +++ b/client/components/forms/forms.styl @@ -86,7 +86,7 @@ select margin-bottom: 8px &.inline - width: 100% + width: 100% option[disabled] color: #8c8c8c