Skip to content

Commit c9b06d9

Browse files
committed
fix: bump deps, fixed env, fixed gulp warnings
1 parent 45d19c2 commit c9b06d9

File tree

7 files changed

+121
-104
lines changed

7 files changed

+121
-104
lines changed

template/.env.defaults

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ API_URL={{API_PROTOCOL}}://{{API_HOST}}:{{API_PORT}}
3535
API_SSL_KEY_PATH=
3636
API_SSL_CERT_PATH=
3737
API_SSL_CA_PATH=
38-
API_RATELIMIT_WHITELIST=138.197.213.185,178.62.29.206,104.248.224.170
38+
API_RATELIMIT_WHITELIST=
3939

4040
#########
4141
## app ##

template/assets/css/_custom.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
body {
1010
padding-top: 77px;
1111
text-rendering: optimizeLegibility;
12-
font-smoothing: antialiased;
12+
-webkit-font-smoothing: antialiased;
13+
-moz-osx-font-smoothing: grayscale;
1314
}
1415

1516
.text-decoration-underline {

template/assets/css/_markdown.scss

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
.markdown-body {
55
margin-left: 20px;
66
margin-right: 20px;
7+
font-family: $font-family-sans-serif;
8+
79
@for $index from 1 through 6 {
810
h#{$index} {
911
.anchor {
@@ -13,21 +15,24 @@
1315
}
1416
}
1517
}
18+
19+
code, kbd, pre, .commit-tease-sha, .blob-num, .blob-code-inner, {
20+
font-family: $font-family-monospace;
21+
}
22+
1623
code {
1724
color: #24292e;
1825
font-size: 100%;
1926
}
20-
pre > code {
21-
display: block;
22-
}
23-
font-family: $font-family-sans-serif;
24-
code, kbd, pre, .commit-tease-sha, .blob-num, .blob-code-inner, {
25-
font-family: $font-family-monospace;
26-
}
27-
.highlight pre, pre {
28-
padding: 1rem;
27+
28+
pre {
29+
> code {
30+
display: block;
31+
}
2932
}
33+
3034
pre, .highlight pre {
3135
font-size: 100%;
36+
padding: 1rem;
3237
}
3338
}

template/assets/css/app.scss

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,17 @@ $question: theme-color('light');
2121
// font awesome
2222
@import 'node_modules/@fortawesome/fontawesome-free/scss/fontawesome';
2323
// @import 'node_modules/@fortawesome/fontawesome-free/scss/brands';
24+
25+
// <https://github.com/stylelint/stylelint/issues/3848>
26+
$fontAwesomeBrands: 'Font Awesome 5 Brands';
27+
$fontAwesomeFree: 'Font Awesome 5 Free';
2428
.fab {
25-
font-family: 'Font Awesome 5 Brands';
29+
font-family: $fontAwesomeBrands;
2630
font-weight: 400;
2731
}
2832
// @import 'node_modules/@fortawesome/fontawesome-free/scss/solid';
2933
.fa, .fas {
30-
font-family: 'Font Awesome 5 Free';
34+
font-family: $fontAwesomeFree;
3135
font-weight: 900;
3236
}
3337
@import 'node_modules/@fortawesome/fontawesome-free/scss/v4-shims';

template/gulpfile.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ const cssnano = require('cssnano');
1414
const del = require('del');
1515
const envify = require('@ladjs/gulp-envify');
1616
const fontMagician = require('postcss-font-magician');
17-
const fontSmoothing = require('postcss-font-smoothing');
1817
const getStream = require('get-stream');
1918
const globby = require('globby');
2019
const gulpRemark = require('gulp-remark');
@@ -124,7 +123,6 @@ function css() {
124123
display: 'swap'
125124
}),
126125
postcssPresetEnv({ browsers: 'extends @ladjs/browserslist-config' }),
127-
fontSmoothing(),
128126
...(PROD ? [cssnano({ autoprefixer: false })] : []),
129127
reporter()
130128
])

template/package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"@koa/router": "^10.0.0",
3333
"@ladjs/api": "^6.0.0",
3434
"@ladjs/assets": "^1.1.1",
35-
"@ladjs/env": "^2.0.2",
35+
"@ladjs/env": "^3.0.0",
3636
"@ladjs/graceful": "^1.0.5",
3737
"@ladjs/i18n": "^7.0.1",
3838
"@ladjs/mongoose": "^2.1.1",
@@ -62,7 +62,7 @@
6262
"cheerio": "^1.0.0-rc.5",
6363
"clipboard": "^2.0.6",
6464
"consolidate": "^0.16.0",
65-
"crypto-random-string": "^3.3.0",
65+
"crypto-random-string": "^3.3.1",
6666
"custom-fonts-in-emails": "^4.0.2",
6767
"dashify": "^2.0.0",
6868
"dayjs": "^1.10.4",
@@ -131,10 +131,10 @@
131131
"zxcvbn": "^4.4.2"
132132
},
133133
"devDependencies": {
134-
"@babel/cli": "^7.12.13",
135-
"@babel/core": "^7.12.13",
134+
"@babel/cli": "^7.12.16",
135+
"@babel/core": "^7.12.16",
136136
"@babel/polyfill": "^7.12.1",
137-
"@babel/preset-env": "^7.12.13",
137+
"@babel/preset-env": "^7.12.16",
138138
"@commitlint/cli": "^11.0.0",
139139
"@commitlint/config-conventional": "^11.0.0",
140140
"@ladjs/browserslist-config": "^0.0.1",
@@ -188,7 +188,6 @@
188188
"parse-git-config": "^3.0.0",
189189
"postcss": "^8.2.6",
190190
"postcss-font-magician": "^3.0.0",
191-
"postcss-font-smoothing": "^0.1.0",
192191
"postcss-preset-env": "^6.7.0",
193192
"postcss-reporter": "^7.0.2",
194193
"postcss-scss": "^3.0.4",

0 commit comments

Comments
 (0)