From a0d4dc999f5b7d23cd902d9b0baad858a300bc36 Mon Sep 17 00:00:00 2001 From: petkir Date: Tue, 30 Jun 2020 08:58:24 +0200 Subject: [PATCH] Styling Change to Flex --- .../config/package-solution.json | 2 +- .../src/kanban/KanbanBucket.module.scss | 25 +++++++++++-------- .../src/kanban/KanbanBucket.tsx | 19 ++++++-------- .../src/kanban/KanbanComponent.module.scss | 7 ++++-- .../src/kanban/KanbanComponent.tsx | 15 ++++++----- 5 files changed, 37 insertions(+), 31 deletions(-) diff --git a/samples/react-kanban-board/config/package-solution.json b/samples/react-kanban-board/config/package-solution.json index c8ce7fb66..0a5224057 100644 --- a/samples/react-kanban-board/config/package-solution.json +++ b/samples/react-kanban-board/config/package-solution.json @@ -3,7 +3,7 @@ "solution": { "name": "react-kanban-board-client-side-solution", "id": "cccbd72b-7b89-4128-9348-0a4850ded8fd", - "version": "2.0.0.0", + "version": "1.0.1.0", "includeClientSideAssets": true, "skipFeatureDeployment": true, "isDomainIsolated": false diff --git a/samples/react-kanban-board/src/kanban/KanbanBucket.module.scss b/samples/react-kanban-board/src/kanban/KanbanBucket.module.scss index 6b9d88419..98ffe3994 100644 --- a/samples/react-kanban-board/src/kanban/KanbanBucket.module.scss +++ b/samples/react-kanban-board/src/kanban/KanbanBucket.module.scss @@ -1,11 +1,7 @@ .bucket { - - - // border-right: 1px solid gray; + width: 100%; + // border-right: 1px solid gray; .headline { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; padding: 2px 10px; line-height: 2em; font-weight: 700; @@ -13,6 +9,12 @@ position: relative; text-align: center; border-bottom: 1px solid gray; + .headlineText{ + width: calc( 100% - 10px); + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } .colorindicator { width: 10px; height: 100%; @@ -20,18 +22,20 @@ top: 0; right: 0px; } + .processIndicatorHeight { + height: 18px; + } } - .taskArea{ + .taskArea { padding: 5px; } .placeholder { position: relative; - } .taskplaceholder { position: relative; - background-color: transparent; - cursor: move; + background-color: transparent; + cursor: move; } /* .placeholder::after { @@ -43,5 +47,4 @@ background-color:blue; } */ - } diff --git a/samples/react-kanban-board/src/kanban/KanbanBucket.tsx b/samples/react-kanban-board/src/kanban/KanbanBucket.tsx index 806c9f411..f1a47a87b 100644 --- a/samples/react-kanban-board/src/kanban/KanbanBucket.tsx +++ b/samples/react-kanban-board/src/kanban/KanbanBucket.tsx @@ -28,7 +28,7 @@ export interface IKanbanBucketProps extends IKanbanBucket { leavingTaskId?: string; leavingBucket?: string; overBucket?: string; - + hasOneProcessIndicator: boolean; openDetails?: (taskId: string) => void; } @@ -53,21 +53,18 @@ export default class KanbanBucket extends React.Component { const { bucket, bucketheadline, color, buckettasks, tasksettings, percentageComplete, - allowAddTask, showPercentageHeadline, leavingTaskId, leavingBucket } = this.props; + allowAddTask, showPercentageHeadline, leavingTaskId, leavingBucket,hasOneProcessIndicator } = this.props; return (
-
- {bucketheadline} + key={bucket}> +
+
{bucketheadline}
{color &&
} - {showPercentageHeadline && } + {showPercentageHeadline ? + (): + (hasOneProcessIndicator?(
):(
))}
{allowAddTask && ( 0 ? 100 / buckets.length : 100; const { leavingBucket, leavingTaskId } = this.state; - const wrappedTaskActions: IKanbanBoardTaskActions = { - - }; - +const hasprocessIndicator = buckets.filter((b)=> b.showPercentageHeadline).length >0; + return (
{showCommandbar && { const merge = { ...b, ...this.state }; return (
this.bucketsref[i] = bucketContent} key={'BucketWrapper' + b.bucket + i} @@ -102,7 +105,7 @@ export default class KanbanComponent extends React.Component x.bucket == b.bucket)} tasksettings={tasksettings}