diff --git a/module/build.gradle.kts b/module/build.gradle.kts index b88ec3e..c876efa 100644 --- a/module/build.gradle.kts +++ b/module/build.gradle.kts @@ -204,11 +204,10 @@ androidComponents.onVariants { variant -> set.add(Pair(root.file("webroot/css/index.css").asFile, null)) set.add(Pair(root.file("webroot/css/icons.css").asFile, null)) - set.add(Pair(root.file("webroot/css/fonts.css").asFile, null)) set.add(Pair(root.file("webroot/css/error.css").asFile, null)) - set.add(Pair(root.file("webroot/fonts/ProductSans-Italic.ttf").asFile, null)) - set.add(Pair(root.file("webroot/fonts/ProductSans-Regular.ttf").asFile, null)) + set.add(Pair(root.file("webroot/fonts/font.ttf").asFile, null)) + set.add(Pair(root.file("webroot/fonts/outfit.ttf").asFile, null)) set.add(Pair(root.file("webroot/assets/mark.svg").asFile, null)) set.add(Pair(root.file("webroot/assets/tick.svg").asFile, null)) diff --git a/module/src/customize.sh b/module/src/customize.sh index 9457499..598a041 100644 --- a/module/src/customize.sh +++ b/module/src/customize.sh @@ -145,12 +145,11 @@ extract "$ZIPFILE" 'webroot/js/smallPage/theme.js' "$MODPATH/webroot/js/smallPag extract "$ZIPFILE" 'webroot/js/switcher/fontChanger.js' "$MODPATH/webroot/js/switcher" true extract "$ZIPFILE" 'webroot/css/index.css' "$MODPATH/webroot/css" true -extract "$ZIPFILE" 'webroot/css/fonts.css' "$MODPATH/webroot/css" true extract "$ZIPFILE" 'webroot/css/icons.css' "$MODPATH/webroot/css" true extract "$ZIPFILE" 'webroot/css/error.css' "$MODPATH/webroot/css" true -extract "$ZIPFILE" 'webroot/fonts/ProductSans-Italic.ttf' "$MODPATH/webroot/fonts" true -extract "$ZIPFILE" 'webroot/fonts/ProductSans-Regular.ttf' "$MODPATH/webroot/fonts" true +extract "$ZIPFILE" 'webroot/fonts/font.ttf' "$MODPATH/webroot/fonts" true +extract "$ZIPFILE" 'webroot/fonts/outfit.css' "$MODPATH/webroot/fonts" true for lang in en_US ja_JP pt_BR ro_RO ru_RU vi_VN zh_CN zh_TW; do extract "$ZIPFILE" "webroot/lang/${lang}.json" "$MODPATH/webroot/lang" true diff --git a/webroot/css/fonts.css b/webroot/css/fonts.css deleted file mode 100644 index 560cf65..0000000 --- a/webroot/css/fonts.css +++ /dev/null @@ -1,9 +0,0 @@ -@font-face { - font-family: "ProductSans Regular"; - src: url("../fonts/ProductSans-Regular.ttf"); -} - -@font-face { - font-family: "ProductSans Italic"; - src: url("../fonts/ProductSans-Regular.ttf"); -} \ No newline at end of file diff --git a/webroot/css/index.css b/webroot/css/index.css index b5f83a1..c3f1374 100644 --- a/webroot/css/index.css +++ b/webroot/css/index.css @@ -15,7 +15,7 @@ /* Locked Color */ --lock-desc: #c9c9c9; --lock: #fff; - --font-family: 'ProductSans Regular', 'ProductSans Italic', sans-serif; + --font-family: 'Outfit', sans-serif; } * { @@ -365,7 +365,7 @@ input:checked + .slider:before { animation: openNav 0.15s; } -@media only screen and (min-width: 600px) { +@media (min-width:961px) { .navbar { background-color: var(--desktop-navbar); transform: scale(0.85); diff --git a/webroot/fonts/ProductSans-Italic.ttf b/webroot/fonts/ProductSans-Italic.ttf deleted file mode 100644 index 5b44037..0000000 Binary files a/webroot/fonts/ProductSans-Italic.ttf and /dev/null differ diff --git a/webroot/fonts/ProductSans-Regular.ttf b/webroot/fonts/ProductSans-Regular.ttf deleted file mode 100644 index e2c69c3..0000000 Binary files a/webroot/fonts/ProductSans-Regular.ttf and /dev/null differ diff --git a/webroot/fonts/font.ttf b/webroot/fonts/font.ttf new file mode 100644 index 0000000..826899c Binary files /dev/null and b/webroot/fonts/font.ttf differ diff --git a/webroot/fonts/outfit.css b/webroot/fonts/outfit.css new file mode 100644 index 0000000..6e94c86 --- /dev/null +++ b/webroot/fonts/outfit.css @@ -0,0 +1,4 @@ +@font-face { + font-family: "Outfit"; + src: url("./font.ttf"); +} \ No newline at end of file diff --git a/webroot/index.html b/webroot/index.html index 8a4b799..8838076 100644 --- a/webroot/index.html +++ b/webroot/index.html @@ -6,7 +6,7 @@ - +