Everything works except fonts

This commit is contained in:
Eric Schultz 2019-11-21 15:57:39 -06:00 committed by Eric Schultz
parent d2a6fabb64
commit 567549c85c
8 changed files with 251 additions and 309 deletions

View file

@ -1,7 +1,6 @@
{ {
"bootstrapVersion": 3, "bootstrapVersion": 3,
"styleLoaders": ["style", "css", "sass"], "styleLoaders": ["style", "css", "sass"],
"extractStyles": true,
"styles": { "styles": {
"mixins": true, "mixins": true,
"grid": true, "grid": true,

View file

@ -1,3 +1,4 @@
// License: LGPL-3.0-or-later // License: LGPL-3.0-or-later
// require a root component here. This will be treated as the root of a webpack package // require a root component here. This will be treated as the root of a webpack package
require('bootstrap-loader');
require('../../../javascripts/app/create_new_offsite_payment_pane') require('../../../javascripts/app/create_new_offsite_payment_pane')

View file

@ -1,3 +1,4 @@
// License: LGPL-3.0-or-later // License: LGPL-3.0-or-later
// require a root component here. This will be treated as the root of a webpack package // require a root component here. This will be treated as the root of a webpack package
require('bootstrap-loader');
require('../../../javascripts/app/edit_payment_pane') require('../../../javascripts/app/edit_payment_pane')

View file

@ -1,4 +1,5 @@
// License: LGPL-3.0-or-later // License: LGPL-3.0-or-later
require('../../../client/css/global/page.css')
require('bootstrap-loader');
require('../../../javascripts/app/registration_page') require('../../../javascripts/app/registration_page')

View file

@ -1,3 +1,3 @@
// License: LGPL-3.0-or-later // License: LGPL-3.0-or-later
require('bootstrap-loader');
require('../../../javascripts/app/session_login_page') require('../../../javascripts/app/session_login_page')

View file

@ -15,8 +15,6 @@
<%= render 'layouts/stylesheets' %> <%= render 'layouts/stylesheets' %>
<%= IncludeAsset.css '/client/css/global/page.css' %>
<%= IncludeAsset.css '/client/css/bootstrap.css' %>
<%= favicon_link_tag %> <%= favicon_link_tag %>
<style> <style>

View file

@ -116,6 +116,7 @@
"jquery": "1.11.1", "jquery": "1.11.1",
"jquery.cookie": "1.4.1", "jquery.cookie": "1.4.1",
"marked": "^0.7.0", "marked": "^0.7.0",
"mini-css-extract-plugin": "^0.8.0",
"mobx": "^4.3.1", "mobx": "^4.3.1",
"mobx-react": "^5.4.3", "mobx-react": "^5.4.3",
"mobx-react-devtools": "^5.0.1", "mobx-react-devtools": "^5.0.1",

549
yarn.lock

File diff suppressed because it is too large Load diff