Skip to content
Merged
Show file tree
Hide file tree
Changes from 8 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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 1 addition & 15 deletions core/src/components/input/input.ionic.outline.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,6 @@
border-top: none;
}

:host(.input-fill-outline.input-shape-round) .input-bottom,
:host(.input-fill-outline.input-label-placement-floating) .input-bottom {
/**
* The bottom content should take on the start and end
* padding so it is always aligned with either the label
* or the start of the text input.
*/
@include padding-horizontal(var(--padding-start), var(--padding-end));
}

:host(.input-fill-outline) .input-wrapper {
/**
* For the ionic theme, the padding needs to sit on the
Expand All @@ -62,10 +52,6 @@
background: transparent;
}

:host(.input-fill-outline.input-shape-round) .label-text-wrapper {
@include padding(null, var(--padding-end), null, var(--padding-start));
}

:host(.input-fill-outline.input-label-placement-stacked) .label-text-wrapper {
@include transform-origin(start, top);

Expand Down Expand Up @@ -142,7 +128,7 @@
}

:host(.input-fill-outline.input-shape-round) {
--border-radius: #{$ion-border-radius-full};
--border-radius: #{$ion-border-radius-400};
}

:host(.input-fill-outline.input-shape-rectangular) {
Expand Down
17 changes: 9 additions & 8 deletions core/src/components/input/input.ionic.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
// --------------------------------------------------

:host {
--color: #{globals.$ion-primitives-neutral-1000};
--color: #{globals.$ion-primitives-neutral-1200};
--border-width: #{globals.$ion-border-size-025};
--border-color: #{globals.$ion-primitives-neutral-300};
--highlight-color-valid: #{globals.$ion-semantics-success-base};
--highlight-color-invalid: #{globals.$ion-semantics-danger-base};
--placeholder-color: #{globals.$ion-primitives-neutral-800};
--border-color: #{globals.$ion-primitives-neutral-500};
--highlight-color-valid: #{globals.$ion-semantics-success-900};
--highlight-color-invalid: #{globals.$ion-semantics-danger-800};
--placeholder-color: #{globals.$ion-primitives-neutral-1200};
--placeholder-opacity: 1;
--text-color-invalid: #{globals.$ion-semantics-danger-800};
--background: #{globals.$ion-primitives-base-white};
Expand Down Expand Up @@ -88,7 +88,7 @@
width: globals.$ion-scale-400;
height: globals.$ion-scale-400;

color: globals.$ion-primitives-neutral-500;
color: globals.$ion-primitives-neutral-1000;
}

.input-clear-icon:focus-visible {
Expand Down Expand Up @@ -167,7 +167,7 @@

@media (any-hover: hover) {
:host(:hover) {
--border-color: #{globals.$ion-primitives-neutral-600};
--border-color: #{globals.$ion-semantics-primary-base};
}
}

Expand All @@ -176,8 +176,9 @@

:host(.input-disabled) {
// color for the text within the input
--color: #{globals.$ion-primitives-neutral-400};
--color: #{globals.$ion-primitives-neutral-500};
--background: #{globals.$ion-primitives-neutral-100};
--border-color: #{globals.$ion-primitives-neutral-300};

pointer-events: none;
}
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions core/src/components/textarea/textarea.ionic.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
// --------------------------------------------------

:host {
--border-color: #{globals.$ion-primitives-neutral-500};
--color: #{globals.$ion-primitives-neutral-1200};
--highlight-color-valid: #{globals.$ion-semantics-success-base};
--highlight-color-invalid: #{globals.$ion-semantics-danger-base};
Expand Down
14 changes: 13 additions & 1 deletion core/src/components/textarea/textarea.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -547,6 +547,17 @@ export class Textarea implements ComponentInterface {
return this.label !== undefined || this.labelSlot !== null;
}

private getFill(): string | undefined {
const theme = getIonTheme(this);
const { fill } = this;

if (theme === 'ionic' && fill === undefined) {
return 'outline';
}

return fill;
}

private getShape(): string | undefined {
const theme = getIonTheme(this);
const { shape } = this;
Expand Down Expand Up @@ -665,7 +676,8 @@ export class Textarea implements ComponentInterface {
}

render() {
const { inputId, disabled, fill, size, labelPlacement, el, hasFocus } = this;
const { inputId, disabled, size, labelPlacement, el, hasFocus } = this;
const fill = this.getFill();
const theme = getIonTheme(this);
const shape = this.getShape();
const value = this.getValue();
Expand Down
Loading