Spearhead/joyent-portal
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix(ui-toolkit): fix disabled popover color in webkit

Browse Source 
fixes #1050
This commit is contained in:
Sérgio Ramos 2018-01-25 17:15:07 +00:00 committed by Sérgio Ramos
parent 15213ba6ce
commit 81b46b8c53
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/my-joy-beta/src/components/create-instance/affinity.js
View File

@ -26,7 +26,11 @@ export const Rule = rule => (
The instance The instance
</H5> </H5>
<FormGroup name="rule-instance-conditional" field={Field}> <FormGroup name="rule-instance-conditional" field={Field}>
<Select touched={rule['rule-instance-conditional']} width={remcalc(66)} embedded> <Select
touched={rule['rule-instance-conditional']}
width={remcalc(66)}
embedded
>
<option value="must">must</option> <option value="must">must</option>
<option value="should">should</option> <option value="should">should</option>
</Select> </Select>
@ -35,7 +39,11 @@ export const Rule = rule => (
be on be on
</H5> </H5>
<FormGroup name="rule-instance-placement" field={Field}> <FormGroup name="rule-instance-placement" field={Field}>
<Select touched={rule['rule-instance-placement']} width={remcalc(90)} embedded> <Select
touched={rule['rule-instance-placement']}
width={remcalc(90)}
embedded
>
<option value="same">the same</option> <option value="same">the same</option>
<option value="different">a different</option> <option value="different">a different</option>
</Select> </Select>

1
packages/ui-toolkit/src/popover/__tests__/__snapshots__/popover.spec.js.snap
View File

@ -41,6 +41,7 @@ Array [
.c1:hover { .c1:hover {
color: rgb(53,53,53); color: rgb(53,53,53);
-webkit-text-fill-color: currentcolor;
} }
.c0 { .c0 {

2
packages/ui-toolkit/src/popover/item.js
View File

@ -17,11 +17,13 @@ const BaseItem = styled.span`
&:hover { &:hover {
color: ${props => props.theme.secondaryHover}; color: ${props => props.theme.secondaryHover};
-webkit-text-fill-color: currentcolor;
} }
`}; `};
${is('disabled')` ${is('disabled')`
color: ${props => props.theme.grey}; color: ${props => props.theme.grey};
-webkit-text-fill-color: currentcolor;
`}; `};
`; `;