From c99444b8270aa6c112fca13e7612cff5a377a7fb Mon Sep 17 00:00:00 2001 From: Amanda Johnston <90629384+amandaejohnston@users.noreply.github.com> Date: Fri, 12 Jan 2024 10:25:51 -0600 Subject: [PATCH] fix(theme): remove hard-coded light mode colors in favor of bundled ones (#1808) --- package-lock.json | 30 +++++++------- package.json | 2 +- src/theme/variables.scss | 90 ---------------------------------------- 3 files changed, 16 insertions(+), 106 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2b2298dfe..c2610ec3c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,7 +27,7 @@ "@capacitor/keyboard": "4.1.1", "@capacitor/splash-screen": "4.1.4", "@capacitor/status-bar": "4.1.1", - "@ionic/angular": "^7.6.2-dev.11704729332.13b412c8", + "@ionic/angular": "^7.6.2-dev.11704998705.1e1f9850", "@ionic/storage-angular": "^4.0.0", "cordova-plugin-inappbrowser": "5.0.0", "core-js": "^3.6.4", @@ -3951,11 +3951,11 @@ "dev": true }, "node_modules/@ionic/angular": { - "version": "7.6.2-dev.11704729332.13b412c8", - "resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-7.6.2-dev.11704729332.13b412c8.tgz", - "integrity": "sha512-H1x788W/zIr9vc0G0sDJgkjgbpvhQEanzqFO5SgQEhCGJQd/J826QLXHGj+BSVfUVwM/SPjb5uJMTm2MD6VQRg==", + "version": "7.6.2-dev.11704998705.1e1f9850", + "resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-7.6.2-dev.11704998705.1e1f9850.tgz", + "integrity": "sha512-3SiUlsgAhVNi4MHxiEFzLaQDIiNGVV8ViAF8/ZTpm/3ukbbJb/+7zJ8xWZlmyjcudropIlAEw5gxErVIvMPTyA==", "dependencies": { - "@ionic/core": "7.6.2-dev.11704729332.13b412c8", + "@ionic/core": "7.6.2-dev.11704998705.1e1f9850", "ionicons": "^7.0.0", "jsonc-parser": "^3.0.0", "tslib": "^2.3.0" @@ -4926,9 +4926,9 @@ "dev": true }, "node_modules/@ionic/core": { - "version": "7.6.2-dev.11704729332.13b412c8", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.6.2-dev.11704729332.13b412c8.tgz", - "integrity": "sha512-n48906/PWgZura8K+Garvibes80E1Lg118P2onwlI898LQV8+xW7ART55x1gx75KiXiC3el0FexBF1HA+hQ2cQ==", + "version": "7.6.2-dev.11704998705.1e1f9850", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.6.2-dev.11704998705.1e1f9850.tgz", + "integrity": "sha512-/Vdrgyq8aFr68KaNrChuejCUGppj+IbwR1CmZm9/S0+w12mtCyVM5+6VVq9CLAVi0YG7m2AK2S5ENtK+hv4Ljw==", "dependencies": { "@stencil/core": "^4.8.2", "ionicons": "^7.2.1", @@ -25768,11 +25768,11 @@ "dev": true }, "@ionic/angular": { - "version": "7.6.2-dev.11704729332.13b412c8", - "resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-7.6.2-dev.11704729332.13b412c8.tgz", - "integrity": "sha512-H1x788W/zIr9vc0G0sDJgkjgbpvhQEanzqFO5SgQEhCGJQd/J826QLXHGj+BSVfUVwM/SPjb5uJMTm2MD6VQRg==", + "version": "7.6.2-dev.11704998705.1e1f9850", + "resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-7.6.2-dev.11704998705.1e1f9850.tgz", + "integrity": "sha512-3SiUlsgAhVNi4MHxiEFzLaQDIiNGVV8ViAF8/ZTpm/3ukbbJb/+7zJ8xWZlmyjcudropIlAEw5gxErVIvMPTyA==", "requires": { - "@ionic/core": "7.6.2-dev.11704729332.13b412c8", + "@ionic/core": "7.6.2-dev.11704998705.1e1f9850", "ionicons": "^7.0.0", "jsonc-parser": "^3.0.0", "tslib": "^2.3.0" @@ -26514,9 +26514,9 @@ } }, "@ionic/core": { - "version": "7.6.2-dev.11704729332.13b412c8", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.6.2-dev.11704729332.13b412c8.tgz", - "integrity": "sha512-n48906/PWgZura8K+Garvibes80E1Lg118P2onwlI898LQV8+xW7ART55x1gx75KiXiC3el0FexBF1HA+hQ2cQ==", + "version": "7.6.2-dev.11704998705.1e1f9850", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.6.2-dev.11704998705.1e1f9850.tgz", + "integrity": "sha512-/Vdrgyq8aFr68KaNrChuejCUGppj+IbwR1CmZm9/S0+w12mtCyVM5+6VVq9CLAVi0YG7m2AK2S5ENtK+hv4Ljw==", "requires": { "@stencil/core": "^4.8.2", "ionicons": "^7.2.1", diff --git a/package.json b/package.json index 8df2ffe0b..84afe7a82 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "@capacitor/keyboard": "4.1.1", "@capacitor/splash-screen": "4.1.4", "@capacitor/status-bar": "4.1.1", - "@ionic/angular": "^7.6.2-dev.11704729332.13b412c8", + "@ionic/angular": "^7.6.2-dev.11704998705.1e1f9850", "@ionic/storage-angular": "^4.0.0", "cordova-plugin-inappbrowser": "5.0.0", "core-js": "^3.6.4", diff --git a/src/theme/variables.scss b/src/theme/variables.scss index 1d9ca7ae6..58d9ec6ff 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -5,96 +5,6 @@ * https://www.ionicframework.com/docs/theming/ */ -/* - * Ionic Colors - * ---------------------------------------------------------------------------- - * Named colors make it easy to reuse colors on various components. - * It's highly recommended to change the default colors - * to match your app's branding. Ionic provides nine layered colors - * that can be changed to theme an app. Additional colors can be - * added as well (see below). For more information, please see - * https://www.ionicframework.com/docs/theming/colors - * - * To easily create custom color palettes for your app’s UI, - * check out our color generator: - * https://www.ionicframework.com/docs/theming/color-generator - */ - - :root { - /** primary **/ - --ion-color-primary: #3880ff; - --ion-color-primary-rgb: 56, 128, 255; - --ion-color-primary-contrast: #ffffff; - --ion-color-primary-contrast-rgb: 255, 255, 255; - --ion-color-primary-shade: #3171e0; - --ion-color-primary-tint: #4c8dff; - - /** secondary **/ - --ion-color-secondary: #3dc2ff; - --ion-color-secondary-rgb: 61, 194, 255; - --ion-color-secondary-contrast: #ffffff; - --ion-color-secondary-contrast-rgb: 255, 255, 255; - --ion-color-secondary-shade: #36abe0; - --ion-color-secondary-tint: #50c8ff; - - /** tertiary **/ - --ion-color-tertiary: #5260ff; - --ion-color-tertiary-rgb: 82, 96, 255; - --ion-color-tertiary-contrast: #ffffff; - --ion-color-tertiary-contrast-rgb: 255, 255, 255; - --ion-color-tertiary-shade: #4854e0; - --ion-color-tertiary-tint: #6370ff; - - /** success **/ - --ion-color-success: #2dd36f; - --ion-color-success-rgb: 45, 211, 111; - --ion-color-success-contrast: #ffffff; - --ion-color-success-contrast-rgb: 255, 255, 255; - --ion-color-success-shade: #28ba62; - --ion-color-success-tint: #42d77d; - - /** warning **/ - --ion-color-warning: #ffc409; - --ion-color-warning-rgb: 255, 196, 9; - --ion-color-warning-contrast: #000000; - --ion-color-warning-contrast-rgb: 0, 0, 0; - --ion-color-warning-shade: #e0ac08; - --ion-color-warning-tint: #ffca22; - - /** danger **/ - --ion-color-danger: #eb445a; - --ion-color-danger-rgb: 235, 68, 90; - --ion-color-danger-contrast: #ffffff; - --ion-color-danger-contrast-rgb: 255, 255, 255; - --ion-color-danger-shade: #cf3c4f; - --ion-color-danger-tint: #ed576b; - - /** dark **/ - --ion-color-dark: #222428; - --ion-color-dark-rgb: 34, 36, 40; - --ion-color-dark-contrast: #ffffff; - --ion-color-dark-contrast-rgb: 255, 255, 255; - --ion-color-dark-shade: #1e2023; - --ion-color-dark-tint: #383a3e; - - /** medium **/ - --ion-color-medium: #92949c; - --ion-color-medium-rgb: 146, 148, 156; - --ion-color-medium-contrast: #ffffff; - --ion-color-medium-contrast-rgb: 255, 255, 255; - --ion-color-medium-shade: #808289; - --ion-color-medium-tint: #9d9fa6; - - /** light **/ - --ion-color-light: #f4f5f8; - --ion-color-light-rgb: 244, 245, 248; - --ion-color-light-contrast: #000000; - --ion-color-light-contrast-rgb: 0, 0, 0; - --ion-color-light-shade: #d7d8da; - --ion-color-light-tint: #f5f6f9; -} - - /* * Additional Ionic Colors * ----------------------------------------------------------------------------