Bump do-bulma for Inter (#245)

* Bump do-bulma

* Fix SCSS font includes

* Inject resolve-url-loader

* Also bump do-vue
pull/248/head
Matt (IPv4) Cowley 4 years ago committed by GitHub
parent 3ddceae0d9
commit bbb572a668
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

4186
package-lock.json generated

File diff suppressed because it is too large Load Diff

@ -64,7 +64,7 @@ THE SOFTWARE.
} }
p { p {
@include sailec-regular; @include font-regular;
} }
.button { .button {
@ -78,7 +78,7 @@ THE SOFTWARE.
} }
p { p {
@include sailec-medium; @include font-medium;
font-size: 15px; font-size: 15px;
margin: 0; margin: 0;

@ -56,7 +56,7 @@ THE SOFTWARE.
} }
> p { > p {
@include sailec-medium; @include font-medium;
color: $dark-grey; color: $dark-grey;
font-size: 14px; font-size: 14px;
@ -111,7 +111,7 @@ THE SOFTWARE.
} }
label { label {
@include sailec-medium; @include font-medium;
color: $dark-blue; color: $dark-blue;
font-size: 1rem; font-size: 1rem;
@ -206,7 +206,7 @@ THE SOFTWARE.
} }
label { label {
@include sailec-medium; @include font-medium;
color: $dark-grey; color: $dark-grey;
font-size: 14px; font-size: 14px;

@ -33,7 +33,7 @@ THE SOFTWARE.
.container { .container {
h3 { h3 {
@include sailec-medium; @include font-medium;
} }
form { form {

@ -46,6 +46,19 @@ module.exports = {
].filter(x => !!x), ].filter(x => !!x),
}, },
chainWebpack: config => { chainWebpack: config => {
// Inject resolve-url-loader into the SCSS loader rules (to allow relative fonts in do-bulma to work)
for (const rule of ['vue-modules', 'vue', 'normal-modules', 'normal']) {
config.module.rule('scss')
.oneOf(rule)
.use('resolve-url-loader')
.loader('resolve-url-loader')
.before('sass-loader')
.end()
.use('sass-loader')
.loader('sass-loader')
.tap(options => ({ ...options, sourceMap: true }));
}
// Use a custom HTML template // Use a custom HTML template
config.plugin('html').tap(options => { config.plugin('html').tap(options => {
options[0].template = path.join(__dirname, 'build', 'index.html'); options[0].template = path.join(__dirname, 'build', 'index.html');

Loading…
Cancel
Save