diff --git a/package.json b/package.json index fea45f1f..4fc09c05 100644 --- a/package.json +++ b/package.json @@ -33,6 +33,8 @@ "skinview3d": "^1.1.0-alpha.4", "sweetalert2": "^6.11.5", "toastr": "^2.1.4", + "typeface-minecraft": "^1.0.0", + "typeface-ubuntu": "^0.0.54", "vue": "^2.5.16", "vuejs-paginate": "^2.0.1" }, diff --git a/resources/assets/src/fonts/minecraft.eot b/resources/assets/src/fonts/minecraft.eot deleted file mode 100644 index 14ad29b5..00000000 Binary files a/resources/assets/src/fonts/minecraft.eot and /dev/null differ diff --git a/resources/assets/src/fonts/minecraft.svg b/resources/assets/src/fonts/minecraft.svg deleted file mode 100644 index 8727ee54..00000000 --- a/resources/assets/src/fonts/minecraft.svg +++ /dev/null @@ -1,253 +0,0 @@ - - - - -Created by FontForge 20150824 at Sat Jan 2 05:31:30 2016 - By Everything Fonts -Copyright Pwnage_Block 2011 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/assets/src/fonts/minecraft.ttf b/resources/assets/src/fonts/minecraft.ttf deleted file mode 100644 index c223014a..00000000 Binary files a/resources/assets/src/fonts/minecraft.ttf and /dev/null differ diff --git a/resources/assets/src/fonts/minecraft.woff b/resources/assets/src/fonts/minecraft.woff deleted file mode 100644 index 8009c272..00000000 Binary files a/resources/assets/src/fonts/minecraft.woff and /dev/null differ diff --git a/resources/assets/src/fonts/minecraft.woff2 b/resources/assets/src/fonts/minecraft.woff2 deleted file mode 100644 index 6db88bb8..00000000 Binary files a/resources/assets/src/fonts/minecraft.woff2 and /dev/null differ diff --git a/resources/assets/src/fonts/ubuntu.woff2 b/resources/assets/src/fonts/ubuntu.woff2 deleted file mode 100644 index 8d900ac4..00000000 Binary files a/resources/assets/src/fonts/ubuntu.woff2 and /dev/null differ diff --git a/resources/assets/src/stylus/common.styl b/resources/assets/src/stylus/common.styl new file mode 100644 index 00000000..9839ab25 --- /dev/null +++ b/resources/assets/src/stylus/common.styl @@ -0,0 +1,14 @@ +font_stack = Ubuntu, 'Segoe UI', 'Microsoft Yahei', 'Microsoft Jhenghei', sans-serif; + +body, h1, h2, h3, h4, h5, h6, .logo { + font-family: font_stack !important; +} + +.swal2-modal, .swal2-content { + font-family: font_stack; + font-weight: 400 !important; +} + +.swal2-modal h2 { + font-size: 25px; +} diff --git a/webpack.config.js b/webpack.config.js index a338ad5a..7e892d00 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -17,6 +17,9 @@ module.exports = [{ 'font-awesome/css/font-awesome.min.css', 'icheck/skins/square/blue.css', 'toastr/build/toastr.min.css', + 'typeface-ubuntu', + 'typeface-minecraft', + './resources/assets/src/stylus/common.styl', ] }, output: { @@ -54,6 +57,15 @@ module.exports = [{ test: /node_modules.*\.css$/, use: [MiniCssExtractPlugin.loader, 'css-loader'] }, + { + test: /common\.styl$/, + use: [ + MiniCssExtractPlugin.loader, + { loader: 'css-loader', options: { importLoaders: 2 } }, + 'postcss-loader', + 'stylus-loader' + ] + }, { test: /\.(png|jpg|gif|svg|woff2?|eot|ttf)$/, loader: 'url-loader', diff --git a/yarn.lock b/yarn.lock index bbc5219e..d48a5ec7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7213,6 +7213,14 @@ typedarray@^0.0.6, typedarray@~0.0.5: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" +typeface-minecraft@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/typeface-minecraft/-/typeface-minecraft-1.0.0.tgz#1624627ed15eff5fb7e70f19807097a5b13ce1c3" + +typeface-ubuntu@^0.0.54: + version "0.0.54" + resolved "https://registry.yarnpkg.com/typeface-ubuntu/-/typeface-ubuntu-0.0.54.tgz#1219d28be0a86b9a2d779e53d8b89d13de911ac3" + uglify-es@^3.3.4: version "3.3.9" resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.9.tgz#0c1c4f0700bed8dbc124cdb304d2592ca203e677"