Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -1974,6 +1974,7 @@ describe("calcite-input-number", () => {
value="2"
clearable
loading
icon="layers"
></calcite-input-number>
`,
{
Expand Down Expand Up @@ -2013,11 +2014,11 @@ describe("calcite-input-number", () => {
],
"--calcite-input-actions-icon-color": {
shadowSelector: `calcite-icon`,
targetProp: "color",
targetProp: "--calcite-icon-color",
},
"--calcite-input-actions-icon-color-hover": {
shadowSelector: `calcite-icon`,
targetProp: "color",
targetProp: "--calcite-icon-color",
state: "hover",
},
"--calcite-input-loading-background-color": {
Expand Down Expand Up @@ -2095,6 +2096,10 @@ describe("calcite-input-number", () => {
targetProp: "color",
state: "focus",
},
"--calcite-input-number-icon-color": {
shadowSelector: `.${CSS.inputIcon}`,
targetProp: "--calcite-icon-color",
},
"--calcite-input-prefix-background-color": {
shadowSelector: `.${CSS.prefix}`,
targetProp: "backgroundColor",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
* @prop --calcite-input-number-background-color: Specifies the background color of the component.
* @prop --calcite-input-number-border-color: Specifies the border color of the component.
* @prop --calcite-input-number-corner-radius: Specifies the border radius of the component.
* @prop --calcite-input-number-icon-color: Specifies the component's icon color.
* @prop --calcite-input-number-height: Specifies the height of the component.
* @prop --calcite-input-number-placeholder-text-color: Specifies the text color of the placeholder in the component.
* @prop --calcite-input-number-text-color: Specifies the text color of the component.
Expand Down Expand Up @@ -134,10 +135,6 @@ input[readonly]:focus {
color: var(--calcite-input-number-text-color-focus, var(--calcite-color-text-1));
}

calcite-icon {
color: var(--calcite-input-actions-icon-color, var(--calcite-color-text-3));
}

//focus
input {
@apply focus-base;
Expand Down Expand Up @@ -202,6 +199,7 @@ input:focus {
absolute
block
z-default; // needed for firefox to display the icon properly
--calcite-icon-color: var(--calcite-input-number-icon-color, var(--calcite-color-text-3));
}

.clear-button {
Expand All @@ -223,18 +221,22 @@ input:focus {
background-color: var(--calcite-input-actions-background-color, var(--calcite-color-foreground-1));
border-inline-start-width: theme("borderWidth.0");

calcite-icon {
--calcite-icon-color: var(--calcite-input-actions-icon-color, var(--calcite-color-text-3));
}

&:hover {
@apply transition-default;
background-color: var(--calcite-input-actions-background-color-hover, var(--calcite-color-foreground-2));
calcite-icon {
@apply transition-default;
color: var(--calcite-input-actions-icon-color-hover, var(--calcite-color-text-1));
--calcite-icon-color: var(--calcite-input-actions-icon-color-hover, var(--calcite-color-text-1));
}
}
&:active {
background-color: var(--calcite-input-actions-background-color-press, var(--calcite-color-foreground-3));
calcite-icon {
color: var(--calcite-input-actions-icon-color-press, var(--calcite-color-text-1));
--calcite-icon-color: var(--calcite-input-actions-icon-color-press, var(--calcite-color-text-1));
}
}
&:focus {
Expand Down Expand Up @@ -385,6 +387,7 @@ input:focus {

& calcite-icon {
@apply transition-default pointer-events-none;
--calcite-icon-color: var(--calcite-input-actions-icon-color, var(--calcite-color-text-3));
}

&:disabled {
Expand All @@ -394,14 +397,14 @@ input:focus {
&:hover {
background-color: var(--calcite-input-actions-background-color-hover, var(--calcite-color-foreground-2));
calcite-icon {
color: var(--calcite-input-actions-icon-color-hover, var(--calcite-color-text-1));
--calcite-icon-color: var(--calcite-input-actions-icon-color-hover, var(--calcite-color-text-1));
}
}

&:active {
background-color: var(--calcite-input-actions-background-color-press, var(--calcite-color-foreground-3));
calcite-icon {
color: var(--calcite-input-actions-icon-color-press, var(--calcite-color-text-1));
--calcite-icon-color: var(--calcite-input-actions-icon-color-press, var(--calcite-color-text-1));
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export const inputNumberTokens = {
calciteInputNumberBackgroundColor: "",
calciteInputNumberBorderColor: "",
calciteInputNumberCornerRadius: "",
calciteInputNumberIconColor: "",
calciteInputNumberHeight: "",
calciteInputNumberPlaceholderTextColor: "",
calciteInputNumberTextColor: "",
Expand Down
2 changes: 2 additions & 0 deletions packages/calcite-components/src/demos/input-number.html
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
--calcite-input-number-background-color: yellow;
--calcite-input-number-border-color: #1e88e5;
--calcite-input-number-corner-radius: 4px;
--calcite-input-number-icon-color: red;
--calcite-input-number-height: 40px;
--calcite-input-number-placeholder-text-color: #9e9e9e;
--calcite-input-number-text-color: #212121;
Expand Down Expand Up @@ -712,6 +713,7 @@
clearable
value="100"
loading
icon="layers"
></calcite-input-number>
</div>
</div>
Expand Down
Loading