diff --git a/core/src/components/toggle/test/bottom-content/toggle.e2e.ts b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts index 306831ad2f0..55cb1c3dcbf 100644 --- a/core/src/components/toggle/test/bottom-content/toggle.e2e.ts +++ b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts @@ -89,7 +89,7 @@ configs({ modes: ['ios'], directions: ['ltr'] }).forEach(({ title, config }) => /** * Rendering is different across modes */ -configs({ modes: ['ios', 'md'], directions: ['ltr'] }).forEach(({ title, screenshot, config }) => { +configs({ modes: ['ios', 'md', 'ionic-md'], directions: ['ltr'] }).forEach(({ title, screenshot, config }) => { test.describe(title('toggle: helper text rendering'), () => { // Check the default label placement, end, and stacked [undefined, 'end', 'stacked'].forEach((labelPlacement) => { diff --git a/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-error-text-ionic-md-ltr-light-Mobile-Chrome-linux.png b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-error-text-ionic-md-ltr-light-Mobile-Chrome-linux.png new file mode 100644 index 00000000000..2239bf5ca0f Binary files /dev/null and b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-error-text-ionic-md-ltr-light-Mobile-Chrome-linux.png differ diff --git a/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-error-text-ionic-md-ltr-light-Mobile-Firefox-linux.png b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-error-text-ionic-md-ltr-light-Mobile-Firefox-linux.png new file mode 100644 index 00000000000..8d17f7e5866 Binary files /dev/null and b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-error-text-ionic-md-ltr-light-Mobile-Firefox-linux.png differ diff --git a/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-error-text-ionic-md-ltr-light-Mobile-Safari-linux.png b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-error-text-ionic-md-ltr-light-Mobile-Safari-linux.png new file mode 100644 index 00000000000..ec99487076b Binary files /dev/null and b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-error-text-ionic-md-ltr-light-Mobile-Safari-linux.png differ diff --git a/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-error-text-stacked-label-ionic-md-ltr-light-Mobile-Chrome-linux.png b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-error-text-stacked-label-ionic-md-ltr-light-Mobile-Chrome-linux.png new file mode 100644 index 00000000000..2239bf5ca0f Binary files /dev/null and b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-error-text-stacked-label-ionic-md-ltr-light-Mobile-Chrome-linux.png differ diff --git a/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-error-text-stacked-label-ionic-md-ltr-light-Mobile-Firefox-linux.png b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-error-text-stacked-label-ionic-md-ltr-light-Mobile-Firefox-linux.png new file mode 100644 index 00000000000..8d17f7e5866 Binary files /dev/null and b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-error-text-stacked-label-ionic-md-ltr-light-Mobile-Firefox-linux.png differ diff --git a/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-error-text-stacked-label-ionic-md-ltr-light-Mobile-Safari-linux.png b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-error-text-stacked-label-ionic-md-ltr-light-Mobile-Safari-linux.png new file mode 100644 index 00000000000..ec99487076b Binary files /dev/null and b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-error-text-stacked-label-ionic-md-ltr-light-Mobile-Safari-linux.png differ diff --git a/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-end-ionic-md-ltr-light-Mobile-Chrome-linux.png b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-end-ionic-md-ltr-light-Mobile-Chrome-linux.png new file mode 100644 index 00000000000..2e24975d799 Binary files /dev/null and b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-end-ionic-md-ltr-light-Mobile-Chrome-linux.png differ diff --git a/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-end-ionic-md-ltr-light-Mobile-Firefox-linux.png b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-end-ionic-md-ltr-light-Mobile-Firefox-linux.png new file mode 100644 index 00000000000..d20afbc883f Binary files /dev/null and b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-end-ionic-md-ltr-light-Mobile-Firefox-linux.png differ diff --git a/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-end-ionic-md-ltr-light-Mobile-Safari-linux.png b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-end-ionic-md-ltr-light-Mobile-Safari-linux.png new file mode 100644 index 00000000000..188a65f26df Binary files /dev/null and b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-end-ionic-md-ltr-light-Mobile-Safari-linux.png differ diff --git a/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-end-wrapping-ionic-md-ltr-light-Mobile-Chrome-linux.png b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-end-wrapping-ionic-md-ltr-light-Mobile-Chrome-linux.png new file mode 100644 index 00000000000..ff6f236b3b4 Binary files /dev/null and b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-end-wrapping-ionic-md-ltr-light-Mobile-Chrome-linux.png differ diff --git a/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-end-wrapping-ionic-md-ltr-light-Mobile-Firefox-linux.png b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-end-wrapping-ionic-md-ltr-light-Mobile-Firefox-linux.png new file mode 100644 index 00000000000..32d006696b6 Binary files /dev/null and b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-end-wrapping-ionic-md-ltr-light-Mobile-Firefox-linux.png differ diff --git a/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-end-wrapping-ionic-md-ltr-light-Mobile-Safari-linux.png b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-end-wrapping-ionic-md-ltr-light-Mobile-Safari-linux.png new file mode 100644 index 00000000000..d909e34f6a3 Binary files /dev/null and b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-end-wrapping-ionic-md-ltr-light-Mobile-Safari-linux.png differ diff --git a/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-ionic-md-ltr-light-Mobile-Chrome-linux.png b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-ionic-md-ltr-light-Mobile-Chrome-linux.png new file mode 100644 index 00000000000..d5e1fd9dcc2 Binary files /dev/null and b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-ionic-md-ltr-light-Mobile-Chrome-linux.png differ diff --git a/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-ionic-md-ltr-light-Mobile-Firefox-linux.png b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-ionic-md-ltr-light-Mobile-Firefox-linux.png new file mode 100644 index 00000000000..59364b27d71 Binary files /dev/null and b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-ionic-md-ltr-light-Mobile-Firefox-linux.png differ diff --git a/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-ionic-md-ltr-light-Mobile-Safari-linux.png b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-ionic-md-ltr-light-Mobile-Safari-linux.png new file mode 100644 index 00000000000..644625ecb63 Binary files /dev/null and b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-ionic-md-ltr-light-Mobile-Safari-linux.png differ diff --git a/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-stacked-ionic-md-ltr-light-Mobile-Chrome-linux.png b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-stacked-ionic-md-ltr-light-Mobile-Chrome-linux.png new file mode 100644 index 00000000000..d5e1fd9dcc2 Binary files /dev/null and b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-stacked-ionic-md-ltr-light-Mobile-Chrome-linux.png differ diff --git a/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-stacked-ionic-md-ltr-light-Mobile-Firefox-linux.png b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-stacked-ionic-md-ltr-light-Mobile-Firefox-linux.png new file mode 100644 index 00000000000..59364b27d71 Binary files /dev/null and b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-stacked-ionic-md-ltr-light-Mobile-Firefox-linux.png differ diff --git a/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-stacked-ionic-md-ltr-light-Mobile-Safari-linux.png b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-stacked-ionic-md-ltr-light-Mobile-Safari-linux.png new file mode 100644 index 00000000000..644625ecb63 Binary files /dev/null and b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-stacked-ionic-md-ltr-light-Mobile-Safari-linux.png differ diff --git a/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-stacked-wrapping-ionic-md-ltr-light-Mobile-Chrome-linux.png b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-stacked-wrapping-ionic-md-ltr-light-Mobile-Chrome-linux.png new file mode 100644 index 00000000000..4b8d581dedd Binary files /dev/null and b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-stacked-wrapping-ionic-md-ltr-light-Mobile-Chrome-linux.png differ diff --git a/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-stacked-wrapping-ionic-md-ltr-light-Mobile-Firefox-linux.png b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-stacked-wrapping-ionic-md-ltr-light-Mobile-Firefox-linux.png new file mode 100644 index 00000000000..6a0e25b7f15 Binary files /dev/null and b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-stacked-wrapping-ionic-md-ltr-light-Mobile-Firefox-linux.png differ diff --git a/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-stacked-wrapping-ionic-md-ltr-light-Mobile-Safari-linux.png b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-stacked-wrapping-ionic-md-ltr-light-Mobile-Safari-linux.png new file mode 100644 index 00000000000..ecbf8c7a76a Binary files /dev/null and b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-stacked-wrapping-ionic-md-ltr-light-Mobile-Safari-linux.png differ diff --git a/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-wrapping-ionic-md-ltr-light-Mobile-Chrome-linux.png b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-wrapping-ionic-md-ltr-light-Mobile-Chrome-linux.png new file mode 100644 index 00000000000..4b8d581dedd Binary files /dev/null and b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-wrapping-ionic-md-ltr-light-Mobile-Chrome-linux.png differ diff --git a/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-wrapping-ionic-md-ltr-light-Mobile-Firefox-linux.png b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-wrapping-ionic-md-ltr-light-Mobile-Firefox-linux.png new file mode 100644 index 00000000000..6a0e25b7f15 Binary files /dev/null and b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-wrapping-ionic-md-ltr-light-Mobile-Firefox-linux.png differ diff --git a/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-wrapping-ionic-md-ltr-light-Mobile-Safari-linux.png b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-wrapping-ionic-md-ltr-light-Mobile-Safari-linux.png new file mode 100644 index 00000000000..ecbf8c7a76a Binary files /dev/null and b/core/src/components/toggle/test/bottom-content/toggle.e2e.ts-snapshots/toggle-helper-text-wrapping-ionic-md-ltr-light-Mobile-Safari-linux.png differ diff --git a/core/src/components/toggle/toggle.common.scss b/core/src/components/toggle/toggle.common.scss index 1e5ca2cab16..87a0e821b72 100644 --- a/core/src/components/toggle/toggle.common.scss +++ b/core/src/components/toggle/toggle.common.scss @@ -117,21 +117,13 @@ input { // ---------------------------------------------------------------- .toggle-bottom { - @include padding(4px, null, null, null); - display: flex; justify-content: space-between; - font-size: dynamic-font(12px); - white-space: normal; } -:host(.toggle-label-placement-stacked) .toggle-bottom { - font-size: dynamic-font(16px); -} - // Toggle Hint Text // ---------------------------------------------------------------- @@ -142,14 +134,10 @@ input { */ .toggle-bottom .error-text { display: none; - - color: ion-color(danger, base); } .toggle-bottom .helper-text { display: block; - - color: $text-color-step-300; } :host(.ion-touched.ion-invalid) .toggle-bottom .error-text { diff --git a/core/src/components/toggle/toggle.ionic.scss b/core/src/components/toggle/toggle.ionic.scss index a81e5797b2c..ce767b1810c 100644 --- a/core/src/components/toggle/toggle.ionic.scss +++ b/core/src/components/toggle/toggle.ionic.scss @@ -54,6 +54,24 @@ background: globals.current-color(base); } +// Toggle Bottom Content +// ---------------------------------------------------------------- + +.toggle-bottom { + @include globals.typography(globals.$ion-body-md-regular); +} + +// Toggle Hint Text +// ---------------------------------------------------------------- + +.toggle-bottom .error-text { + color: globals.$ion-semantics-danger-800; +} + +.toggle-bottom .helper-text { + color: globals.$ion-primitives-neutral-800; +} + // Toggle Native Wrapper: Focused // ---------------------------------------------------------------- diff --git a/core/src/components/toggle/toggle.native.scss b/core/src/components/toggle/toggle.native.scss index 708eec223ed..b95cf35ff32 100644 --- a/core/src/components/toggle/toggle.native.scss +++ b/core/src/components/toggle/toggle.native.scss @@ -17,6 +17,30 @@ @include margin(null, null, $toggle-item-label-margin-bottom, null); } +// Toggle Bottom Content +// ---------------------------------------------------------------- + +.toggle-bottom { + @include padding(4px, null, null, null); + + font-size: dynamic-font(12px); +} + +:host(.toggle-label-placement-stacked) .toggle-bottom { + font-size: dynamic-font(16px); +} + +// Toggle Hint Text +// ---------------------------------------------------------------- + +.toggle-bottom .error-text { + color: ion-color(danger, base); +} + +.toggle-bottom .helper-text { + color: $text-color-step-300; +} + // Input Label // ----------------------------------------------------------------