diff --git a/src/components/HeaderTitle.vue b/src/components/HeaderTitle.vue index a826a53..477480d 100644 --- a/src/components/HeaderTitle.vue +++ b/src/components/HeaderTitle.vue @@ -2,12 +2,11 @@ import { ref } from 'vue' import { useRouter } from 'vue-router' import MyEvent from '@/utils/myEvent' - + const router = useRouter() - defineProps({ - title: { type: String, default: 'STYLING ASSISTANT' }, + title: { type: String, default: 'STYLING ASSISTANT' } }) const emit = defineEmits(['clickReturn', 'clickProfile']) @@ -16,7 +15,7 @@ const handleProfileVisibleChange = (visible) => { profileVisible.value = visible } - MyEvent.add('change-profile-visible',handleProfileVisibleChange) + MyEvent.add('change-profile-visible', handleProfileVisibleChange) const handleClickReturn = () => { router.back() @@ -61,6 +60,7 @@ color: #2c2c2c; font-family: 'satoshiRegular'; font-size: 4rem; + letter-spacing: 0.3rem; } > .profile { position: absolute; diff --git a/src/views/Workshop/customize.vue b/src/views/Workshop/customize.vue index 7595a05..8e6cf90 100644 --- a/src/views/Workshop/customize.vue +++ b/src/views/Workshop/customize.vue @@ -234,7 +234,7 @@ margin-top: 5rem; width: 73rem; height: 109.5rem; - border-radius: 2rem; + border-radius: 1rem; // box-shadow: 1.3rem 1.4rem 2rem 0.2rem #0000004d; border: 0.2rem solid #d9d9d9; overflow: hidden; @@ -272,14 +272,13 @@ } > .icons { - bottom: 0.27rem; + bottom: 3.6rem; right: 0; - height: 10rem; display: flex; align-items: center; justify-content: center; > div { - margin-right: 1.5rem; + margin-right: 2.4rem; width: 6.2rem; height: 6.2rem; border-radius: 1rem; @@ -299,13 +298,13 @@ justify-content: space-between; > button { padding: 0; - font-family: satoshiRegular; + font-family: satoshiMedium; border: none; width: 34rem; height: 9.2rem; - border-radius: 1.3rem; - font-weight: 400; - font-size: 3.8rem; + border-radius: 1rem; + font-weight: 500; + font-size: 4rem; &:active { opacity: 0.7; } @@ -325,7 +324,7 @@ background-color: #fff; background-clip: padding-box; border: 0.25rem solid transparent; - border-radius: 1.3rem; + border-radius: 1rem; } } > :first-child.finish { diff --git a/src/views/Workshop/end.vue b/src/views/Workshop/end.vue index 07306ad..df09a9e 100644 --- a/src/views/Workshop/end.vue +++ b/src/views/Workshop/end.vue @@ -13,7 +13,9 @@
Thank you.
- We are starting to learn your preferences, Looking forward to see you again, + We are starting to learn your preferences, +
+ Looking forward to see you again,
@@ -33,21 +35,19 @@ background-size: cover; > .content { position: absolute; - top: 12.9rem; - left: 6rem; - // width: 100%; + top: 15.4rem; + left: 9.6rem; display: flex; flex-direction: column; > .title { font-family: satoshiBold; - font-size: 14.7rem; + font-size: 11rem; line-height: 124%; } > .tip { margin-top: 2.5rem; - width: 58.2rem; font-family: satoshiRegular; - font-size: 4.1rem; + font-size: 4rem; line-height: 132%; } } diff --git a/src/views/Workshop/library.vue b/src/views/Workshop/library.vue index 2a6fefa..acc319a 100644 --- a/src/views/Workshop/library.vue +++ b/src/views/Workshop/library.vue @@ -117,7 +117,7 @@ > .title { font-family: satoshiBold; - font-size: 8.9rem; + font-size: 8.6rem; text-align: left; line-height: 124%; margin: 5rem 9.1rem; @@ -160,41 +160,33 @@ display: flex; flex-direction: column; height: 90%; - > .userID { - font-family: satoshiRegular; - font-weight: 500; - font-size: 3.8rem; - line-height: 89%; - color: #000; - } > .datetime { - margin-top: 1.8rem; - font-family: satoshiRegular; - font-weight: 400; + margin-top: 1rem; + font-family: satoshiMedium; + font-weight: 500; font-size: 3.2rem; line-height: 89%; color: #000; } > .lastopened { - margin-top: 1rem; + margin-top: 1.8rem; font-family: satoshiRegular; font-weight: 400; - font-style: Regular; font-size: 2.6rem; line-height: 89%; color: #6f6f6f; } > button { margin-top: auto; + font-family: satoshiRegular; width: 12.3rem; height: 3.8rem; - border-radius: 0.5rem; - box-sizing: content-box; - border: 0.193rem solid #000; + line-height: 100%; + border-radius: 0.4rem; + border: 0.2rem solid #000; background: transparent; - font-family: satoshiRegular; font-weight: 400; - font-size: 2.576rem; + font-size: 2.4rem; color: #000; margin-right: 5rem; &:active { @@ -208,8 +200,8 @@ right: 2rem; width: 5.5rem; height: 5.5rem; - border: 0.188rem solid #000; - border-radius: 1.88rem; + border: 0.188rem solid rgba(0, 0, 0, 0.5); + border-radius: 0.9rem; display: flex; align-items: center; justify-content: center;