Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix input disabled style #1636

Merged
merged 13 commits into from
Jun 24, 2021
Merged

Fix input disabled style #1636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
de47ac2
fix: textarea disabled
AtsushiM Jun 1, 2021
be598a1
fix: input disabled
AtsushiM May 31, 2021
152eeea
fix: select disabled
AtsushiM May 31, 2021
c5c416c
fix: placeholder color
AtsushiM May 31, 2021
5a085b7
Merge branch 'master' of github.com:kufu/smarthr-ui into fix-input-di…
AtsushiM Jun 14, 2021
7a205a1
fix: select props
AtsushiM Jun 14, 2021
53163d3
fix: mobile safari
AtsushiM Jun 14, 2021
ccc985e
fix: ie11
AtsushiM Jun 14, 2021
60c4690
fix: ie11
AtsushiM Jun 14, 2021
2a84a5d
Merge branch 'master' of github.com:kufu/smarthr-ui into fix-input-di…
AtsushiM Jun 23, 2021
611717e
不要となった確認用storyを削除
AtsushiM Jun 23, 2021
dab8214
Merge branch 'fix-input-disabled-style' of github.com:AtsushiM/smarth…
AtsushiM Jun 23, 2021
56966cf
fix: css comment
AtsushiM Jun 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/components/Input/Input.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ const StyledInput = styled.input<
color: ${palette.TEXT_BLACK};
line-height: 1.6;
box-sizing: border-box;
background-color: transparent;

&::placeholder {
color: ${palette.TEXT_GREY};
Expand Down
10 changes: 9 additions & 1 deletion src/components/Select/Select.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ const Wrapper = styled.div<{
`}
${disabled &&
css`
background-color: ${palette.BASE_GREY};
background-color: ${palette.COLUMN};
color: ${palette.TEXT_DISABLED};
`}
`
Expand Down Expand Up @@ -160,6 +160,14 @@ const SelectBox = styled.select<{ themes: Theme }>`
opacity: 1;
}

/* for IE11 */
&:disabled {
&,
&::-ms-value {
color: ${palette.TEXT_DISABLED};
}
}

&::-ms-expand {
display: none;
}
Expand Down
11 changes: 10 additions & 1 deletion src/components/Textarea/Textarea.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ const StyledTextarea = styled.textarea<Props & { themes: Theme; textAreaWidth?:
background-color: #fff;
border: ${frame.border.default};
box-sizing: border-box;
opacity: 1;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

単純に質問なのですが、こちらは何に対処するための指定でしょうか？

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mobile Safariです。
53163d3

確認した環境はシュミレータですが

  • iPhone 12 Pro Max
  • iOS 14.5

となっています。

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ありがとうございます！把握です！

${error
? css`
border-color: ${palette.DANGER};
Expand All @@ -96,10 +97,18 @@ const StyledTextarea = styled.textarea<Props & { themes: Theme; textAreaWidth?:
border-color: ${palette.hoverColor(palette.MAIN)};
}
`}

&::placeholder {
color: ${palette.TEXT_GREY};
}
&[disabled] {
background-color: ${palette.COLUMN};
pointer-events: none;
color: ${palette.TEXT_DISABLED};

&,
&::placeholder {
color: ${palette.TEXT_DISABLED};
}
}
`
}}
Expand Down