Skip to content

Commit

Permalink
fix(components): align validation icon for Inputs
Browse files Browse the repository at this point in the history
beta
  • Loading branch information
connor-baer committed Jul 29, 2020
1 parent a9cb1c6 commit 33696bd
Show file tree
Hide file tree
Showing 6 changed files with 131 additions and 93 deletions.
152 changes: 88 additions & 64 deletions src/__snapshots__/storyshots.spec.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -16979,10 +16979,10 @@ label + .circuit-2 {
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-align-items: center;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
-webkit-align-items: flex-start;
-webkit-box-align: flex-start;
-ms-flex-align: flex-start;
align-items: flex-start;
margin-top: 4px;
color: #5C656F;
-webkit-transition: color 120ms ease-in-out;
Expand Down Expand Up @@ -17087,10 +17087,10 @@ label + .circuit-2 {
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-align-items: center;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
-webkit-align-items: flex-start;
-webkit-box-align: flex-start;
-ms-flex-align: flex-start;
align-items: flex-start;
margin-top: 4px;
color: #5C656F;
-webkit-transition: color 120ms ease-in-out;
Expand Down Expand Up @@ -17315,10 +17315,10 @@ label + .circuit-2 {
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-align-items: center;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
-webkit-align-items: flex-start;
-webkit-box-align: flex-start;
-ms-flex-align: flex-start;
align-items: flex-start;
margin-top: 4px;
color: #5C656F;
-webkit-transition: color 120ms ease-in-out;
Expand Down Expand Up @@ -17536,10 +17536,10 @@ label + .circuit-2 {
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-align-items: center;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
-webkit-align-items: flex-start;
-webkit-box-align: flex-start;
-ms-flex-align: flex-start;
align-items: flex-start;
margin-top: 4px;
color: #5C656F;
-webkit-transition: color 120ms ease-in-out;
Expand All @@ -17548,8 +17548,12 @@ label + .circuit-2 {
}
.circuit-3 {
-webkit-flex-shrink: 1;
-ms-flex-negative: 1;
flex-shrink: 1;
width: 16px;
height: 16px;
margin-top: 0.15em;
margin-right: 4px;
color: #DB4D4D;
}
Expand Down Expand Up @@ -17636,10 +17640,10 @@ label + .circuit-2 {
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-align-items: center;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
-webkit-align-items: flex-start;
-webkit-box-align: flex-start;
-ms-flex-align: flex-start;
align-items: flex-start;
margin-top: 4px;
color: #5C656F;
-webkit-transition: color 120ms ease-in-out;
Expand Down Expand Up @@ -17753,10 +17757,10 @@ label + .circuit-2 {
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-align-items: center;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
-webkit-align-items: flex-start;
-webkit-box-align: flex-start;
-ms-flex-align: flex-start;
align-items: flex-start;
margin-top: 4px;
color: #5C656F;
-webkit-transition: color 120ms ease-in-out;
Expand Down Expand Up @@ -17869,10 +17873,10 @@ label + .circuit-2 {
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-align-items: center;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
-webkit-align-items: flex-start;
-webkit-box-align: flex-start;
-ms-flex-align: flex-start;
align-items: flex-start;
margin-top: 4px;
color: #5C656F;
-webkit-transition: color 120ms ease-in-out;
Expand Down Expand Up @@ -17933,8 +17937,12 @@ label + .circuit-2 {
}
.circuit-3 {
-webkit-flex-shrink: 1;
-ms-flex-negative: 1;
flex-shrink: 1;
width: 16px;
height: 16px;
margin-top: 0.15em;
margin-right: 4px;
color: #47995A;
}
Expand Down Expand Up @@ -18021,10 +18029,10 @@ label + .circuit-2 {
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-align-items: center;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
-webkit-align-items: flex-start;
-webkit-box-align: flex-start;
-ms-flex-align: flex-start;
align-items: flex-start;
margin-top: 4px;
color: #5C656F;
-webkit-transition: color 120ms ease-in-out;
Expand Down Expand Up @@ -18101,8 +18109,12 @@ label + .circuit-2 {
}
.circuit-3 {
-webkit-flex-shrink: 1;
-ms-flex-negative: 1;
flex-shrink: 1;
width: 16px;
height: 16px;
margin-top: 0.15em;
margin-right: 4px;
color: #D8A413;
}
Expand Down Expand Up @@ -18268,10 +18280,10 @@ label + .circuit-3 {
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-align-items: center;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
-webkit-align-items: flex-start;
-webkit-box-align: flex-start;
-ms-flex-align: flex-start;
align-items: flex-start;
margin-top: 4px;
color: #5C656F;
-webkit-transition: color 120ms ease-in-out;
Expand Down Expand Up @@ -18416,10 +18428,10 @@ label + .circuit-3 {
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-align-items: center;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
-webkit-align-items: flex-start;
-webkit-box-align: flex-start;
-ms-flex-align: flex-start;
align-items: flex-start;
margin-top: 4px;
color: #5C656F;
-webkit-transition: color 120ms ease-in-out;
Expand Down Expand Up @@ -18560,10 +18572,10 @@ label + .circuit-3 {
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-align-items: center;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
-webkit-align-items: flex-start;
-webkit-box-align: flex-start;
-ms-flex-align: flex-start;
align-items: flex-start;
margin-top: 4px;
color: #5C656F;
-webkit-transition: color 120ms ease-in-out;
Expand Down Expand Up @@ -18709,10 +18721,10 @@ label + .circuit-3 {
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-align-items: center;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
-webkit-align-items: flex-start;
-webkit-box-align: flex-start;
-ms-flex-align: flex-start;
align-items: flex-start;
margin-top: 4px;
color: #5C656F;
-webkit-transition: color 120ms ease-in-out;
Expand Down Expand Up @@ -18853,10 +18865,10 @@ label + .circuit-3 {
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-align-items: center;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
-webkit-align-items: flex-start;
-webkit-box-align: flex-start;
-ms-flex-align: flex-start;
align-items: flex-start;
margin-top: 4px;
color: #5C656F;
-webkit-transition: color 120ms ease-in-out;
Expand Down Expand Up @@ -20155,10 +20167,10 @@ exports[`Storyshots Forms/Select Invalid 1`] = `
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-align-items: center;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
-webkit-align-items: flex-start;
-webkit-box-align: flex-start;
-ms-flex-align: flex-start;
align-items: flex-start;
margin-top: 4px;
color: #5C656F;
-webkit-transition: color 120ms ease-in-out;
Expand All @@ -20167,8 +20179,12 @@ exports[`Storyshots Forms/Select Invalid 1`] = `
}
.circuit-5 {
-webkit-flex-shrink: 1;
-ms-flex-negative: 1;
flex-shrink: 1;
width: 16px;
height: 16px;
margin-top: 0.15em;
margin-right: 4px;
color: #DB4D4D;
}
Expand Down Expand Up @@ -21444,10 +21460,10 @@ label + .circuit-2 {
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-align-items: center;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
-webkit-align-items: flex-start;
-webkit-box-align: flex-start;
-ms-flex-align: flex-start;
align-items: flex-start;
margin-top: 4px;
color: #5C656F;
-webkit-transition: color 120ms ease-in-out;
Expand All @@ -21456,8 +21472,12 @@ label + .circuit-2 {
}
.circuit-3 {
-webkit-flex-shrink: 1;
-ms-flex-negative: 1;
flex-shrink: 1;
width: 16px;
height: 16px;
margin-top: 0.15em;
margin-right: 4px;
color: #DB4D4D;
}
Expand Down Expand Up @@ -21707,19 +21727,23 @@ label + .circuit-2 {
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-align-items: center;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
-webkit-align-items: flex-start;
-webkit-box-align: flex-start;
-ms-flex-align: flex-start;
align-items: flex-start;
margin-top: 4px;
color: #5C656F;
-webkit-transition: color 120ms ease-in-out;
transition: color 120ms ease-in-out;
}
.circuit-3 {
-webkit-flex-shrink: 1;
-ms-flex-negative: 1;
flex-shrink: 1;
width: 16px;
height: 16px;
margin-top: 0.15em;
margin-right: 4px;
color: #D8A413;
}
Expand Down
8 changes: 4 additions & 4 deletions src/components/Input/__snapshots__/Input.spec.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -286,10 +286,10 @@ label + .circuit-1 {
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-align-items: center;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
-webkit-align-items: flex-start;
-webkit-box-align: flex-start;
-ms-flex-align: flex-start;
align-items: flex-start;
margin-top: 4px;
color: #5C656F;
-webkit-transition: color 120ms ease-in-out;
Expand Down
8 changes: 4 additions & 4 deletions src/components/Select/__snapshots__/Select.spec.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -651,10 +651,10 @@ select:not(:active) ~ .circuit-2 {
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-align-items: center;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
-webkit-align-items: flex-start;
-webkit-box-align: flex-start;
-ms-flex-align: flex-start;
align-items: flex-start;
margin-top: 4px;
color: #5C656F;
-webkit-transition: color 120ms ease-in-out;
Expand Down
8 changes: 4 additions & 4 deletions src/components/TextArea/__snapshots__/TextArea.spec.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -290,10 +290,10 @@ label + .circuit-1 {
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-align-items: center;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
-webkit-align-items: flex-start;
-webkit-box-align: flex-start;
-ms-flex-align: flex-start;
align-items: flex-start;
margin-top: 4px;
color: #5C656F;
-webkit-transition: color 120ms ease-in-out;
Expand Down
4 changes: 3 additions & 1 deletion src/components/ValidationHint/ValidationHint.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const baseStyles = ({ theme }: StyleProps) => css`
label: validation-hint;
${textKilo({ theme })};
display: flex;
align-items: center;
align-items: flex-start;
margin-top: ${theme.spacings.bit};
color: ${theme.colors.n700};
transition: color ${theme.transitions.default};
Expand All @@ -53,8 +53,10 @@ const iconStyles = (color: 'danger' | 'warning' | 'success') => (
theme: Theme,
) => css`
label: ${`validation-hint__icon--${color}`};
flex-shrink: 1;
width: ${theme.iconSizes.kilo};
height: ${theme.iconSizes.kilo};
margin-top: 0.15em;
margin-right: ${theme.spacings.bit};
color: ${theme.colors[color]};
`;
Expand Down
Loading

0 comments on commit 33696bd

Please sign in to comment.