Skip to content

[WIP] Add Webpack Config #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jul 23, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Resolve import path error in node-sass build
  • Loading branch information
Ari committed Jul 19, 2019
commit 49e30533d5f8446701bb8a01ccac5eddfaf31ea8
2 changes: 2 additions & 0 deletions build/webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/*eslint no-undef: 0*/

const path = require("path");
const MiniCssExtractPlugin = require("mini-css-extract-plugin");
const CopyWebpackPlugin = require("copy-webpack-plugin");
Expand Down
3 changes: 2 additions & 1 deletion src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<link id="favicon" rel="shortcut icon" type="image/png" href="assets/favicon.ico.png">
<meta name="viewport" content="width=device-width, initial-scale=1">

<link rel="stylesheet" href="output.css">
<link rel="stylesheet" href="styles/styles.css">
<link rel="stylesheet" href="styles/bulma-mods.css"> <!--ALWAYS import this last-->

Expand All @@ -19,7 +20,6 @@
</noscript>
</head>
<body onload="
set_license()
document.getElementById('sa-checkbox').checked = app_state.chooser.inputs.share_alike"
>
<header style="padding-bottom: 1%">
Expand Down Expand Up @@ -730,6 +730,7 @@ <h1 class="title is-1">This is the dropdown click area</h1>
</div>-->
</div>
<script src="https://cdn.jsdelivr.net/npm/vue@2.6.10/dist/vue.js"></script>
<script type="text/javascript" src="main.js"></script>
<script type="text/javascript" src="index.js"></script>
<script type="text/javascript" src="scripts/page-controls.js"></script>
<script type="text/javascript" src="scripts/HTML-generator.js"></script>
Expand Down
4 changes: 4 additions & 0 deletions src/scripts/choose-a-license.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
set_license_text()
set_license_icons()
set_license_info()

function set_license() {
set_license_text()
set_license_icons()
Expand Down
8 changes: 6 additions & 2 deletions src/styles/sass/bulma-mods.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ https://github.com/jgthms/bulma/issues/1818
@import "../../../node_modules/bulma/sass/utilities/mixins.sass";
@import url("https://fonts.googleapis.com/css?family=Source+Sans+Pro%3A400%2C600%2C700%7CRoboto+Condensed&ver=4.9.8");

// Must be imported by url. If not, causes webpack build to fail.
// Also, this import path does not resolve correctly from this
// scss file, but does from the generated .css
@import url("../../node_modules/cool-checkboxes-for-bulma.io/dist/css/bulma-radio-checkbox.css");

$cc-orange: #ef9421;
$light-grey: #a7a9ac;
$dark-grey: hsl(0, 0%, 0%);
Expand All @@ -27,5 +32,4 @@ $default: $cc-orange;
@import "../../../node_modules/bulma/sass/components/modal.sass";
@import "../../../node_modules/bulma/sass/grid/_all.sass";
@import "../../../node_modules/bulma/sass/layout/_all.sass";
@import "../../../node_modules/bulma-switch/dist/css/bulma-switch.sass";
@import "../../../node_modules/cool-checkboxes-for-bulma.io/dist/css/bulma-radio-checkbox.css";
@import "../../../node_modules/bulma-switch/dist/css/bulma-switch.sass";