From b9fbe4e47679eb0a8136bcf08ce4a6627a31e277 Mon Sep 17 00:00:00 2001 From: louiscklaw Date: Sun, 8 Jun 2025 19:07:38 +0800 Subject: [PATCH] update demo-react-marvel-app, --- .../src/pages/DemoReactMarvelApp/index.tsx | 2 +- .../pages/{Home.css => Home.scss} | 26 +- .../pages/DemoReactMarvelApp/pages/Home.tsx | 2 +- .../pages/ViewCharacter.module.scss | 61 ++--- .../DemoReactMarvelApp/theme/variables.scss | 245 ------------------ 5 files changed, 41 insertions(+), 295 deletions(-) rename 03_source/mobile/src/pages/DemoReactMarvelApp/pages/{Home.css => Home.scss} (60%) diff --git a/03_source/mobile/src/pages/DemoReactMarvelApp/index.tsx b/03_source/mobile/src/pages/DemoReactMarvelApp/index.tsx index 30aff92..fd4f0e2 100644 --- a/03_source/mobile/src/pages/DemoReactMarvelApp/index.tsx +++ b/03_source/mobile/src/pages/DemoReactMarvelApp/index.tsx @@ -12,7 +12,7 @@ import Info from './pages/Info'; function DemoReactMarvelApp() { return ( - + diff --git a/03_source/mobile/src/pages/DemoReactMarvelApp/pages/Home.css b/03_source/mobile/src/pages/DemoReactMarvelApp/pages/Home.scss similarity index 60% rename from 03_source/mobile/src/pages/DemoReactMarvelApp/pages/Home.css rename to 03_source/mobile/src/pages/DemoReactMarvelApp/pages/Home.scss index 5d95270..e7fd6ce 100644 --- a/03_source/mobile/src/pages/DemoReactMarvelApp/pages/Home.css +++ b/03_source/mobile/src/pages/DemoReactMarvelApp/pages/Home.scss @@ -1,32 +1,30 @@ -.character-container { - +.demo-react-marvel-app { + .character-container { position: relative; text-align: center; color: white; -} -.character-name-container { - + } + .character-name-container { display: flex; flex-direction: row; justify-content: space-between; align-items: center; align-content: center; - position:absolute; + position: absolute; z-index: 99999; - background-color: rgba(0,0,0,0.7); + background-color: rgba(0, 0, 0, 0.7); bottom: 0; width: 100%; padding-left: 1rem; padding-right: 1rem; -} - -.character-name-container ion-icon { + } + .character-name-container ion-icon { margin-top: 0.5rem; -} - -.character-name-container ion-label { + } + .character-name-container ion-label { font-size: 1rem; font-weight: 500; -} \ No newline at end of file + } +} diff --git a/03_source/mobile/src/pages/DemoReactMarvelApp/pages/Home.tsx b/03_source/mobile/src/pages/DemoReactMarvelApp/pages/Home.tsx index 722f593..795d440 100644 --- a/03_source/mobile/src/pages/DemoReactMarvelApp/pages/Home.tsx +++ b/03_source/mobile/src/pages/DemoReactMarvelApp/pages/Home.tsx @@ -15,7 +15,7 @@ import { useIonRouter, } from '@ionic/react'; -import './Home.css'; +import './Home.scss'; import { addOutline, chevronBackOutline, diff --git a/03_source/mobile/src/pages/DemoReactMarvelApp/pages/ViewCharacter.module.scss b/03_source/mobile/src/pages/DemoReactMarvelApp/pages/ViewCharacter.module.scss index d0a9f20..cf5db86 100644 --- a/03_source/mobile/src/pages/DemoReactMarvelApp/pages/ViewCharacter.module.scss +++ b/03_source/mobile/src/pages/DemoReactMarvelApp/pages/ViewCharacter.module.scss @@ -1,59 +1,52 @@ .characterContainer { - - position: relative; - text-align: center; - color: white; + position: relative; + text-align: center; + color: white; } ion-item { - --padding-start: 0; - --inner-padding-end: 0; + --padding-start: 0; + --inner-padding-end: 0; } ion-label { - margin-top: 12px; - margin-bottom: 12px; + margin-top: 12px; + margin-bottom: 12px; } .characterNameContainer { - - display: flex; - flex-direction: row; - justify-content: center; - position: absolute; - z-index: 99999; - background-color: rgba(0, 0, 0, 0.7); - bottom: 0; - width: 100%; + display: flex; + flex-direction: row; + justify-content: center; + position: absolute; + z-index: 99999; + background-color: rgba(0, 0, 0, 0.7); + bottom: 0; + width: 100%; } .characterNameContainer ion-label { - - font-size: 1rem !important; - font-weight: 500; + font-size: 1rem !important; + font-weight: 500; } .characterStats { - - text-align: center; - margin-top: 1.5rem; - margin-bottom: 1.5rem; + text-align: center; + margin-top: 1.5rem; + margin-bottom: 1.5rem; } .characterStat { - - background-color: var(--ion-color-primary); - padding: 1rem; + background-color: var(--ion-color-primary); + padding: 1rem; } .characterStat ion-card-title { - - font-size: 1rem; - --color: white; + font-size: 1rem; + --color: white; } .characterStat ion-card-subtitle { - - font-size: 1rem; - --color: white; -} \ No newline at end of file + font-size: 1rem; + --color: white; +} diff --git a/03_source/mobile/src/pages/DemoReactMarvelApp/theme/variables.scss b/03_source/mobile/src/pages/DemoReactMarvelApp/theme/variables.scss index b5444bd..e69de29 100644 --- a/03_source/mobile/src/pages/DemoReactMarvelApp/theme/variables.scss +++ b/03_source/mobile/src/pages/DemoReactMarvelApp/theme/variables.scss @@ -1,245 +0,0 @@ -.demo-react-marvel-app { - /* Ionic Variables and Theming. For more info, please see: -http://ionicframework.com/docs/theming/ */ - - /** Ionic CSS Variables **/ - :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; - } - - /* @media (prefers-color-scheme: dark) { */ - /* - * Dark Colors - * ------------------------------------------- - */ - - body { - --ion-color-primary: #ee0000; - --ion-color-primary-rgb: 66, 140, 255; - --ion-color-primary-contrast: #ffffff; - --ion-color-primary-contrast-rgb: 255, 255, 255; - --ion-color-primary-shade: #3a7be0; - --ion-color-primary-tint: #5598ff; - - --ion-color-secondary: #50c8ff; - --ion-color-secondary-rgb: 80, 200, 255; - --ion-color-secondary-contrast: #ffffff; - --ion-color-secondary-contrast-rgb: 255, 255, 255; - --ion-color-secondary-shade: #46b0e0; - --ion-color-secondary-tint: #62ceff; - - --ion-color-tertiary: #6a64ff; - --ion-color-tertiary-rgb: 106, 100, 255; - --ion-color-tertiary-contrast: #ffffff; - --ion-color-tertiary-contrast-rgb: 255, 255, 255; - --ion-color-tertiary-shade: #5d58e0; - --ion-color-tertiary-tint: #7974ff; - - --ion-color-success: #2fdf75; - --ion-color-success-rgb: 47, 223, 117; - --ion-color-success-contrast: #000000; - --ion-color-success-contrast-rgb: 0, 0, 0; - --ion-color-success-shade: #29c467; - --ion-color-success-tint: #44e283; - - --ion-color-warning: #ffd534; - --ion-color-warning-rgb: 255, 213, 52; - --ion-color-warning-contrast: #000000; - --ion-color-warning-contrast-rgb: 0, 0, 0; - --ion-color-warning-shade: #e0bb2e; - --ion-color-warning-tint: #ffd948; - - --ion-color-danger: #ee0000; - --ion-color-danger-rgb: 255, 73, 97; - --ion-color-danger-contrast: #ffffff; - --ion-color-danger-contrast-rgb: 255, 255, 255; - --ion-color-danger-shade: #e04055; - --ion-color-danger-tint: #ff5b71; - - --ion-color-dark: #f4f5f8; - --ion-color-dark-rgb: 244, 245, 248; - --ion-color-dark-contrast: #000000; - --ion-color-dark-contrast-rgb: 0, 0, 0; - --ion-color-dark-shade: #d7d8da; - --ion-color-dark-tint: #f5f6f9; - - --ion-color-medium: #989aa2; - --ion-color-medium-rgb: 152, 154, 162; - --ion-color-medium-contrast: #000000; - --ion-color-medium-contrast-rgb: 0, 0, 0; - --ion-color-medium-shade: #86888f; - --ion-color-medium-tint: #a2a4ab; - - --ion-color-light: #222428; - --ion-color-light-rgb: 34, 36, 40; - --ion-color-light-contrast: #ffffff; - --ion-color-light-contrast-rgb: 255, 255, 255; - --ion-color-light-shade: #1e2023; - --ion-color-light-tint: #383a3e; - } - - /* - * iOS Dark Theme - * ------------------------------------------- - */ - - .ios body { - --ion-background-color: #000000; - --ion-background-color-rgb: 0, 0, 0; - - --ion-text-color: #ffffff; - --ion-text-color-rgb: 255, 255, 255; - - --ion-color-step-50: #0d0d0d; - --ion-color-step-100: #1a1a1a; - --ion-color-step-150: #262626; - --ion-color-step-200: #333333; - --ion-color-step-250: #404040; - --ion-color-step-300: #4d4d4d; - --ion-color-step-350: #595959; - --ion-color-step-400: #666666; - --ion-color-step-450: #737373; - --ion-color-step-500: #808080; - --ion-color-step-550: #8c8c8c; - --ion-color-step-600: #999999; - --ion-color-step-650: #a6a6a6; - --ion-color-step-700: #b3b3b3; - --ion-color-step-750: #bfbfbf; - --ion-color-step-800: #cccccc; - --ion-color-step-850: #d9d9d9; - --ion-color-step-900: #e6e6e6; - --ion-color-step-950: #f2f2f2; - - --ion-item-background: #000000; - - --ion-card-background: #1c1c1d; - } - - .ios ion-modal { - --ion-background-color: var(--ion-color-step-100); - --ion-toolbar-background: var(--ion-color-step-150); - --ion-toolbar-border-color: var(--ion-color-step-250); - } - - /* - * Material Design Dark Theme - * ------------------------------------------- - */ - - .md body { - --ion-background-color: #121212; - --ion-background-color-rgb: 18, 18, 18; - - --ion-text-color: #ffffff; - --ion-text-color-rgb: 255, 255, 255; - - --ion-border-color: #222222; - - --ion-color-step-50: #1e1e1e; - --ion-color-step-100: #2a2a2a; - --ion-color-step-150: #363636; - --ion-color-step-200: #414141; - --ion-color-step-250: #4d4d4d; - --ion-color-step-300: #595959; - --ion-color-step-350: #656565; - --ion-color-step-400: #717171; - --ion-color-step-450: #7d7d7d; - --ion-color-step-500: #898989; - --ion-color-step-550: #949494; - --ion-color-step-600: #a0a0a0; - --ion-color-step-650: #acacac; - --ion-color-step-700: #b8b8b8; - --ion-color-step-750: #c4c4c4; - --ion-color-step-800: #d0d0d0; - --ion-color-step-850: #dbdbdb; - --ion-color-step-900: #e7e7e7; - --ion-color-step-950: #f3f3f3; - - --ion-item-background: #1e1e1e; - - --ion-toolbar-background: #1f1f1f; - - --ion-tab-bar-background: #1f1f1f; - - --ion-card-background: #1e1e1e; - } - /* } */ - - .non-link { - text-decoration: none; - } - - .hidden { - display: none; - } -}