diff --git a/WebfrontCore/bundleconfig.json b/WebfrontCore/bundleconfig.json index 35d5ec75..a980657c 100644 --- a/WebfrontCore/bundleconfig.json +++ b/WebfrontCore/bundleconfig.json @@ -4,7 +4,8 @@ "inputFiles": [ "wwwroot/lib/halfmoon/css/halfmoon-variables.min.css", "wwwroot/css/global.css", - "wwwroot/lib/chart.js/dist/Chart.min.css" + "wwwroot/lib/chart.js/dist/Chart.min.css", + "wwwroot/css/open-iconic.css" ] }, { @@ -15,6 +16,7 @@ "wwwroot/lib/moment-timezone/moment-timezone.min.js", "wwwroot/lib/chart.js/dist/Chart.bundle.min.js", "wwwroot/lib/halfmoon/js/halfmoon.min.js", + "wwwroot/lib/canvas.js/canvasjs.js", "wwwroot/js/action.js", "wwwroot/js/console.js", "wwwroot/js/penalty.js", diff --git a/WebfrontCore/compilerconfig.json b/WebfrontCore/compilerconfig.json new file mode 100644 index 00000000..3f7a0f36 --- /dev/null +++ b/WebfrontCore/compilerconfig.json @@ -0,0 +1,14 @@ +[ + { + "outputFile": "wwwroot/css/global.css", + "inputFile": "wwwroot/css/src/main.scss" + }, + { + "outputFile": "wwwroot/css/src/profile.css", + "inputFile": "wwwroot/css/src/profile.scss" + }, + { + "outputFile": "wwwroot/css/open-iconic.css", + "inputFile": "wwwroot/lib/open-iconic/font/css/open-iconic-bootstrap.scss" + } +] diff --git a/WebfrontCore/wwwroot/css/src/main.scss b/WebfrontCore/wwwroot/css/src/main.scss index 25472fb2..1438d6f2 100644 --- a/WebfrontCore/wwwroot/css/src/main.scss +++ b/WebfrontCore/wwwroot/css/src/main.scss @@ -1,7 +1,6 @@ @import 'profile.scss'; $icon-font-path: '/font/' !default; -@import '../../lib/open-iconic/font/css/open-iconic-bootstrap.scss'; :root { --blue-color: #007ACC; @@ -22,8 +21,6 @@ $icon-font-path: '/font/' !default; --lm-base-body-bg-color: rgb(245, 245, 245); --lm-card-bg-color: var(--gray-color-light); --gray-color-light: white; - //--dm-border-color: var(--primary-color); - //--lm-border-color: var(--primary-color); --card-border-width: 0; }