From 3a2c62eb94997cae0563685484d6b3259a0783b2 Mon Sep 17 00:00:00 2001 From: msdio Date: Fri, 23 Dec 2022 23:17:54 +0900 Subject: [PATCH] =?UTF-8?q?[fix]=20=ED=99=94=EC=9E=A5=EC=8B=A4=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=EB=AA=A8=EB=8B=AC=EC=9D=B4=20=EC=9E=98=EB=A0=A4?= =?UTF-8?q?=EC=84=9C=20=EB=82=98=EC=98=A4=EB=8D=98=20=ED=98=84=EC=83=81=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bathroom-detail.component.html | 2 +- .../src/app/tabs/main-tab/main.page.scss | 4 - .../src/app/tabs/main-tab/main.page.ts | 2 +- .../app/tabs/profile-tab/profile.page.html | 2 +- .../app/tabs/profile-tab/profile.page.scss | 156 +++++++++--------- .../app/tabs/setting-tab/setting.page.html | 4 +- .../app/tabs/setting-tab/setting.page.scss | 4 + 7 files changed, 87 insertions(+), 87 deletions(-) diff --git a/src/frontend/odongdong/src/app/components/bathroom-detail/bathroom-detail.component.html b/src/frontend/odongdong/src/app/components/bathroom-detail/bathroom-detail.component.html index 94bb1aa..b5c4991 100644 --- a/src/frontend/odongdong/src/app/components/bathroom-detail/bathroom-detail.component.html +++ b/src/frontend/odongdong/src/app/components/bathroom-detail/bathroom-detail.component.html @@ -8,7 +8,7 @@

{{ bathroomName }}

diff --git a/src/frontend/odongdong/src/app/tabs/main-tab/main.page.scss b/src/frontend/odongdong/src/app/tabs/main-tab/main.page.scss index 8f3d663..115334f 100644 --- a/src/frontend/odongdong/src/app/tabs/main-tab/main.page.scss +++ b/src/frontend/odongdong/src/app/tabs/main-tab/main.page.scss @@ -103,7 +103,3 @@ background: var(--bg_white); border-radius: 12px; } - -.add-bathroom-compo { - width: 100%; -} diff --git a/src/frontend/odongdong/src/app/tabs/main-tab/main.page.ts b/src/frontend/odongdong/src/app/tabs/main-tab/main.page.ts index 5e2fc5e..9184fcc 100644 --- a/src/frontend/odongdong/src/app/tabs/main-tab/main.page.ts +++ b/src/frontend/odongdong/src/app/tabs/main-tab/main.page.ts @@ -506,7 +506,7 @@ export class MainPage implements OnInit { const modal = await this.modalController.create({ component: AddBathroomComponent, - cssClass: 'add-bathroom-compo', + cssClass: 'add-bathroom-modal', componentProps: { lat, lng, diff --git a/src/frontend/odongdong/src/app/tabs/profile-tab/profile.page.html b/src/frontend/odongdong/src/app/tabs/profile-tab/profile.page.html index 7932da1..0bd4f1e 100644 --- a/src/frontend/odongdong/src/app/tabs/profile-tab/profile.page.html +++ b/src/frontend/odongdong/src/app/tabs/profile-tab/profile.page.html @@ -23,7 +23,7 @@
- +
총 {{registeredCount || ' ? '}}개 화장실 등록한 화장실의 수 diff --git a/src/frontend/odongdong/src/app/tabs/profile-tab/profile.page.scss b/src/frontend/odongdong/src/app/tabs/profile-tab/profile.page.scss index 51c4a94..26efea2 100644 --- a/src/frontend/odongdong/src/app/tabs/profile-tab/profile.page.scss +++ b/src/frontend/odongdong/src/app/tabs/profile-tab/profile.page.scss @@ -1,116 +1,116 @@ ion-toolbar { - --border-style: none; + --border-style: none; } ion-title { - color: var(--outline_gray); - font-weight: bold; + color: var(--outline_gray); + font-weight: bold; } .profile__title { - margin-left: 20px; - margin-top: 33px; + margin-left: 20px; + margin-top: 33px; - font-size: 32px; + font-size: 32px; - p { - margin: 0; - } + p { + margin: 0; + } - &--name { - color: var(--primary_blue); - } + &--name { + color: var(--primary_blue); + } } .profile__title p:last-child { - margin-top: 5px; + margin-top: 5px; - font-weight: bold; - - span { font-weight: bold; - } + + span { + font-weight: bold; + } } .profile-image { - &__container { - width: 100%; - height: fit-content; - align-items: center; - justify-content: center; - text-align: center; - - margin-top: 40px; - } - - &__image { - width: 140px; - height: 140px; - object-fit: cover; - - border: 4px solid var(--primary_blue); - border-radius: 50%; - - padding: 2px; - } - - &__button { - width: 140px; - height: 140px; - align-items: center; - justify-content: center; - text-align: center; - - border: 4px solid var(--primary_blue); - border-radius: 100%; - - background-color: var(--primary_blue); - color: var(--bg_white); - } + &__container { + width: 100%; + height: fit-content; + align-items: center; + justify-content: center; + text-align: center; + + margin-top: 40px; + } + + &__image { + width: 140px; + height: 140px; + object-fit: cover; + + border: 4px solid var(--primary_blue); + border-radius: 50%; + + padding: 2px; + } + + &__button { + width: 140px; + height: 140px; + align-items: center; + justify-content: center; + text-align: center; + + border: 4px solid var(--primary_blue); + border-radius: 100%; + + background-color: var(--primary_blue); + color: var(--bg_white); + } } ion-list { - margin-top: 30px; + margin-top: 30px; } ion-item { - cursor: pointer; + cursor: pointer; - div { - width: 100%; - margin: 0; + div { + width: 100%; + margin: 0; - padding: 18px 15px; + padding: 18px 15px; - border-radius: 10px; + border-radius: 10px; - ion-label:first-child { - font-weight: bold; - font-size: 16px; + ion-label:first-child { + font-weight: bold; + font-size: 16px; - margin-bottom: 3px; - } - ion-label:last-child { - font-size: 14px; - color: var(--outline_gray); + margin-bottom: 3px; + } + ion-label:last-child { + font-size: 14px; + color: var(--outline_gray); + } } - } - div:active { - background: var(--light_gray); - } + div:active { + background: var(--light_gray); + } } #achievement { - cursor: default; - background: var(--secondary_container_blue); + cursor: pointer; + background: var(--secondary_container_blue); - ion-label:first-child { - color: var(--primary_blue); - } + ion-label:first-child { + color: var(--primary_blue); + } } .chevron-right { - width: 15px; - height: 15px; + width: 15px; + height: 15px; - margin-right: 20px; + margin-right: 20px; } diff --git a/src/frontend/odongdong/src/app/tabs/setting-tab/setting.page.html b/src/frontend/odongdong/src/app/tabs/setting-tab/setting.page.html index 4cfe21d..d2971cb 100644 --- a/src/frontend/odongdong/src/app/tabs/setting-tab/setting.page.html +++ b/src/frontend/odongdong/src/app/tabs/setting-tab/setting.page.html @@ -22,13 +22,13 @@

버전: {{appVersion}}

-
+
policy

약관 및 정책

-
+
customer-service

문의하기

diff --git a/src/frontend/odongdong/src/app/tabs/setting-tab/setting.page.scss b/src/frontend/odongdong/src/app/tabs/setting-tab/setting.page.scss index 3b0faa0..f61df0e 100644 --- a/src/frontend/odongdong/src/app/tabs/setting-tab/setting.page.scss +++ b/src/frontend/odongdong/src/app/tabs/setting-tab/setting.page.scss @@ -44,3 +44,7 @@ ion-toolbar { display: flex; } } + +.pointer { + cursor: pointer; +}