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

Feat(input, dropdown): 入力中・選択中・選択肢の文字の色をgray.800に上げる #1098

Merged
merged 15 commits into from
Nov 1, 2023
Merged

Feat(input, dropdown): 入力中・選択中・選択肢の文字の色をgray.800に上げる #1098

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
29c06d1
[#1096] Base Input の Text Color 修正
okakyo Oct 7, 2023
e4ad384
[#1096] SelectBox の Text Color 修正
okakyo Oct 8, 2023
6e474fc
[#1096] Search Selector の Text Color 修正
okakyo Oct 8, 2023
2f6f886
[#1096] Dropdown Item の Text Color 修正
okakyo Oct 8, 2023
783774c
[#1096] Time Picker の Text Color 修正
okakyo Oct 8, 2023
ce94963
[#1096] Time Picker の Pointer 機能の追加
okakyo Oct 8, 2023
6c82476
[#1096] Search Input の Text Color 修正
okakyo Oct 8, 2023
a479e3b
[#1096] add changeset
okakyo Oct 8, 2023
7dc7fb4
[#1096] checkbox, search Input での色の修正
okakyo Oct 24, 2023
74ea1a2
[#1081] popup button group の Color 修正
okakyo Oct 31, 2023
f6c9867
[#1081] Radio の Color 修正
okakyo Oct 31, 2023
dc3df3b
[#1081] gray.400 から gray.500 に変更
okakyo Oct 31, 2023
f5d92ae
[#1096] gray.800 以外の修正を削除
okakyo Oct 31, 2023
7eca202
Merge branch 'main' into feat/1096_input
okakyo Oct 31, 2023
2d6a1f7
chore(input): changesetの修正
ichi-h Nov 1, 2023
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
8 changes: 8 additions & 0 deletions .changeset/perfect-seals-search.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
"@wizleap-inc/wiz-ui-react": patch
"@wizleap-inc/wiz-ui-next": patch
"@wizleap-inc/wiz-ui-styles": patch
"@wizleap-inc/wiz-ui": patch
---

[#1096] Input タグの 入力中、選択中、選択肢 を gray.800 に変更
2 changes: 1 addition & 1 deletion packages/styles/bases/base-input.css.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export const baseInputStyle = style({
borderRadius: THEME.spacing.xs2,
fontSize: THEME.fontSize.sm,
lineHeight: THEME.fontSize.lg,
color: THEME.color.gray[700],
color: THEME.color.gray[800],
boxSizing: "border-box",

"::placeholder": {
Expand Down
2 changes: 1 addition & 1 deletion packages/styles/bases/dropdown.css.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export const dropdownSkeletonStyle = style({
export const dropdownItemStyle = style({
border: "none",
font: "inherit",
color: "inherit",
color: THEME.color.gray[800],
background: "none",
width: "100%",
padding: `${THEME.spacing.xs} ${THEME.spacing.xs2}`,
Expand Down
4 changes: 2 additions & 2 deletions packages/styles/bases/search-input.css.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export const searchInputStyle = style({
padding: `calc(${THEME.spacing.sm} - ${BORDER_WIDTH}) ${THEME.spacing.xl2} calc(${THEME.spacing.sm} - ${BORDER_WIDTH}) ${THEME.spacing.xl3}`,
fontSize: THEME.fontSize.sm,
lineHeight: THEME.spacing.lg,
color: THEME.color.gray[700],
color: THEME.color.gray[800],
boxSizing: "border-box",
":focus": {
outline: "none",
Expand Down Expand Up @@ -113,7 +113,7 @@ export const searchDropdownLabelStyle = style({
paddingLeft: THEME.spacing.xs,
cursor: "pointer",
fontSize: THEME.fontSize.sm,
color: THEME.color.gray[700],
color: THEME.color.gray[800],
userSelect: "none",
"@media": {
"(any-hover: hover)": {
Expand Down
6 changes: 3 additions & 3 deletions packages/styles/bases/search-selector.css.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export const selectBoxInnerBoxSelectedItemStyle = style({
border: `1px solid ${THEME.color.gray["400"]}`,
borderRadius: THEME.spacing.xs2,

color: THEME.color.gray["700"],
color: THEME.color.gray["800"],
});

export const selectBoxInnerBoxSelectedLabelStyle = style({
Expand Down Expand Up @@ -100,7 +100,7 @@ export const selectBoxSelectorOptionStyle = style({
alignItems: "center",
padding: `${THEME.spacing.xs} ${THEME.spacing.xs2}`,
fontSize: THEME.fontSize.sm,
color: THEME.color.gray["700"],
color: THEME.color.gray["800"],
boxSizing: "border-box",
cursor: "pointer",
"@media": {
Expand Down Expand Up @@ -133,7 +133,7 @@ export const selectBoxSearchInputStyle = style({
lineHeight: THEME.fontSize.xl,
flexGrow: 1,
fontSize: THEME.fontSize.sm,
color: THEME.color.gray["500"],
color: THEME.color.gray["800"],
"::placeholder": {
color: THEME.color.gray["500"],
userSelect: "none",
Expand Down
4 changes: 2 additions & 2 deletions packages/styles/bases/selectbox-input.css.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export const selectBoxInnerBoxSelectedValueStyle = style({
overflow: "hidden",
textOverflow: "ellipsis",
whiteSpace: "nowrap",
color: THEME.color.gray["700"],
color: THEME.color.gray["800"],
});

export const selectBoxInnerBoxLessStyle = style({
Expand Down Expand Up @@ -67,7 +67,7 @@ export const selectBoxSelectorOptionStyle = style({
alignItems: "center",
padding: `${THEME.spacing.xs} ${THEME.spacing.xs2}`,
fontSize: THEME.fontSize.sm,
color: THEME.color.gray["700"],
color: THEME.color.gray["800"],
boxSizing: "border-box",
cursor: "pointer",
"@media": {
Expand Down
4 changes: 2 additions & 2 deletions packages/styles/bases/time-picker-input.css.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export const timePickerBoxColorStyle = styleVariants({
color: THEME.color.gray["500"],
},
selected: {
color: THEME.color.gray["700"],
color: THEME.color.gray["800"],
},
disabled: {
color: THEME.color.gray["500"],
Expand Down Expand Up @@ -107,7 +107,7 @@ export const timePickerSelectorOptionItemSelectedStyle = style({

export const timePickerSelectorOptionItemColorStyle = styleVariants({
default: {
color: THEME.color.gray["700"],
color: THEME.color.gray["800"],
},
selected: {
color: THEME.color.white["800"],
Expand Down
2 changes: 2 additions & 0 deletions packages/wiz-ui-next/src/components/base/inputs/timepicker/time-picker.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
:class="[
timePickerSelectorOptionStyle,
timePickerSelectorOptionItemStyle,
timePickerCursorStyle[timePickerCursor],
option === selectedHour &&
timePickerSelectorOptionItemSelectedStyle,
timePickerSelectorOptionItemColorStyle[
Expand Down Expand Up @@ -86,6 +87,7 @@
:class="[
timePickerSelectorOptionStyle,
timePickerSelectorOptionItemStyle,
timePickerCursorStyle[timePickerCursor],
option === selectedMinute &&
timePickerSelectorOptionItemSelectedStyle,
timePickerSelectorOptionItemColorStyle[
Expand Down
2 changes: 2 additions & 0 deletions packages/wiz-ui-react/src/components/base/inputs/time-picker/components/time-picker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ const TimePicker = ({
key={"hh" + option}
className={clsx([
styles.timePickerSelectorOptionStyle,
styles.timePickerCursorStyle[timePickerCursor],
option !== time?.hour &&
styles.timePickerSelectorOptionItemStyle,
option === time?.hour &&
Expand Down Expand Up @@ -193,6 +194,7 @@ const TimePicker = ({
key={"mm" + option}
className={clsx([
styles.timePickerSelectorOptionStyle,
styles.timePickerCursorStyle[timePickerCursor],
option !== time?.minute &&
styles.timePickerSelectorOptionItemStyle,
option === time?.minute &&
Expand Down
2 changes: 2 additions & 0 deletions packages/wiz-ui/src/components/base/inputs/timepicker/time-picker.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
:class="[
timePickerSelectorOptionStyle,
timePickerSelectorOptionItemStyle,
timePickerCursorStyle[timePickerCursor],
option === selectedHour &&
timePickerSelectorOptionItemSelectedStyle,
timePickerSelectorOptionItemColorStyle[
Expand Down Expand Up @@ -85,6 +86,7 @@
:class="[
timePickerSelectorOptionStyle,
timePickerSelectorOptionItemStyle,
timePickerCursorStyle[timePickerCursor],
option === selectedMinute &&
timePickerSelectorOptionItemSelectedStyle,
timePickerSelectorOptionItemColorStyle[
Expand Down