Skip to content

Commit 54332fc

Browse files
nmetulevshweaver-MSFTbeth-panx
authored
[Tasks] Adding additional CSS custom properties (#271)
* added more custom properties for tasks * fixed icon rotating * Adding task-icon-alignment to mgt-tasks * Update custom elements to enable storybook to detect new css properties Co-authored-by: Shane Weaver <[email protected]> Co-authored-by: Beth Pan <[email protected]>
1 parent 06e5dd2 commit 54332fc

File tree

3 files changed

+67
-10
lines changed

3 files changed

+67
-10
lines changed

custom-elements.json

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1135,6 +1135,51 @@
11351135
"name": "--task-complete-detail-icon-color",
11361136
"description": "Task complete detail icon color",
11371137
"type": "Color"
1138+
},
1139+
{
1140+
"name": "--tasks-background-color",
1141+
"description": "Task background color",
1142+
"type": "Color"
1143+
},
1144+
{
1145+
"name": "--task-icon-alignment",
1146+
"description": "Task icon alignment",
1147+
"type": "String"
1148+
},
1149+
{
1150+
"name": "--task-icon-background",
1151+
"description": "Task icon color",
1152+
"type": "Color"
1153+
},
1154+
{
1155+
"name": "--task-icon-background-completed",
1156+
"description": "Task icon background color when completed",
1157+
"type": "Color"
1158+
},
1159+
{
1160+
"name": "--task-icon-border",
1161+
"description": "Task icon border styles",
1162+
"type": "String"
1163+
},
1164+
{
1165+
"name": "--task-icon-border-completed",
1166+
"description": "Task icon border style when task is completed",
1167+
"type": "String"
1168+
},
1169+
{
1170+
"name": "--task-icon-border-radius",
1171+
"description": "Task icon border radius",
1172+
"type": "String"
1173+
},
1174+
{
1175+
"name": "--task-icon-color",
1176+
"description": "Task icon color",
1177+
"type": "Color"
1178+
},
1179+
{
1180+
"name": "--task-icon-color-completed",
1181+
"description": "Task icon color when completed",
1182+
"type": "Color"
11381183
}
11391184
]
11401185
},

src/components/mgt-tasks/mgt-tasks.scss

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,23 @@
88
@import '../../styles/shared-styles.scss';
99
@import '../../../node_modules/office-ui-fabric-core/dist/sass/References';
1010

11+
$tasks-background-color: var(--tasks-background-color, #f8f8f8);
12+
13+
$task-icon-alignment: var(--task-icon-alignment, flex-start);
14+
$task-icon-background: var(--task-icon-background, transparent);
15+
$task-icon-background-completed: var(--task-icon-background-completed, $ms-color-sharedGreenCyan10);
16+
$task-icon-border: var(--task-icon-border, solid 1px $ms-color-gray120);
17+
$task-icon-border-completed: var(--task-icon-border-completed, solid 1px white);
18+
$task-icon-border-radius: var(--task-icon-border-radius, 50%);
19+
$task-icon-color: var(--task-icon-color, black);
20+
$task-icon-color-completed: var(--task-icon-color-completed, white);
21+
1122
mgt-tasks,
1223
:host {
1324
font-family: var(--default-font-family, 'Segoe UI');
1425
display: flex;
1526
flex-direction: column;
16-
background-color: var(--tasks-background-color, #f8f8f8);
27+
background-color: $tasks-background-color;
1728
padding: var(--tasks-padding, 12px);
1829
}
1930

@@ -579,16 +590,17 @@ mgt-tasks,
579590
color: white;
580591
cursor: pointer;
581592
display: flex;
582-
align-items: flex-start;
593+
align-items: $task-icon-alignment;
583594
margin: 21px 10px 20px 20px;
584595

585596
user-select: none;
586597
-moz-user-select: none;
587598
-ms-user-select: none;
588599
&.Complete {
589600
.TaskCheck {
590-
background-color: $ms-color-sharedGreenCyan10;
591-
border: solid 1px white;
601+
background-color: $task-icon-background-completed;
602+
border: $task-icon-border-completed;
603+
color: $task-icon-color-completed;
592604
}
593605
}
594606
}
@@ -599,18 +611,18 @@ mgt-tasks,
599611
display: inline-block;
600612
width: 18px;
601613
height: 18px;
602-
border-radius: 50%;
603-
border: solid 1px $ms-color-gray120;
604-
color: white;
614+
border-radius: $task-icon-border-radius;
615+
border: $task-icon-border;
616+
color: $task-icon-color;
605617
display: flex;
606618
justify-content: center;
607619
align-items: center;
620+
background-color: $task-icon-background;
608621

609622
user-select: none;
610623
-moz-user-select: none;
611624
-ms-user-select: none;
612-
&.Loading {
613-
color: black;
625+
&.Loading .TaskCheckContent {
614626
animation: rotateIcon 2s infinite linear;
615627
}
616628
}

src/components/mgt-tasks/mgt-tasks.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -969,7 +969,7 @@ export class MgtTasks extends MgtTemplatedComponent {
969969
: null;
970970

971971
const taskCheck = html`
972-
<span class=${classMap(taskCheckClasses)}>${taskCheckContent}</span>
972+
<span class=${classMap(taskCheckClasses)}><span class="TaskCheckContent">${taskCheckContent}</span></span>
973973
`;
974974

975975
const groupTitle = this._currentGroup ? null : this.getPlanTitle(task.topParentId);

0 commit comments

Comments
 (0)