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/datetime picker warning hover style #356

Merged
merged 7 commits into from
Jun 14, 2022
Merged

Fix/datetime picker warning hover style #356

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f907a61
fix(datetime-picker): change icon color on warning state
Sarin-Udompanish Jun 8, 2022
09175f1
fix(datetime-picker): change warning and error style to consistant wi…
Sarin-Udompanish Jun 8, 2022
302ab3d
fix(datetime-picker): change focused color
Sarin-Udompanish Jun 9, 2022
946501d
Merge branch 'v6' into fix/datetime-picker-warning-hover-style
Sarin-Udompanish Jun 9, 2022
d679282
Merge branch 'fix/datetime-picker-warning-hover-style' of https://git…
Sarin-Udompanish Jun 9, 2022
e001761
Merge branch 'v6' into fix/datetime-picker-warning-hover-style
Theeraphat-Sorasetsakul Jun 13, 2022
23c5580
Merge branch 'v6' into fix/datetime-picker-warning-hover-style
Sarin-Udompanish Jun 14, 2022
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
9 changes: 9 additions & 0 deletions packages/elements/src/datetime-picker/__demo__/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@
<ef-checkbox id="weekendsOnly">Weekends Only</ef-checkbox>
<ef-checkbox id="readonly">Readonly</ef-checkbox>
<ef-checkbox id="disabled">Disabled</ef-checkbox>
<ef-checkbox id="warning">Warning</ef-checkbox>
<ef-checkbox id="error">Error</ef-checkbox>
</p>
<p>
<ef-checkbox id="inputTriggerDisabled">Input Trigger Disabled</ef-checkbox>
Expand Down Expand Up @@ -121,6 +123,7 @@
duplex: dateTimePicker.duplex,
timepicker: dateTimePicker.timepicker,
amPm: dateTimePicker.amPm,
warning: dateTimePicker.warning,
error: dateTimePicker.error,
showSeconds: dateTimePicker.showSeconds,
lang: dateTimePicker.lang,
Expand Down Expand Up @@ -292,6 +295,12 @@
document.getElementById('disabled').addEventListener('checked-changed', ({ detail: { value } }) => {
dateTimePicker.disabled = value || undefined;
});
document.getElementById('warning').addEventListener('checked-changed', ({ detail: { value } }) => {
dateTimePicker.warning = value || undefined;
});
document.getElementById('error').addEventListener('checked-changed', ({ detail: { value } }) => {
dateTimePicker.error = value || undefined;
});
document.getElementById('readonly').addEventListener('checked-changed', ({ detail: { value } }) => {
dateTimePicker.readonly = value || undefined;
});
Expand Down
28 changes: 27 additions & 1 deletion packages/halo-theme/src/custom-elements/ef-datetime-picker.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,32 @@
}
}

&[warning]:not([focused]) {
border-color: @control-warning-color;
}

&[error]:not([focused]) {
border-color: @control-error-color;
}

&[warning]:hover:not([readonly]):not([focused]) {
border-color: @control-hover-warning-color;
}

&[warning][disabled],
&[warning][readonly]:not([focused]) {
border-color: fade(@control-hover-warning-color, 50%);
}

&[error]:hover:not([readonly]):not([focused]) {
border-color: @control-hover-error-color;
}

&[error][disabled],
&[error][readonly]:not([focused]) {
border-color: fade(@control-hover-error-color, 50%);
}

&[disabled] {
[part=icon] {
color: @input-disabled-text-color
Expand All @@ -36,7 +62,7 @@

&[focused],
&[focused][error][warning],
&:not([disabled]):hover {
&:not([disabled]):not([error]):not([warning]):hover {
[part=icon] {
color: @scheme-color-secondary;

Expand Down