diff --git a/com.twin.app.shoptime/assets/fonts/arial/Arial-Bold.woff b/com.twin.app.shoptime/assets/fonts/arial/Arial-Bold.woff new file mode 100644 index 00000000..95bac948 Binary files /dev/null and b/com.twin.app.shoptime/assets/fonts/arial/Arial-Bold.woff differ diff --git a/com.twin.app.shoptime/assets/fonts/arial/Arial.woff b/com.twin.app.shoptime/assets/fonts/arial/Arial.woff new file mode 100644 index 00000000..399613fb Binary files /dev/null and b/com.twin.app.shoptime/assets/fonts/arial/Arial.woff differ diff --git a/com.twin.app.shoptime/src/components/TPanel/TPanel.module.less b/com.twin.app.shoptime/src/components/TPanel/TPanel.module.less index 6512a930..c0412f7f 100644 --- a/com.twin.app.shoptime/src/components/TPanel/TPanel.module.less +++ b/com.twin.app.shoptime/src/components/TPanel/TPanel.module.less @@ -7,6 +7,8 @@ color: black; section { + font-family: @baseFont; + color: @COLOR_GRAY03; padding: 0 !important; word-break: keep-all; } diff --git a/com.twin.app.shoptime/src/style/CommonStyle.module.less b/com.twin.app.shoptime/src/style/CommonStyle.module.less index 5af479d4..a5c6607b 100644 --- a/com.twin.app.shoptime/src/style/CommonStyle.module.less +++ b/com.twin.app.shoptime/src/style/CommonStyle.module.less @@ -8,6 +8,14 @@ font-family: "LGSmartUIBold"; //font-weight: 600; src: url("../../assets/fonts/lgfont/LGSmartUI-Bold2.woff") format("woff"); } +@font-face { + font-family: "Arial"; + src: url("../../assets/fonts/arial/Arial.woff") format("woff"); +} +@font-face { + font-family: "ArialBold"; + src: url("../../assets/fonts/arial/Arial-Bold.woff") format("woff"); +} @baseFont: "LGSmartUI"; @baseFontBold: "LGSmartUIBold"; diff --git a/com.twin.app.shoptime/src/style/utils.module.less b/com.twin.app.shoptime/src/style/utils.module.less index 9201dd9e..51cffc80 100644 --- a/com.twin.app.shoptime/src/style/utils.module.less +++ b/com.twin.app.shoptime/src/style/utils.module.less @@ -5,11 +5,13 @@ align-items: @alignCenter; flex-direction: @direction; } + .size(@w: 50px, @h: 50px) { width: @w; height: @h; } -.position(@position: relative, @top: 0, @right: 0, @bottom: 0, @left: 0) { + +.position(@position: relative, @top: auto, @right: auto, @bottom: auto, @left: auto) { position: @position; top: @top; right: @right; @@ -24,11 +26,9 @@ } //font -.font (@fontFamily, @fontSize, @color, @fontWeight) { +.font (@fontFamily, @fontSize) { font-family: @fontFamily; font-size: @fontSize; - color: @color; - font-weight: @fontWeight; } //말줄임