diff --git a/com.twin.app.shoptime/assets/fonts/lgfont/LGSmartUI-Light.woff b/com.twin.app.shoptime/assets/fonts/lgfont/LGSmartUI-Light.woff deleted file mode 100644 index b3095d2d..00000000 Binary files a/com.twin.app.shoptime/assets/fonts/lgfont/LGSmartUI-Light.woff and /dev/null differ diff --git a/com.twin.app.shoptime/src/components/MobileSend/MobileSendPopUp.module.less b/com.twin.app.shoptime/src/components/MobileSend/MobileSendPopUp.module.less index 4e849a43..3c04eb91 100644 --- a/com.twin.app.shoptime/src/components/MobileSend/MobileSendPopUp.module.less +++ b/com.twin.app.shoptime/src/components/MobileSend/MobileSendPopUp.module.less @@ -38,14 +38,15 @@ .smsTitle { text-align: left; font-size: 36px; - font-family: @baseFontBold; + font-weight: bold; line-height: normal; color: @COLOR_BLACK; padding: 30px 60px; } .subTitle { text-align: left; - .font(@fontFamily:@baseFont,@fontSize: 28px); + font-weight: normal; + font-size: 28px; color: @COLOR_GRAY06; padding: 10px 60px 20px 60px; text-align: left; @@ -56,7 +57,8 @@ } .price { padding: 7px 60px 20px 60px; - .font(@baseFontBold,@fontSize:28px); + font-size: 28px; + font-weight: bold; color: @PRIMARY_COLOR_RED; } } @@ -74,7 +76,8 @@ .border-solid(@size:1px,#cccccc); height: 68px; cursor: text; - .font(@fontFamily:@baseFont,@fontSize: 28px); + font-weight: normal; + font-size: 28px; &::after { content: ""; width: 2px; @@ -92,7 +95,8 @@ margin-right: 80px; line-height: 1.3; letter-spacing: -0.2px; - .font(@fontFamily:@baseFont,@fontSize: 24px); + font-weight: normal; + font-size: 24px; text-align: left; color: @COLOR_GRAY06; display: flex; diff --git a/com.twin.app.shoptime/src/components/MobileSend/SMSNumKeyPad.module.less b/com.twin.app.shoptime/src/components/MobileSend/SMSNumKeyPad.module.less index 08316ac1..b90d8fda 100644 --- a/com.twin.app.shoptime/src/components/MobileSend/SMSNumKeyPad.module.less +++ b/com.twin.app.shoptime/src/components/MobileSend/SMSNumKeyPad.module.less @@ -8,7 +8,8 @@ .border-solid(@size:1px,#cccccc); height: 100%; cursor: text; - .font(@fontFamily:@baseFont,@fontSize: 28px); + font-weight: normal; + font-size: 28px; } .btnContainer { width: 441px; diff --git a/com.twin.app.shoptime/src/components/SectionTitle/SectionTitle.module.less b/com.twin.app.shoptime/src/components/SectionTitle/SectionTitle.module.less index 8b66caec..38953803 100644 --- a/com.twin.app.shoptime/src/components/SectionTitle/SectionTitle.module.less +++ b/com.twin.app.shoptime/src/components/SectionTitle/SectionTitle.module.less @@ -4,7 +4,8 @@ .sectionTitle { .flex(@justifyCenter: flex-start); min-height: 50px; - .font(@fontFamily: @baseFontBold, @fontSize: 42px); + font-weight: bold; + font-size: 42px; color: @COLOR_GRAY08; &::before { diff --git a/com.twin.app.shoptime/src/components/TButton/TButton.module.less b/com.twin.app.shoptime/src/components/TButton/TButton.module.less index e2e04111..fc54b004 100644 --- a/com.twin.app.shoptime/src/components/TButton/TButton.module.less +++ b/com.twin.app.shoptime/src/components/TButton/TButton.module.less @@ -10,7 +10,8 @@ background-color: #7a808d; color: @COLOR_WHITE; border-radius: 12px; - .font (@baseFontBold, 30px); + font-weight: bold; + font-size: 30px; transition: all 0.1s ease; padding: 0 12px; @@ -170,7 +171,8 @@ padding: 24px 30px; background-color: @COLOR_WHITE; border-radius: 42px; - .font(@fontFamily: @baseFontBold, @fontSize: 30px); + font-size: 30px; + font-weight: bold; line-height: normal; color: @COLOR_GRAY08; @@ -201,7 +203,8 @@ padding: 18px 30px; background-color: @COLOR_WHITE; border-radius: 12px; - .font(@fontFamily: @baseFont, @fontSize: 30px); + font-weight: normal; + font-size: 30px; color: @COLOR_GRAY08; > div { @@ -209,7 +212,7 @@ } &:focus { - font-family: @baseFontBold; + font-weight: bold; color: @PRIMARY_COLOR_RED; &::after { @@ -250,7 +253,8 @@ padding: 24px 30px 24px 90px; background-color: @COLOR_WHITE; border-radius: 42px; - .font(@fontFamily: @baseFontBold, @fontSize: 30px); + font-size: 30px; + font-weight: bold; line-height: normal; color: @COLOR_GRAY08; diff --git a/com.twin.app.shoptime/src/components/TButtonTab/TButtonTabItem.module.less b/com.twin.app.shoptime/src/components/TButtonTab/TButtonTabItem.module.less index 1ebf629f..1e294fb9 100644 --- a/com.twin.app.shoptime/src/components/TButtonTab/TButtonTabItem.module.less +++ b/com.twin.app.shoptime/src/components/TButtonTab/TButtonTabItem.module.less @@ -16,7 +16,8 @@ padding: 0 12px; .title { - .font(@fontFamily: @baseFontBold, @fontSize: 24px); + font-size: 24px; + font-weight: bold; color: @COLOR_GRAY03; width: 100%; height: 100%; diff --git a/com.twin.app.shoptime/src/components/TDropDown/TDropDown.module.less b/com.twin.app.shoptime/src/components/TDropDown/TDropDown.module.less index cc690aac..6dbe3bf2 100644 --- a/com.twin.app.shoptime/src/components/TDropDown/TDropDown.module.less +++ b/com.twin.app.shoptime/src/components/TDropDown/TDropDown.module.less @@ -9,7 +9,7 @@ height: 60px !important; border-radius: 6px !important; padding: 20px 19px !important; - font-family: @baseFontBold !important; + font-weight: bold !important; font-size: 24px !important; background-color: @COLOR_GRAY03 !important; color: @COLOR_WHITE !important; @@ -67,7 +67,7 @@ background-color: @PRIMARY_COLOR_RED !important; color: @COLOR_WHITE !important; } - font-family: @baseFontBold !important; + font-weight: bold !important; color: @COLOR_WHITE !important; font-size: 24px !important; margin: 0 !important; diff --git a/com.twin.app.shoptime/src/components/THeader/THeader.module.less b/com.twin.app.shoptime/src/components/THeader/THeader.module.less index 87a07f70..ec28964d 100644 --- a/com.twin.app.shoptime/src/components/THeader/THeader.module.less +++ b/com.twin.app.shoptime/src/components/THeader/THeader.module.less @@ -5,7 +5,7 @@ width: 100%; height: 90px; color: #222; - font-family: @baseFontBold; + font-weight: bold; background-color: #fff; display: flex; justify-content: flex-start; diff --git a/com.twin.app.shoptime/src/components/TItemCard/TItemCard.module.less b/com.twin.app.shoptime/src/components/TItemCard/TItemCard.module.less index a8a08646..ba6f10cb 100644 --- a/com.twin.app.shoptime/src/components/TItemCard/TItemCard.module.less +++ b/com.twin.app.shoptime/src/components/TItemCard/TItemCard.module.less @@ -41,7 +41,8 @@ .flex(); .size(@w: 200px, @h: 200px); background-color: rgba(26, 26, 26, 0.6); - .font(@fontFamily: @baseFontBold, @fontSize: 36px); + font-weight: bold; + font-size: 36px; } } @@ -53,7 +54,8 @@ padding: 12px 0; > h3 { - .font(@fontFamily: @baseFontBold, @fontSize: 24px); + font-weight: bold; + font-size: 24px; color: @COLOR_GRAY06; .elip(@clamp:2); word-break: break-all; @@ -62,12 +64,14 @@ p { .flex(@justifyCenter: flex-start); - .font(@fontFamily: @baseFontBold, @fontSize: 30px); + font-weight: bold; + font-size: 30px; color: @PRIMARY_COLOR_RED; span { margin-left: 5px; - .font(@fontFamily: @baseFont, @fontSize: 18px); + font-weight: bold; + font-size: 18px; color: @COLOR_GRAY04; text-decoration: line-through; } @@ -124,7 +128,8 @@ .flex(); .size(@w: 288px, @h: 288px); background-color: rgba(26, 26, 26, 0.6); - .font(@fontFamily: @baseFontBold, @fontSize: 36px); + font-weight: bold; + font-size: 36px; } } @@ -136,7 +141,8 @@ > h3 { height: 60px; margin-bottom: 6px; - .font(@fontFamily: @baseFontBold, @fontSize: 24px); + font-weight: bold; + font-size: 24px; color: @COLOR_GRAY06; .elip(@clamp:2); word-break: break-all; @@ -145,12 +151,13 @@ p { .flex(@justifyCenter: flex-start); - .font(@fontFamily: @baseFontBold, @fontSize: 30px); + font-weight: bold; + font-size: 30px; color: @PRIMARY_COLOR_RED; letter-spacing: -1px; span { margin-left: 5px; - .font(@fontFamily: @baseFont, @fontSize: 18px); + font-size: 18px; color: @COLOR_GRAY04; text-decoration: line-through; } @@ -195,7 +202,7 @@ background-color: @COLOR_WHITE; border-radius: 12px; .border-solid(@size:1px,@color:@COLOR_GRAY02); - font-family: @baseFontBold; + font-weight: bold; position: relative; &:focus { @@ -236,7 +243,7 @@ background-color: @COLOR_WHITE; border-radius: 12px; .border-solid(@size:1px,@color:@COLOR_GRAY02); - font-family: @baseFontBold; + font-weight: bold; position: relative; display: flex; &:focus { diff --git a/com.twin.app.shoptime/src/components/TPopUp/TPopUp.module.less b/com.twin.app.shoptime/src/components/TPopUp/TPopUp.module.less index d158e399..4ccb95bd 100644 --- a/com.twin.app.shoptime/src/components/TPopUp/TPopUp.module.less +++ b/com.twin.app.shoptime/src/components/TPopUp/TPopUp.module.less @@ -34,7 +34,7 @@ color: @COLOR_GRAY03; display: flex; flex-direction: column; - font-family: @baseFont; + font-weight: normal; box-sizing: border-box; border-radius: 4px; } @@ -45,7 +45,7 @@ .title { text-align: left; font-size: 36px; - font-family: @baseFontBold; + font-weight: bold; line-height: normal; color: @COLOR_BLACK; background-color: @COLOR_SKYBLUE; diff --git a/com.twin.app.shoptime/src/components/TabLayout/TabItem.module.less b/com.twin.app.shoptime/src/components/TabLayout/TabItem.module.less index 0ddf3d2b..e58c11cc 100644 --- a/com.twin.app.shoptime/src/components/TabLayout/TabItem.module.less +++ b/com.twin.app.shoptime/src/components/TabLayout/TabItem.module.less @@ -87,11 +87,12 @@ .text { line-height: 1.2; padding-left: 11px; - - .font(@fontFamily:@baseFontBold, @fontSize:36px); + font-weight: bold; + font-size: 36px; &.subItem { - .font (@fontFamily:@baseFontBold, @fontSize:30px); + font-weight: bold; + font-size: 30px; width: 245px; // word-break:break-all; } diff --git a/com.twin.app.shoptime/src/components/TabLayout/TabItemSub.module.less b/com.twin.app.shoptime/src/components/TabLayout/TabItemSub.module.less index d48ca408..1d3dcde7 100644 --- a/com.twin.app.shoptime/src/components/TabLayout/TabItemSub.module.less +++ b/com.twin.app.shoptime/src/components/TabLayout/TabItemSub.module.less @@ -79,10 +79,12 @@ padding-left: 11px; .elip(@clamp: 1); - .font(@fontFamily:@baseFontBold, @fontSize:36px); + font-weight: bold; + font-size: 36px; &.subItem { - .font (@fontFamily:@baseFontBold, @fontSize:30px); + font-weight: bold; + font-size: 30px; width: 248px; word-break: break-all; } diff --git a/com.twin.app.shoptime/src/components/VideoOverlayWithPhoneNumber/VideoOverlayWithPhoneNumber.module.less b/com.twin.app.shoptime/src/components/VideoOverlayWithPhoneNumber/VideoOverlayWithPhoneNumber.module.less index 0055b78b..bc25e3b7 100644 --- a/com.twin.app.shoptime/src/components/VideoOverlayWithPhoneNumber/VideoOverlayWithPhoneNumber.module.less +++ b/com.twin.app.shoptime/src/components/VideoOverlayWithPhoneNumber/VideoOverlayWithPhoneNumber.module.less @@ -9,7 +9,8 @@ padding: 18px; border-radius: 10px; background-image: linear-gradient(to top, #1a1a1a 93%, #8e8e8e); - .font(@fontFamily: @baseFontBold, @fontSize: 36px); + font-weight: bold; + font-size: 36px; color: @COLOR_WHITE; box-shadow: 5px 8.7px 15px 0 rgba(6, 0, 1, 0.5); diff --git a/com.twin.app.shoptime/src/style/CommonStyle.module.less b/com.twin.app.shoptime/src/style/CommonStyle.module.less index 86197bd6..468dc0aa 100644 --- a/com.twin.app.shoptime/src/style/CommonStyle.module.less +++ b/com.twin.app.shoptime/src/style/CommonStyle.module.less @@ -50,7 +50,6 @@ src: url("../../assets/fonts/tahoma/tahomabd.ttf") format("ttf"); } @baseFont: "LG Smart"; -@baseFontBold: "LG Smart"; @arialFont: "Arial"; @arialFontBold: "ArialBold"; @robotoFont: "Roboto"; diff --git a/com.twin.app.shoptime/src/views/CategoryPanel/CategoryContents/NoResultsCategory/NoResultsCategoryItems.module.less b/com.twin.app.shoptime/src/views/CategoryPanel/CategoryContents/NoResultsCategory/NoResultsCategoryItems.module.less index 2399e36a..f36e087a 100644 --- a/com.twin.app.shoptime/src/views/CategoryPanel/CategoryContents/NoResultsCategory/NoResultsCategoryItems.module.less +++ b/com.twin.app.shoptime/src/views/CategoryPanel/CategoryContents/NoResultsCategory/NoResultsCategoryItems.module.less @@ -19,7 +19,8 @@ } > p { - .font (@fontFamily: @baseFontBold, @fontSize: 36px); + font-weight: bold; + font-size: 36px; color: #a3a3a3; margin-top: 6px; } diff --git a/com.twin.app.shoptime/src/views/CategoryPanel/CategoryContents/ShowContents/ShowContents.module.less b/com.twin.app.shoptime/src/views/CategoryPanel/CategoryContents/ShowContents/ShowContents.module.less index de61436f..8ab43449 100644 --- a/com.twin.app.shoptime/src/views/CategoryPanel/CategoryContents/ShowContents/ShowContents.module.less +++ b/com.twin.app.shoptime/src/views/CategoryPanel/CategoryContents/ShowContents/ShowContents.module.less @@ -4,7 +4,8 @@ .topsTitle { margin-top: 70px; color: @COLOR_GRAY08; - .font(@fontFamily: @baseFontBold, @fontSize: 36px); + font-weight: bold; + font-size: 36px; } .topShowContainer { diff --git a/com.twin.app.shoptime/src/views/CheckOutPanel/components/ShippingAddressCard.module.less b/com.twin.app.shoptime/src/views/CheckOutPanel/components/ShippingAddressCard.module.less index e4091864..f43f12e0 100644 --- a/com.twin.app.shoptime/src/views/CheckOutPanel/components/ShippingAddressCard.module.less +++ b/com.twin.app.shoptime/src/views/CheckOutPanel/components/ShippingAddressCard.module.less @@ -10,7 +10,8 @@ .title { color: @COLOR_GRAY06; - .font(@fontFamily: @baseFontBold, @fontSize: 36px); + font-weight: bold; + font-size: 36px; margin-bottom: 19px; } @@ -22,7 +23,8 @@ } .cardFooter { - .font(@fontFamily: @baseFontBold, @fontSize: 24px); + font-weight: bold; + font-size: 24px; color: @COLOR_GRAY03; .callNumber { diff --git a/com.twin.app.shoptime/src/views/CheckOutPanel/components/Subject.module.less b/com.twin.app.shoptime/src/views/CheckOutPanel/components/Subject.module.less index 2209cfec..d5b880e2 100644 --- a/com.twin.app.shoptime/src/views/CheckOutPanel/components/Subject.module.less +++ b/com.twin.app.shoptime/src/views/CheckOutPanel/components/Subject.module.less @@ -8,7 +8,8 @@ .subject { margin-top: 60px; padding: 28px 0 28px 60px; - .font(@fontFamily: @baseFontBold, @fontSize: 30px); + font-weight: bold; + font-size: 30px; color: #333333; border-top: solid 1px #dadada; border-bottom: solid 1px #dadada; diff --git a/com.twin.app.shoptime/src/views/CheckOutPanel/container/SummaryContainer.module.less b/com.twin.app.shoptime/src/views/CheckOutPanel/container/SummaryContainer.module.less index eaf9b46d..aa42f0ca 100644 --- a/com.twin.app.shoptime/src/views/CheckOutPanel/container/SummaryContainer.module.less +++ b/com.twin.app.shoptime/src/views/CheckOutPanel/container/SummaryContainer.module.less @@ -12,7 +12,8 @@ padding: 69px 60px 40px 60px; > h3 { - .font(@fontFamily: @baseFontBold, @fontSize: 30px); + font-weight: bold; + font-size: 30px; padding-bottom: 29px; } @@ -23,7 +24,8 @@ margin-bottom: 20px; } .itemWrap { - .font(@fontFamily: @baseFont, @fontSize: 24px); + font-weight: normal; + font-size: 24px; color: #cccccc; } .item { @@ -39,11 +41,13 @@ padding: 31px 59px 0 61px; margin-bottom: 147px; > div { - .font(@fontFamily: @baseFontBold, @fontSize: 30px); + font-weight: bold; + font-size: 30px; color: #ffffff; } .price { - .font(@fontFamily: @baseFontBold, @fontSize: 42px); + font-weight: bold; + font-size: 42px; } } @@ -62,7 +66,8 @@ } .contents { - .font(@fontFamily: @baseFont, @fontSize: 24px); + font-weight: normal; + font-size: 24px; color: #009cff; text-decoration: underline; } diff --git a/com.twin.app.shoptime/src/views/DetailPanel/DetailPanel.module.less b/com.twin.app.shoptime/src/views/DetailPanel/DetailPanel.module.less index eb721edb..42459934 100644 --- a/com.twin.app.shoptime/src/views/DetailPanel/DetailPanel.module.less +++ b/com.twin.app.shoptime/src/views/DetailPanel/DetailPanel.module.less @@ -3,7 +3,8 @@ .header { > div { - .font(@fontFamily: @baseFontBold, @fontSize: 30px) !important; + font-weight: bold !important; + font-size: 30px !important; .elip(@clamp: 1); } display: flex; diff --git a/com.twin.app.shoptime/src/views/DetailPanel/components/ProductOption.module.less b/com.twin.app.shoptime/src/views/DetailPanel/components/ProductOption.module.less index f0f26077..9727a972 100644 --- a/com.twin.app.shoptime/src/views/DetailPanel/components/ProductOption.module.less +++ b/com.twin.app.shoptime/src/views/DetailPanel/components/ProductOption.module.less @@ -12,7 +12,8 @@ .flex(@direction:row ,@justifyCenter:flex-start); text-align: left; color: @COLOR_GRAY03; - .font(@fontFamily:@baseFontBold,30px); + font-weight: bold; + font-size: 30px; img { width: 42px; height: 42px; @@ -30,7 +31,8 @@ } } .title { - .font(@fontFamily:@baseFontBold,@fontSize:36px); + font-weight: bold; + font-size: 36px; color: @COLOR_GRAY08; width: 739px; .elip(@clamp:2); diff --git a/com.twin.app.shoptime/src/views/DetailPanel/components/ProductThumbnail.module.less b/com.twin.app.shoptime/src/views/DetailPanel/components/ProductThumbnail.module.less index f5d683ab..89245cb6 100644 --- a/com.twin.app.shoptime/src/views/DetailPanel/components/ProductThumbnail.module.less +++ b/com.twin.app.shoptime/src/views/DetailPanel/components/ProductThumbnail.module.less @@ -5,7 +5,8 @@ padding-left: 120px; .size(@w: 894px, @h: 930px); .order { - .font(@fontFamily: @baseFontBold, @fontSize: 30px); + font-weight: bold; + font-size: 30px; .size(@w: 560px, @h: 68px); display: flex; justify-content: space-between; @@ -38,7 +39,8 @@ text-align: center; > div { - .font(@fontFamily: @baseFont, @fontSize: 24px); + font-weight: normal; + font-size: 24px; .size(@w: 362px, @h: 60px); box-shadow: 0px 3px 6px 0 rgba(2, 3, 3, 0.1); border-radius: 6px; @@ -83,12 +85,14 @@ } // 상품 ID > div > span { - .font(@fontFamily: @baseFontBold, @fontSize: 30px); + font-weight: bold; + font-size: 30px; } // 상품명 > h3 { .elip(2); - .font(@fontFamily: @baseFontBold, @fontSize: 36px); + font-weight: bold; + font-size: 36px; padding-top: 24px; margin-bottom: 14px; margin-right: 22px; @@ -139,7 +143,8 @@ } } .scrollContainer { - .font(@fontFamily: @baseFont, @fontSize: 24px); + font-weight: normal; + font-size: 24px; color: #808080; text-align: left; line-height: 1.3; diff --git a/com.twin.app.shoptime/src/views/DetailPanel/components/common/ProductTag.module.less b/com.twin.app.shoptime/src/views/DetailPanel/components/common/ProductTag.module.less index f44e4038..713620e0 100644 --- a/com.twin.app.shoptime/src/views/DetailPanel/components/common/ProductTag.module.less +++ b/com.twin.app.shoptime/src/views/DetailPanel/components/common/ProductTag.module.less @@ -5,7 +5,8 @@ display: block; border-radius: 4px; margin-left: 6px; - .font(@fontFamily:@baseFontBold,@fontSize:24px); + font-weight: bold; + font-size: 24px; background-color: @backgroundColor; color: @fontColor; text-align: center; @@ -29,7 +30,8 @@ color: @PRIMARY_COLOR_RED; text-align: center; line-height: 42px; - .font(@fontFamily:@baseFontBold,@fontSize:24px); + font-weight: bold; + font-size: 24px; .size(@w: 120px, @h: 42px); } @@ -53,6 +55,7 @@ margin-left: 6px; text-align: center; line-height: 42px; - .font(@fontFamily: @baseFontBold, @fontSize:24px); + font-weight: bold; + font-size: 24px; } } diff --git a/com.twin.app.shoptime/src/views/DetailPanel/components/optionTypes/GroupOption.module.less b/com.twin.app.shoptime/src/views/DetailPanel/components/optionTypes/GroupOption.module.less index 96491d81..afbab338 100644 --- a/com.twin.app.shoptime/src/views/DetailPanel/components/optionTypes/GroupOption.module.less +++ b/com.twin.app.shoptime/src/views/DetailPanel/components/optionTypes/GroupOption.module.less @@ -17,8 +17,8 @@ padding: 30px; > p { margin-bottom: 13px; - .font(@fontFamily:@baseFont,@fontSize:24px); - + font-weight: normal; + font-size: 24px; color: @COLOR_GRAY03; } > .groupOptionInfo { @@ -31,7 +31,8 @@ background-color: @COLOR_WHITE; .productName { - .font(@baseFontBold,@fontSize:24px); + font-weight: bold; + font-size: 24px; color: @COLOR_GRAY06; } .priceInfo { @@ -40,12 +41,14 @@ text-align: left; height: 36px; .priceAfter { - .font(@baseFontBold,@fontSize:30px); + font-weight: bold; + font-size: 30px; color: @PRIMARY_COLOR_RED; margin-right: 5px; } .priceBefore { - .font(@baseFont,@fontSize:18px); + font-weight: normal; + font-size: 18px; color: @COLOR_GRAY04; text-decoration: line-through; } @@ -62,7 +65,8 @@ .flex(@direction:column); text-align: center; color: #a3a3a3; - .font(@fontFamily:@baseFontBold,@fontSize:36px); + font-weight: bold; + font-size: 36px; line-height: 1.11; letter-spacing: normal; img { diff --git a/com.twin.app.shoptime/src/views/DetailPanel/components/optionTypes/HotelOption.module.less b/com.twin.app.shoptime/src/views/DetailPanel/components/optionTypes/HotelOption.module.less index 5c196f98..7e310a5e 100644 --- a/com.twin.app.shoptime/src/views/DetailPanel/components/optionTypes/HotelOption.module.less +++ b/com.twin.app.shoptime/src/views/DetailPanel/components/optionTypes/HotelOption.module.less @@ -12,7 +12,8 @@ .flex(@direction:row ,@justifyCenter:flex-start); text-align: left; color: @COLOR_GRAY03; - .font(@fontFamily:@baseFontBold,30px); + font-weight: bold; + font-size: 30px; img { width: 42px; height: 42px; @@ -30,7 +31,8 @@ } } .title { - .font(@fontFamily:@baseFontBold,@fontSize:36px); + font-weight: bold; + font-size: 36px; color: @COLOR_GRAY08; width: 739px; .elip(@clamp:2); diff --git a/com.twin.app.shoptime/src/views/DetailPanel/components/optionTypes/SingleOption.module.less b/com.twin.app.shoptime/src/views/DetailPanel/components/optionTypes/SingleOption.module.less index edebf419..fe58fbee 100644 --- a/com.twin.app.shoptime/src/views/DetailPanel/components/optionTypes/SingleOption.module.less +++ b/com.twin.app.shoptime/src/views/DetailPanel/components/optionTypes/SingleOption.module.less @@ -25,13 +25,15 @@ .optionLayer { .flex(@justifyCenter:space-between); color: @COLOR_GRAY05; - .font(@baseFontBold,@fontSize:24px); + font-weight: bold; + font-size: 24px; margin-bottom: 20px; .optionBtn { .border-solid(1px,@COLOR_GRAY02); .flex(); - .font(@baseFontBold,@fontSize:24px); + font-weight: bold; + font-size: 24px; min-width: 560px; background-color: @COLOR_WHITE; @@ -67,7 +69,8 @@ // QUANTITY .quantityLayer { .flex(@justifyCenter:space-between); - .font(@baseFontBold,@fontSize:24px); + font-weight: bold; + font-size: 24px; color: @COLOR_GRAY05; .wrapper { @@ -123,17 +126,19 @@ .flex(@direction:column, @justifyCenter:center,@alignCenter:flex-start); .promotionName { color: @COLOR_GRAY05; - .font(@baseFontBold,@fontSize:24px); + font-weight: bold; + font-size: 24px; } .promotionDesc { color: @COLOR_GRAY03; - .font(@baseFont,@fontSize:24px); + font-size: 24px; } } .promotionBtn { min-width: 144px; height: 60px; - .font(@baseFontBold,@fontSize:24px); + font-weight: bold; + font-size: 24px; line-height: 60px; border-radius: 6px; background: @COLOR_GRAY03; @@ -146,7 +151,8 @@ .discountedPriceLayer { .flex(@justifyCenter:space-between); - .font(@baseFontBold,@fontSize:36px); + font-weight: bold; + font-size: 36px; color: @COLOR_GRAY07; margin-top: 31px; @@ -158,7 +164,8 @@ padding: 0 12px; background: #f00; color: @COLOR_WHITE; - .font(@baseFontBold,@fontSize:24px); + font-weight: bold; + font-size: 24px; text-align: center; border-radius: 6px; height: 42px; @@ -166,14 +173,15 @@ } .discountedPrice { - .font(@baseFontBold,@fontSize:44px); + font-weight: bold; + font-size: 24px; line-height: 1.14; color: @PRIMARY_COLOR_RED; margin-left: 12px; } .originalPrice { - .font(@baseFont,@fontSize:24px); + font-size: 24px; color: @COLOR_GRAY03; text-decoration: line-through; margin-left: 9px; @@ -182,14 +190,16 @@ .notDiscountedPriceLayer { .flex(@justifyCenter:space-between); - .font(@baseFontBold,@fontSize:36px); + font-weight: bold; + font-size: 36px; color: @COLOR_GRAY07; margin-top: 31px; .priceWrapper { .flex(); } .discountedPrice { - .font(@baseFontBold,@fontSize:44px); + font-weight: bold; + font-size: 44px; line-height: 1.14; color: @PRIMARY_COLOR_RED; margin-left: 12px; @@ -201,7 +211,7 @@ .flex(@justifyCenter:space-between); margin-top: 13px; > span { - .font(@baseFont,@fontSize:24px); + font-size: 24px; line-height: 1.33; color: @COLOR_GRAY03; } @@ -283,12 +293,14 @@ .border-solid(@size:1px,@color:@COLOR_GRAY02); .couponLate { - .font(@baseFontBold,36px); + font-weight: bold; + font-size: 36px; color: @PRIMARY_COLOR_RED; line-height: 42px; } .title { - .font(@baseFontBold,36px); + font-weight: bold; + font-size: 36px; line-height: 42px; color: @COLOR_GRAY07; margin-bottom: 25px; @@ -296,7 +308,8 @@ .elip(1); } .content { - .font(@baseFont,24px); + font-weight: normal; + font-size: 24px; color: @COLOR_GRAY03; } .couponBtn { @@ -306,7 +319,8 @@ border-radius: 6px; margin-top: 18px; > div { - .font(@baseFontBold, 24px); + font-weight: bold; + font-size: 24px; } } } diff --git a/com.twin.app.shoptime/src/views/DetailPanel/components/optionTypes/ThemeOption.module.less b/com.twin.app.shoptime/src/views/DetailPanel/components/optionTypes/ThemeOption.module.less index 5c196f98..7e310a5e 100644 --- a/com.twin.app.shoptime/src/views/DetailPanel/components/optionTypes/ThemeOption.module.less +++ b/com.twin.app.shoptime/src/views/DetailPanel/components/optionTypes/ThemeOption.module.less @@ -12,7 +12,8 @@ .flex(@direction:row ,@justifyCenter:flex-start); text-align: left; color: @COLOR_GRAY03; - .font(@fontFamily:@baseFontBold,30px); + font-weight: bold; + font-size: 30px; img { width: 42px; height: 42px; @@ -30,7 +31,8 @@ } } .title { - .font(@fontFamily:@baseFontBold,@fontSize:36px); + font-weight: bold; + font-size: 36px; color: @COLOR_GRAY08; width: 739px; .elip(@clamp:2); diff --git a/com.twin.app.shoptime/src/views/DetailPanel/components/optionTypes/UnableOption.module.less b/com.twin.app.shoptime/src/views/DetailPanel/components/optionTypes/UnableOption.module.less index 96a54dae..dfeb9a99 100644 --- a/com.twin.app.shoptime/src/views/DetailPanel/components/optionTypes/UnableOption.module.less +++ b/com.twin.app.shoptime/src/views/DetailPanel/components/optionTypes/UnableOption.module.less @@ -30,11 +30,13 @@ border-radius: 6px; color: @COLOR_WHITE; margin-right: 10px; - .font(@baseFontBold,24px); + font-weight: bold; + font-size: 24px; .flex(); } .name { - .font(@baseFontBold,36px); + font-weight: bold; + font-size: 36px; color: @COLOR_GRAY07; } .btmLayer { @@ -42,7 +44,8 @@ margin-top: 14px; } .price { - .font(@baseFontBold,60px); + font-weight: bold; + font-size: 60px; color: @PRIMARY_COLOR_RED; margin-right: 9px; @@ -51,7 +54,7 @@ } } .discountedPrc { - .font(@baseFont,24px); + font-size: 24px; color: @COLOR_GRAY03; text-decoration: line-through; } @@ -62,7 +65,8 @@ border-bottom: 1px solid @COLOR_GRAY02; > span { - .font(@baseFontBold,36px); + font-weight: bold; + font-size: 36px; color: @COLOR_GRAY03; } .partnerPrc { @@ -73,7 +77,8 @@ padding-top: 24px; .flex(@direction:column,@alignCenter:flex-start); .rewdNm { - .font(@baseFontBold,36px); + font-weight: bold; + font-size: 36px; color: @COLOR_BLACK; } @@ -82,12 +87,14 @@ padding: 4px 0; .flex(); .rewdPrc { - .font(@baseFontBold,60px); + font-weight: bold; + font-size: 60px; color: @PRIMARY_COLOR_RED; margin-right: 10px; } .rewdRate { - .font(@baseFont,24px); + font-size: 24px; + font-weight: normal; color: @COLOR_GRAY03; } } @@ -119,7 +126,8 @@ letter-spacing: normal; color: @COLOR_WHITE; white-space: pre-wrap; - .font(@baseFont,22px); + font-size: 24px; + font-weight: normal; &::before { content: ""; @@ -142,7 +150,8 @@ border-bottom: 1px solid @COLOR_GRAY02; background: @BG_COLOR_02; color: @COLOR_GRAY05; - .font(@baseFontBold,24px); + font-weight: bold; + font-size: 24px; } .btnContainer { diff --git a/com.twin.app.shoptime/src/views/DetailPanel/container/YouMayLike.module.less b/com.twin.app.shoptime/src/views/DetailPanel/container/YouMayLike.module.less index cada2bcf..109bb879 100644 --- a/com.twin.app.shoptime/src/views/DetailPanel/container/YouMayLike.module.less +++ b/com.twin.app.shoptime/src/views/DetailPanel/container/YouMayLike.module.less @@ -26,7 +26,8 @@ .button { .flex(); .size(@w: 324px,@h: 78px); - .font(@fontFamily: @baseFontBold, @fontSize: 30px); + font-weight: bold; + font-size: 30px; .position(@position: absolute, @top: -41px, @left: 60px); border-radius: 12px; diff --git a/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/Banner/Banner.module.less b/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/Banner/Banner.module.less index fb633647..c9492f04 100644 --- a/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/Banner/Banner.module.less +++ b/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/Banner/Banner.module.less @@ -19,7 +19,8 @@ // patner title h2 { - .font(@fontFamily: @baseFontBold, @fontSize: 36px); + font-weight: bold; + font-size: 36px; color: @COLOR_WHITE; } } diff --git a/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/FeaturedCategory/FeaturedCategoryContents/FeaturedCategoryContents.module.less b/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/FeaturedCategory/FeaturedCategoryContents/FeaturedCategoryContents.module.less index 3fcaa44d..49373665 100644 --- a/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/FeaturedCategory/FeaturedCategoryContents/FeaturedCategoryContents.module.less +++ b/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/FeaturedCategory/FeaturedCategoryContents/FeaturedCategoryContents.module.less @@ -5,7 +5,8 @@ > h3 { margin: 36px 0 12px; padding-left: 60px; - .font(@fontFamily: @baseFontBold, @fontSize: 36px); + font-weight: bold; + font-size: 36px; color: @COLOR_GRAY08; } } diff --git a/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/FeaturedCategory/FeaturedSubCategoryNav/FeaturedSubCategoryNav.module.less b/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/FeaturedCategory/FeaturedSubCategoryNav/FeaturedSubCategoryNav.module.less index db413700..9fa54eab 100644 --- a/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/FeaturedCategory/FeaturedSubCategoryNav/FeaturedSubCategoryNav.module.less +++ b/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/FeaturedCategory/FeaturedSubCategoryNav/FeaturedSubCategoryNav.module.less @@ -29,7 +29,8 @@ .tButtonMore { width: 180px; background-color: #7a808d; - .font(@fontFamily: @baseFontBold, @fontSize: 30px); + font-weight: bold; + font-size: 30px; color: @COLOR_WHITE; &:focus { diff --git a/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/LiveChannels/LiveChannelsErrorContents/LiveChannelsErrorContents.module.less b/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/LiveChannels/LiveChannelsErrorContents/LiveChannelsErrorContents.module.less index 42e039bc..3e6719e3 100644 --- a/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/LiveChannels/LiveChannelsErrorContents/LiveChannelsErrorContents.module.less +++ b/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/LiveChannels/LiveChannelsErrorContents/LiveChannelsErrorContents.module.less @@ -21,7 +21,8 @@ > h3 { margin-bottom: 4px; - .font(@fontFamily: @baseFontBold, @fontSize: 36px); + font-weight: bold; + font-size: 36px; color: @COLOR_GRAY10; } diff --git a/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/LiveChannels/LiveChannelsVerticalContents/LiveVideoCard/LiveVideoCard.module.less b/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/LiveChannels/LiveChannelsVerticalContents/LiveVideoCard/LiveVideoCard.module.less index 44f1c1a1..8c353f2d 100644 --- a/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/LiveChannels/LiveChannelsVerticalContents/LiveVideoCard/LiveVideoCard.module.less +++ b/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/LiveChannels/LiveChannelsVerticalContents/LiveVideoCard/LiveVideoCard.module.less @@ -35,13 +35,15 @@ div { h3 { - .font(@fontFamily: @baseFontBold, @fontSize: 30px); + font-weight: bold; + font-size: 30px; .elip(@clamp:1); word-break: break-all; } time { - .font(@fontFamily: @baseFont, @fontSize: 24px); + font-weight: normal; + font-size: 24px; } } } @@ -53,7 +55,8 @@ padding: 6px 18px 18px; .size(@w: 100%, @h: 54px); background-color: rgba(0, 0, 0, 0.9); - .font(@fontFamily: @baseFont, @fontSize: 20px); + font-weight: normal; + font-size: 20px; color: @COLOR_GRAY04; img { diff --git a/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/LiveChannels/NoLiveContents/NoLiveCard/NoLiveCard.module.less b/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/LiveChannels/NoLiveContents/NoLiveCard/NoLiveCard.module.less index b14c8f67..156570a2 100644 --- a/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/LiveChannels/NoLiveContents/NoLiveCard/NoLiveCard.module.less +++ b/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/LiveChannels/NoLiveContents/NoLiveCard/NoLiveCard.module.less @@ -52,18 +52,20 @@ > time:nth-child(2) { margin-bottom: 16px; - .font(@fontFamily: @baseFontBold, @fontSize: 30px); + font-weight: bold; + font-size: 30px; color: @PRIMARY_COLOR_RED; } > h3:nth-child(3) { margin-bottom: 8px; - .font(@fontFamily: @baseFontBold, @fontSize: 36px); + font-weight: bold; + font-size: 36px; color: @COLOR_GRAY06; } > p:nth-child(4) { - .font(@fontFamily: @baseFont, @fontSize: 24px); + font-size: 24px; color: @COLOR_GRAY03; } @@ -74,7 +76,8 @@ .tButton { width: 300px; - .font(@fontFamily: @baseFontBold, @fontSize: 30px); + font-weight: bold; + font-size: 30px; color: @COLOR_WHITE; background-color: #7a808d; diff --git a/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/TodaysDeals/TodaysDealsCard/TodaysDealsCard.module.less b/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/TodaysDeals/TodaysDealsCard/TodaysDealsCard.module.less index 62cf958a..89bdbf17 100644 --- a/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/TodaysDeals/TodaysDealsCard/TodaysDealsCard.module.less +++ b/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/TodaysDeals/TodaysDealsCard/TodaysDealsCard.module.less @@ -59,7 +59,8 @@ overflow: hidden; width: 540px; margin-bottom: 18px; - .font(@fontFamily: @baseFontBold, @fontSize: 30px); + font-weight: bold; + font-size: 30px; .elip(@clamp:2); word-break: break-all; color: @COLOR_GRAY06; @@ -67,12 +68,14 @@ > p { .flex(@justifyCenter: flex-start); - .font(@fontFamily: @baseFontBold, @fontSize: 46px); + font-weight: bold; + font-size: 46px; color: @PRIMARY_COLOR_RED; > span { margin-left: 6px; - .font(@fontFamily: @baseFont, @fontSize: 24px); + font-weight: normal; + font-size: 24px; color: #7f7f7f; text-decoration: line-through; } @@ -92,14 +95,16 @@ margin-bottom: 6px; background-color: #f40000; border-radius: 44px; - .font(@fontFamily: @baseFontBold, @fontSize: 54px); + font-weight: bold; + font-size: 54px; color: @COLOR_WHITE; } > span:nth-child(2) { .flex(); .size(@w: 174px, @h: 72px); - .font(@fontFamily: @baseFontBold, @fontSize: 60px); + font-weight: bold; + font-size: 60px; } } diff --git a/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/UpComing/UpComingList/UpComingCard/UpComingCard.module.less b/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/UpComing/UpComingList/UpComingCard/UpComingCard.module.less index 304967bc..3298b32c 100644 --- a/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/UpComing/UpComingList/UpComingCard/UpComingCard.module.less +++ b/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/UpComing/UpComingList/UpComingCard/UpComingCard.module.less @@ -20,7 +20,8 @@ } span { - .font(@fontFamily: @baseFontBold, @fontSize: 36px); + font-weight: bold; + font-size: 36px; color: @COLOR_WHITE; } } @@ -29,13 +30,15 @@ display: inline-block; min-height: 42px; margin-bottom: 20px; - .font(@fontFamily: @baseFontBold, @fontSize: 36px); + font-weight: bold; + font-size: 36px; color: @PRIMARY_COLOR_RED; } > h3 { margin-bottom: 15px; - .font(@fontFamily: @baseFontBold, @fontSize: 30px); + font-weight: bold; + font-size: 30px; color: @COLOR_GRAY06; .elip(@clamp:2); word-break: break-all; @@ -44,7 +47,8 @@ p { margin-bottom: 18px; - .font(@fontFamily: @baseFont, @fontSize: 24px); + font-weight: normal; + font-size: 24px; color: @COLOR_GRAY04; .elip(@clamp:1); word-break: break-all; @@ -57,7 +61,8 @@ .size(@w: 420px, @h: 84px); border-radius: 10px; background-color: @PRIMARY_COLOR_RED; - .font(@fontFamily: @baseFontBold, @fontSize: 30px); + font-weight: bold; + font-size: 30px; color: @COLOR_WHITE; } diff --git a/com.twin.app.shoptime/src/views/HomePanel/HomeOnSale/HomeOnSale.module.less b/com.twin.app.shoptime/src/views/HomePanel/HomeOnSale/HomeOnSale.module.less index cbbd6fb4..4074728f 100644 --- a/com.twin.app.shoptime/src/views/HomePanel/HomeOnSale/HomeOnSale.module.less +++ b/com.twin.app.shoptime/src/views/HomePanel/HomeOnSale/HomeOnSale.module.less @@ -6,6 +6,7 @@ .subTitle { margin: 0 0 20px 60px; + font-weight: bold; } .grid { height: 300px; diff --git a/com.twin.app.shoptime/src/views/HomePanel/HomeOnSale/HomeOnSaleItem/HomeOnSaleItem.module.less b/com.twin.app.shoptime/src/views/HomePanel/HomeOnSale/HomeOnSaleItem/HomeOnSaleItem.module.less index dd49a4e0..252edbf5 100644 --- a/com.twin.app.shoptime/src/views/HomePanel/HomeOnSale/HomeOnSaleItem/HomeOnSaleItem.module.less +++ b/com.twin.app.shoptime/src/views/HomePanel/HomeOnSale/HomeOnSaleItem/HomeOnSaleItem.module.less @@ -35,11 +35,11 @@ text-shadow: 0px 5px 10px rgba(0, 0, 0, 0.2); letter-spacing: -2.5px; line-height: 60px; - font-family: @baseFontBold; + font-weight: bold; .onSaleItemListBoxSaleBoxPer { font-size: 84px; letter-spacing: -3.8px; - font-family: @baseFontBold; + font-weight: bold; } } .onSaleItemListBoxName { @@ -49,7 +49,7 @@ font-size: 24px; line-height: 1.33; color: @COLOR_WHITE; - font-family: @baseFontBold; + font-weight: bold; } .onSaleItemListBoxPrice { margin-top: 9px; @@ -58,7 +58,7 @@ line-height: 0.93; color: @COLOR_WHITE; letter-spacing: normal; - font-family: @baseFontBold; + font-weight: bold; .onSaleItemListBoxPriceStripe { margin-left: 4px; color: #d5d5d5; @@ -67,7 +67,7 @@ font-size: 18px; line-height: 1.56; letter-spacing: normal; - font-family: @baseFont; + font-weight: normal; } } } diff --git a/com.twin.app.shoptime/src/views/HomePanel/HomeTodayDeal/HomeTodayDeal.module.less b/com.twin.app.shoptime/src/views/HomePanel/HomeTodayDeal/HomeTodayDeal.module.less index 563b94d9..802b43d9 100644 --- a/com.twin.app.shoptime/src/views/HomePanel/HomeTodayDeal/HomeTodayDeal.module.less +++ b/com.twin.app.shoptime/src/views/HomePanel/HomeTodayDeal/HomeTodayDeal.module.less @@ -18,7 +18,8 @@ .textBox { .size(@w: 100%, @h: 80px); .elip(@clamp:2); - .font (@fontFamily:@baseFontBold, @fontSize:30px); + font-weight: bold; + font-size: 30px; color: @COLOR_GRAY06; line-height: 1.27; margin-bottom: 6px; @@ -26,12 +27,14 @@ .accBox { .size(@w: 100%, @h: 50px); - .font (@fontFamily:@baseFontBold, @fontSize:42px); + font-weight: bold; + font-size: 42px; color: @PRIMARY_COLOR_RED; line-height: 1.14; margin-bottom: 35px; .saleAccBox { - .font (@fontFamily:@baseFont, @fontSize:24px); + font-weight: normal; + font-size: 24px; color: @COLOR_GRAY04; vertical-align: middle; text-decoration: line-through; diff --git a/com.twin.app.shoptime/src/views/HomePanel/PopularShow/PopularShow.module.less b/com.twin.app.shoptime/src/views/HomePanel/PopularShow/PopularShow.module.less index f67b45ee..e06385b6 100644 --- a/com.twin.app.shoptime/src/views/HomePanel/PopularShow/PopularShow.module.less +++ b/com.twin.app.shoptime/src/views/HomePanel/PopularShow/PopularShow.module.less @@ -55,7 +55,6 @@ .border-solid(@size:1px,@color:@COLOR_GRAY02); box-sizing: border-box; font-weight: bold; - font-family: @baseFontBold; &:focus { border: 4px solid @PRIMARY_COLOR_RED; box-shadow: 0 0 22px 0 rgba(0, 0, 0, 0.5); diff --git a/com.twin.app.shoptime/src/views/HomePanel/SubCategory/CategoryNav/CategoryNav.module.less b/com.twin.app.shoptime/src/views/HomePanel/SubCategory/CategoryNav/CategoryNav.module.less index 5231e070..094f0dae 100644 --- a/com.twin.app.shoptime/src/views/HomePanel/SubCategory/CategoryNav/CategoryNav.module.less +++ b/com.twin.app.shoptime/src/views/HomePanel/SubCategory/CategoryNav/CategoryNav.module.less @@ -5,7 +5,8 @@ .size(@w: 100%, @h:210px); z-index: 10; background-color: @BG_COLOR_01; - .font(@fontFamily: @baseFontBold, @fontSize: 28px); + font-weight: bold; + font-size: 28px; .tVirtualGridList { height: 210px; > div { diff --git a/com.twin.app.shoptime/src/views/IntroPanel/IntroPanel.module.less b/com.twin.app.shoptime/src/views/IntroPanel/IntroPanel.module.less index 8d6bd268..68b95308 100644 --- a/com.twin.app.shoptime/src/views/IntroPanel/IntroPanel.module.less +++ b/com.twin.app.shoptime/src/views/IntroPanel/IntroPanel.module.less @@ -9,7 +9,6 @@ .introLayout { .flex(@direction: column); background-color: @BG_COLOR_03; - font-family: @baseFont; text-align: center; width: 100%; height: 100vh; @@ -22,7 +21,7 @@ } .txtPoint { - font-family: @baseFontBold; + font-weight: bold; font-size: 74px; color: #57585a; } @@ -55,7 +54,7 @@ .termsTitle { text-align: left; font-size: 36px; - font-family: @baseFontBold; + font-weight: bold; line-height: normal; color: @COLOR_BLACK; background-color: @COLOR_SKYBLUE; diff --git a/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/MyInfo/MyInfo.module.less b/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/MyInfo/MyInfo.module.less index fb11506d..abd470d3 100644 --- a/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/MyInfo/MyInfo.module.less +++ b/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/MyInfo/MyInfo.module.less @@ -32,7 +32,7 @@ color: @COLOR_WHITE; line-height: 84px; text-align: left; - font-family: @baseFontBold; + font-weight: bold; } } .infoBottomBox { diff --git a/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/MyInfo/MyInfoTabContents/BillingAddressTab/BillingAddressItem.module.less b/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/MyInfo/MyInfoTabContents/BillingAddressTab/BillingAddressItem.module.less index 2dadeeca..ecb3d1bb 100644 --- a/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/MyInfo/MyInfoTabContents/BillingAddressTab/BillingAddressItem.module.less +++ b/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/MyInfo/MyInfoTabContents/BillingAddressTab/BillingAddressItem.module.less @@ -10,7 +10,8 @@ .title { color: @COLOR_GRAY06; - .font(@fontFamily: @baseFontBold, @fontSize: 36px); + font-weight: bold; + font-size: 36px; margin-bottom: 19px; } @@ -22,7 +23,8 @@ } .cardFooter { - .font(@fontFamily: @baseFontBold, @fontSize: 24px); + font-weight: bold; + font-size: 24px; color: @COLOR_GRAY03; .callNumber { diff --git a/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/MyInfo/MyInfoTabContents/MyInfoNoResults/MyInfoNoResults.module.less b/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/MyInfo/MyInfoTabContents/MyInfoNoResults/MyInfoNoResults.module.less index ca8fc401..9782a031 100644 --- a/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/MyInfo/MyInfoTabContents/MyInfoNoResults/MyInfoNoResults.module.less +++ b/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/MyInfo/MyInfoTabContents/MyInfoNoResults/MyInfoNoResults.module.less @@ -13,7 +13,8 @@ } > p { - .font(@fontFamily: @baseFontBold, @fontSize: 36px); + font-weight: bold; + font-size: 36px; margin-top: 10px; color: @COLOR_GRAY10; } diff --git a/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/MyInfo/MyInfoTabContents/PaymentTab/PaymentItem.module.less b/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/MyInfo/MyInfoTabContents/PaymentTab/PaymentItem.module.less index 87fe6692..28ae8577 100644 --- a/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/MyInfo/MyInfoTabContents/PaymentTab/PaymentItem.module.less +++ b/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/MyInfo/MyInfoTabContents/PaymentTab/PaymentItem.module.less @@ -15,7 +15,8 @@ position: relative; .cardKnd { - .font(@fontFamily: @baseFontBold, @fontSize: 36px); + font-weight: bold; + font-size: 36px; } .cardNo { diff --git a/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/MyInfo/MyInfoTabContents/ShippingAddressTab/ShippingAddressItem.module.less b/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/MyInfo/MyInfoTabContents/ShippingAddressTab/ShippingAddressItem.module.less index 2dadeeca..ecb3d1bb 100644 --- a/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/MyInfo/MyInfoTabContents/ShippingAddressTab/ShippingAddressItem.module.less +++ b/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/MyInfo/MyInfoTabContents/ShippingAddressTab/ShippingAddressItem.module.less @@ -10,7 +10,8 @@ .title { color: @COLOR_GRAY06; - .font(@fontFamily: @baseFontBold, @fontSize: 36px); + font-weight: bold; + font-size: 36px; margin-bottom: 19px; } @@ -22,7 +23,8 @@ } .cardFooter { - .font(@fontFamily: @baseFontBold, @fontSize: 24px); + font-weight: bold; + font-size: 24px; color: @COLOR_GRAY03; .callNumber { diff --git a/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/MyOrders/MyOrders.module.less b/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/MyOrders/MyOrders.module.less index 3084f916..00aa243b 100644 --- a/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/MyOrders/MyOrders.module.less +++ b/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/MyOrders/MyOrders.module.less @@ -33,12 +33,10 @@ color: @COLOR_WHITE; font-size: 30px; font-weight: bold; - font-family: @baseFontBold; .orderNm { font-size: 30px; color: @COLOR_WHITE; font-weight: normal; - font-family: @baseFont; } } .orderCancelBtn { diff --git a/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/Support/ContactContents/ContactContents.module.less b/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/Support/ContactContents/ContactContents.module.less index 05bb1f90..cb39b3dd 100644 --- a/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/Support/ContactContents/ContactContents.module.less +++ b/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/Support/ContactContents/ContactContents.module.less @@ -69,7 +69,8 @@ } .notiBottom { text-align: center; - .font(@fontFamily: @baseFont,@fontSize:24px); + font-weight: normal; + font-size: 24px; color: @COLOR_GRAY06; margin-top: 71px; white-space: pre-line; diff --git a/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/Support/ListContents/ListContents.module.less b/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/Support/ListContents/ListContents.module.less index 530d7b81..93ef76c3 100644 --- a/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/Support/ListContents/ListContents.module.less +++ b/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/Support/ListContents/ListContents.module.less @@ -65,14 +65,16 @@ white-space: pre-wrap; .faqTitle { - .font(@fontFamily: @baseFontBold,@fontSize:30px); + font-weight: bold; + font-size: 30px; border-bottom: 1px solid @COLOR_GRAY02; padding: 20px 30px; display: flex; flex-direction: column; .expDate { text-align: right; - .font(@fontFamily: @baseFont,@fontSize:24px); + font-weight: normal; + font-size: 24px; } } diff --git a/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/Support/Support.module.less b/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/Support/Support.module.less index 53a62ec5..6371e704 100644 --- a/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/Support/Support.module.less +++ b/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/Support/Support.module.less @@ -9,7 +9,8 @@ > div { min-width: 330px; > div { - .font(@fontFamily: @baseFontBold, @fontSize: 24px); + font-weight: bold; + font-size: 24px; } } } diff --git a/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/TermsOfService/TermsOfService.module.less b/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/TermsOfService/TermsOfService.module.less index 6e625563..43e1a377 100644 --- a/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/TermsOfService/TermsOfService.module.less +++ b/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/TermsOfService/TermsOfService.module.less @@ -31,7 +31,7 @@ border: 3px solid #e7e7e7; } .subTitle { - font-family: @baseFontBold; + font-weight: bold; margin-bottom: 27px; } .text { diff --git a/com.twin.app.shoptime/src/views/OnSalePanel/OnSaleCategoryNav/OnSaleCategoryNav.module.less b/com.twin.app.shoptime/src/views/OnSalePanel/OnSaleCategoryNav/OnSaleCategoryNav.module.less index eb9cf709..ca701474 100644 --- a/com.twin.app.shoptime/src/views/OnSalePanel/OnSaleCategoryNav/OnSaleCategoryNav.module.less +++ b/com.twin.app.shoptime/src/views/OnSalePanel/OnSaleCategoryNav/OnSaleCategoryNav.module.less @@ -5,7 +5,8 @@ z-index: 10; .size(@w: 100%, @h:236px); background-color: @BG_COLOR_01; - .font(@fontFamily: @baseFontBold, @fontSize: 28px); + font-weight: bold; + font-size: 28px; // tVirtualGridListContainer > div:nth-child(1) { diff --git a/com.twin.app.shoptime/src/views/SearchPanel/NoSearchResults/NoSearchResults.module.less b/com.twin.app.shoptime/src/views/SearchPanel/NoSearchResults/NoSearchResults.module.less index 47fffbb7..a8d63d77 100644 --- a/com.twin.app.shoptime/src/views/SearchPanel/NoSearchResults/NoSearchResults.module.less +++ b/com.twin.app.shoptime/src/views/SearchPanel/NoSearchResults/NoSearchResults.module.less @@ -19,7 +19,8 @@ } > p { - .font (@fontFamily: @baseFontBold, @fontSize: 36px); + font-weight: bold; + font-size: 36px; color: #a3a3a3; margin-top: 6px; } diff --git a/com.twin.app.shoptime/src/views/SearchPanel/RecommendedKeywords/RecommendedKeywords.module.less b/com.twin.app.shoptime/src/views/SearchPanel/RecommendedKeywords/RecommendedKeywords.module.less index 58eb82ce..14a12b65 100644 --- a/com.twin.app.shoptime/src/views/SearchPanel/RecommendedKeywords/RecommendedKeywords.module.less +++ b/com.twin.app.shoptime/src/views/SearchPanel/RecommendedKeywords/RecommendedKeywords.module.less @@ -37,7 +37,8 @@ border: 1px solid @COLOR_GRAY09; background-color: @BG_COLOR_04; color: #333; - .font(@fontFamily: @baseFontBold, @fontSize: 40px); + font-weight: bold; + font-size: 40px; > div { overflow: unset; diff --git a/com.twin.app.shoptime/src/views/ServiceUnavailableNoticePanel/ServiceUnavailableNoticePanel.module.less b/com.twin.app.shoptime/src/views/ServiceUnavailableNoticePanel/ServiceUnavailableNoticePanel.module.less index 99e66ca3..7ac84ade 100644 --- a/com.twin.app.shoptime/src/views/ServiceUnavailableNoticePanel/ServiceUnavailableNoticePanel.module.less +++ b/com.twin.app.shoptime/src/views/ServiceUnavailableNoticePanel/ServiceUnavailableNoticePanel.module.less @@ -4,7 +4,6 @@ .serviceLayout { display: flex; .flex(@direction: column); - font-family: @baseFont; color: @COLOR_GRAY08; width: 100%; height: 100%; diff --git a/com.twin.app.shoptime/src/views/WelcomeEventPanel/WelcomeEventPanel.module.less b/com.twin.app.shoptime/src/views/WelcomeEventPanel/WelcomeEventPanel.module.less index 1821e4a1..079b050e 100644 --- a/com.twin.app.shoptime/src/views/WelcomeEventPanel/WelcomeEventPanel.module.less +++ b/com.twin.app.shoptime/src/views/WelcomeEventPanel/WelcomeEventPanel.module.less @@ -69,7 +69,7 @@ white-space: pre-wrap; .termsTitle { - font-family: @baseFontBold; + font-weight: bold; border-bottom: 1px solid @COLOR_GRAY02; padding: 20px 30px; }