Skip to content

Commit

Permalink
fix: update progress from accent fill to accent foreground (#3277)
Browse files Browse the repository at this point in the history
Updated progress from accent fill to accent foreground
  • Loading branch information
bheston authored Jun 11, 2020
1 parent 5e972ca commit 447c5a3
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 22 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { ComponentStyles } from "@microsoft/fast-jss-manager";
import { ProgressClassNameContract } from "@microsoft/fast-components-class-name-contracts-msft";
import { directionSwitch, format, multiply, toPx } from "@microsoft/fast-jss-utilities";
import {
accentFillRest,
accentForegroundRest,
neutralFillRest,
neutralForegroundHint,
} from "../utilities/color";
Expand Down Expand Up @@ -40,7 +40,7 @@ const styles: ComponentStyles<ProgressClassNameContract, DesignSystem> = {
transition: "all 0.2s ease-in-out",
},
"& $progress_valueIndicator": {
stroke: accentFillRest,
stroke: accentForegroundRest,
transform: directionSwitch("", "scale(1)"),
[highContrastSelector]: {
stroke: HighContrastColor.buttonText,
Expand Down Expand Up @@ -88,7 +88,7 @@ const styles: ComponentStyles<ProgressClassNameContract, DesignSystem> = {
width: toPx(multiply(heightNumber(), 2)),
},
progress_valueIndicator: {
background: accentFillRest,
background: accentForegroundRest,
"border-radius": "100px",
height: "100%",
transition: "all 0.2s ease-in-out",
Expand Down Expand Up @@ -132,7 +132,7 @@ const styles: ComponentStyles<ProgressClassNameContract, DesignSystem> = {
position: "absolute",
opacity: "0",
height: "100%",
"background-color": accentFillRest,
"background-color": accentForegroundRest,
"border-radius": "100px",
"animation-timing-function": "cubic-bezier(0.4, 0.0, 0.6, 1.0)",
[highContrastSelector]: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { css } from "@microsoft/fast-element";
import { SystemColors } from "@microsoft/fast-web-utilities";
import { display, forcedColorsStylesheetBehavior } from "@microsoft/fast-foundation";
import {
accentFillRestBehavior,
accentForegroundRestBehavior,
heightNumber,
neutralFillRestBehavior,
neutralForegroundHintBehavior,
Expand All @@ -29,7 +29,7 @@ export const ProgressRingStyles = css`
}
.determinate {
stroke: ${accentFillRestBehavior.var};
stroke: ${accentForegroundRestBehavior.var};
fill: none;
stroke-width: 2px;
stroke-linecap: round;
Expand All @@ -39,7 +39,7 @@ export const ProgressRingStyles = css`
}
.indeterminate-indicator-1 {
stroke: ${accentFillRestBehavior.var};
stroke: ${accentForegroundRestBehavior.var};
fill: none;
stroke-width: 2px;
stroke-linecap: round;
Expand Down Expand Up @@ -73,7 +73,7 @@ export const ProgressRingStyles = css`
}
}
`.withBehaviors(
accentFillRestBehavior,
accentForegroundRestBehavior,
neutralFillRestBehavior,
neutralForegroundHintBehavior,
forcedColorsStylesheetBehavior(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { css } from "@microsoft/fast-element";
import { SystemColors } from "@microsoft/fast-web-utilities";
import { display, forcedColorsStylesheetBehavior } from "@microsoft/fast-foundation";
import {
accentFillRestBehavior,
accentForegroundRestBehavior,
neutralFillRestBehavior,
neutralForegroundHintBehavior,
} from "../../styles";
Expand All @@ -26,7 +26,7 @@ export const ProgressStyles = css`
}
.determinate {
background-color: ${accentFillRestBehavior.var};
background-color: ${accentForegroundRestBehavior.var};
border-radius: calc(var(--design-unit) * 1px);
height: 100%;
transition: all 0.2s ease-in-out;
Expand All @@ -46,7 +46,7 @@ export const ProgressStyles = css`
position: absolute;
opacity: 0;
height: 100%;
background-color: ${accentFillRestBehavior.var};
background-color: ${accentForegroundRestBehavior.var};
border-radius: calc(var(--design-unit) * 1px);
animation-timing-function: cubic-bezier(0.4, 0.0, 0.6, 1.0);
width: 40%;
Expand All @@ -57,7 +57,7 @@ export const ProgressStyles = css`
position: absolute;
opacity: 0;
height: 100%;
background-color: ${accentFillRestBehavior.var};
background-color: ${accentForegroundRestBehavior.var};
border-radius: calc(var(--design-unit) * 1px);
animation-timing-function: cubic-bezier(0.4, 0.0, 0.6, 1.0);
width: 60%;
Expand Down Expand Up @@ -109,7 +109,7 @@ export const ProgressStyles = css`
},
},
`.withBehaviors(
accentFillRestBehavior,
accentForegroundRestBehavior,
neutralFillRestBehavior,
neutralForegroundHintBehavior,
forcedColorsStylesheetBehavior(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { css } from "@microsoft/fast-element";
import { display, forcedColorsStylesheetBehavior } from "@microsoft/fast-foundation";
import { SystemColors } from "@microsoft/fast-web-utilities";
import {
accentFillRestBehavior,
accentForegroundRestBehavior,
heightNumber,
neutralFillRestBehavior,
neutralForegroundHintBehavior,
Expand All @@ -29,7 +29,7 @@ export const ProgressRingStyles = css`
}
.determinate {
stroke: ${accentFillRestBehavior.var};
stroke: ${accentForegroundRestBehavior.var};
fill: none;
stroke-width: 2px;
stroke-linecap: round;
Expand All @@ -39,7 +39,7 @@ export const ProgressRingStyles = css`
}
.indeterminate-indicator-1 {
stroke: ${accentFillRestBehavior.var};
stroke: ${accentForegroundRestBehavior.var};
fill: none;
stroke-width: 2px;
stroke-linecap: round;
Expand Down Expand Up @@ -73,7 +73,7 @@ export const ProgressRingStyles = css`
}
}
`.withBehaviors(
accentFillRestBehavior,
accentForegroundRestBehavior,
neutralFillRestBehavior,
neutralForegroundHintBehavior,
forcedColorsStylesheetBehavior(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { css } from "@microsoft/fast-element";
import { display, forcedColorsStylesheetBehavior } from "@microsoft/fast-foundation";
import { SystemColors } from "@microsoft/fast-web-utilities";
import {
accentFillRestBehavior,
accentForegroundRestBehavior,
neutralFillRestBehavior,
neutralForegroundHintBehavior,
} from "../../styles/index";
Expand All @@ -26,7 +26,7 @@ export const ProgressStyles = css`
}
.determinate {
background-color: ${accentFillRestBehavior.var};
background-color: ${accentForegroundRestBehavior.var};
border-radius: calc(var(--design-unit) * 1px);
height: 100%;
transition: all 0.2s ease-in-out;
Expand All @@ -46,7 +46,7 @@ export const ProgressStyles = css`
position: absolute;
opacity: 0;
height: 100%;
background-color: ${accentFillRestBehavior.var};
background-color: ${accentForegroundRestBehavior.var};
border-radius: calc(var(--design-unit) * 1px);
animation-timing-function: cubic-bezier(0.4, 0.0, 0.6, 1.0);
width: 40%;
Expand All @@ -57,7 +57,7 @@ export const ProgressStyles = css`
position: absolute;
opacity: 0;
height: 100%;
background-color: ${accentFillRestBehavior.var};
background-color: ${accentForegroundRestBehavior.var};
border-radius: calc(var(--design-unit) * 1px);
animation-timing-function: cubic-bezier(0.4, 0.0, 0.6, 1.0);
width: 60%;
Expand Down Expand Up @@ -109,7 +109,7 @@ export const ProgressStyles = css`
},
},
`.withBehaviors(
accentFillRestBehavior,
accentForegroundRestBehavior,
neutralFillRestBehavior,
neutralForegroundHintBehavior,
forcedColorsStylesheetBehavior(
Expand Down

0 comments on commit 447c5a3

Please sign in to comment.