move sass into src/sass and replace old 'sass' command with new 'css' command

.gitignore

@@ -12,17 +12,17 @@
 bundle.js
 # tempfiles
 .#*
-# webpack splays purescript modules in dist. we don't want these to be
-# added, but we do want static assets to be added
-/dist/*
-!/dist/styles/
-/dist/styles/*map
-!/dist/examples/
-!/dist/fonts/
-!/dist/images/
-!/dist/js/
-# css source maps
-/dist/styles/*map
+# # webpack splays purescript modules in dist. we don't want these to be
+# # added, but we do want static assets to be added
+# /dist/*
+# !/dist/styles/
+# /dist/styles/*map
+# !/dist/examples/
+# !/dist/fonts/
+# !/dist/images/
+# !/dist/js/
+# # css source maps
+# /dist/styles/*map
 # production builds
 /prod
 /dce-output

dist/styles/CodeEditor.css.map

+{"version":3,"sourceRoot":"","sources":["../../src/sass/CodeEditor.sass"],"names":[],"mappings":"AAqBA;EACE;;AAEA;EACE;;AACA;EACE;;AACJ;EACE;EACA;;;AAGF;EACE;EACA;EACA;;AACF;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EArDR;EACA;EACA;EACA;EACA;EACA;EACA;EAlBA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AA2DM;EACE;EACA;EACA;EACA;EACA;EA7DR;EACA;EACA;EACA;EACA;EACA;EACA;EAlBA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAmEE;EACE;EACA;EACA;EACA;EACA;EACA;;AACF;EACE;EACA;EACA;;AACA;EACE;EACA;;AACF;EACE;EACA;;AACF;EACE;EACA;;AAGE;EACE;;AAEF;EACE","file":"CodeEditor.css"}
\ No newline at end of file

dist/styles/Graph.css.map

+{"version":3,"sourceRoot":"","sources":["../../src/sass/Graph.sass"],"names":[],"mappings":"AAQE;EACE;EACA;;AAEA;EACE;EACA;EACA;;AACA;EACE;EACA;;AAEN;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;;AAEJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EAtCA;EACA;EAEA;EAqCE;EACA;;AACF;EACE;;AACF;EACE;;AAEF;EACE;;AAEF;EAlDA;EACA;EAEA;EAiDE;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAEF;EACE;EACA;;AAGA;EACE;EACA;;AACN;EACE;;AACF;EACE;;AAEF;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA","file":"Graph.css"}
\ No newline at end of file

dist/styles/Login.css.map

+{"version":3,"sourceRoot":"","sources":["../../src/sass/Login.sass"],"names":[],"mappings":"AAAA;EACE;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;;AACA;EACE;EACA;;;AAEJ;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAGF;EACE;;AAEE;EACE;EACA;;AACA;EACE;;;AAIJ;EACE;EACA;EACA;EACA;;;AAKJ;EACE;EACA;EACA;;;AAGJ;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AACF;EACE;EACA;;AACA;EACE;EACA;EACA;;AACA;EACE;;AACF;EACE;EACA;EACA;EACA;;AACA;EACE;;AACN;EACE;EACA;EACA;EACA;;;AAGN;EACE;EACA;EACA;EACA;EACA;;AAGE;EACE;;;AAEN;EACE;EACA;EACA;EACA;EACA;;AAGE;EACE;;;AAEN;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;;;AAEJ;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;;;AAGF;EACE;;;AAEJ;EACI;EACA;;;AAEJ;EACI;EACA;;;AAGF;EACE;;;AAEJ;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE","file":"Login.css"}
\ No newline at end of file

dist/styles/Styles.css.map

+{"version":3,"sourceRoot":"","sources":["../../src/sass/Styles.sass"],"names":[],"mappings":"AACE;EACE;;AACF;EACE;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;AAGE;EACE;EACA;;AAEF;EACE;EACA;;;AAEV;EACE;;AACA;EACE;EACA;EACA;;;AAKE;EACE;EACA;;AACF;EACE;;AACA;EACE;EACA;;AACJ;EACE;;AACA;EACE;;AACJ;EACE;;;AAER;EACE","file":"Styles.css"}
\ No newline at end of file

dist/styles/Tree.css.map

+{"version":3,"sourceRoot":"","sources":["../../src/sass/Tree.sass"],"names":[],"mappings":"AAAA;EACE;;;AAGA;EACE;EACA;;AACA;EACE;;AACF;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;;AAER;EACE;;AAEE;EACE;;AACA;EACE;EACA;EACA;EACA;;AACF;EACE;EACA;EACA;EACA;EACA;;AACF;EACE;;AACF;EACE;EACA;EACA;EAEA;EACA;EACA;;AAEA;EACE;;AACF;EACE;;AAGN;EACE;;AACF;EACE;;AACA;EACE;EACA;;AAEE;EACE;EACA;;AACF;EACE;EACA;;AAIR;EACE;;AACF;EACE;;AACA;EACE;EACA;;AAEE;EACE;EACA;;AACF;EACE;EACA;;AACF;EACE;EACA;;AAEV;EACE;;AACF;EACE;;AAEE;EACE;;AACF;EACE;;AACN;EACE;;AAEE;EACE;EACA;;;AAGR;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EAEE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;;AAEF;EACE;;;AAIF;EACE;;AAEA;EACE","file":"Tree.css"}
\ No newline at end of file

dist/styles/range-slider.css.map

+{"version":3,"sourceRoot":"","sources":["../../src/sass/range-slider.sass"],"names":[],"mappings":"AAAA;EACE;AACA;EACA;;AAEA;EACE;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EAEA;EAEA;;AAEA;EACE;EAEA;EACA;EACA","file":"range-slider.css"}
\ No newline at end of file

index.html

@@ -3,10 +3,7 @@
     <head>
         <meta charset="utf-8"/>
         <title>CNRS GarganText</title>
-        <!-- <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"> -->
-        <!--<link href="https://use.fontawesome.com/releases/v5.0.8/styles/all.css" rel="stylesheet">-->
         <link rel="stylesheet" href="dist/icons/forkawesome.css">
-        <!--<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/fork-awesome@1.1.7/css/fork-awesome.min.css" integrity="sha256-gsmEoJAws/Kd3CjuOQzLie5Q3yshhvmo7YNtBG7aaEY=" crossorigin="anonymous">-->
         <link href="dist/styles/login.min.css" rel="stylesheet">
         <link href="dist/styles/bootstrap.min.css" rel="stylesheet">
         <link rel="stylesheet" type="text/css" href="dist/styles/context-menu.css"/>
@@ -26,6 +23,5 @@
         <div id="app" class ="container-fluid"></div>
         <div id="portal"></div>
         <script src="app.js"></script>
-        <script src="dist/js/bootstrap-native.min.js"></script>
     </body>
 </html>

package.json

@@ -4,10 +4,10 @@
     "scripts": {
         "rebase-set": "spago package-set-upgrade && spago psc-package-insdhall",
         "rebuild-set": "spago psc-package-insdhall",
-        "install-ps": "psc-package.exe install",
+        "install-ps": "psc-package install",
         "compile": "pulp build",
         "build": "pulp browserify -t dist/bundle.js",
-        "sass": "sass dist/styles/",
+        "css": "sass src/sass/:dist/styles/",
         "docs": "pulp docs -- --format html",
         "repl": "pulp repl",
         "clean": "rm -Rf output node_modules",

src/.psc-ide-port

-15747
\ No newline at end of file

src/index.html

-<!doctype>
-<html>
-    <head>
-        <meta charset="utf-8"/>
-        <title>CNRS GarganText</title>
-        <!-- <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"> -->
-        <!--<link href="https://use.fontawesome.com/releases/v5.0.8/styles/all.css" rel="stylesheet">-->
-        <link rel="stylesheet" href="icons/forkawesome.css">
-        <!--<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/fork-awesome@1.1.7/css/fork-awesome.min.css" integrity="sha256-gsmEoJAws/Kd3CjuOQzLie5Q3yshhvmo7YNtBG7aaEY=" crossorigin="anonymous">-->
-        <link href="styles/login.min.css" rel="stylesheet">
-        <link href="styles/bootstrap.min.css" rel="stylesheet">
-        <link rel="stylesheet" type="text/css" href="styles/context-menu.css"/>
-        <link rel="stylesheet" type="text/css" href="styles/menu.css"/>
-        <link rel="stylesheet" type="text/css" href="styles/highlightjs-solarized-light.css"/>
-        <link href="styles/Graph.css" rel="stylesheet" type="text/css" />
-        <link href="styles/Login.css" rel="stylesheet" type="text/css" />
-        <link href="styles/Tree.css" rel="stylesheet" type="text/css" />
-        <link href="styles/CodeEditor.css" rel="stylesheet" type="text/css" />
-        <link href="styles/Styles.css" rel="stylesheet" type="text/css" />
-        <link href="styles/range-slider.css" rel="stylesheet" type="text/css" />
-        <style>
-         * {margin: 0; padding: 0; list-style: none;}
-        </style>
-    </head>
-    <body>
-        <div id="app" class ="container-fluid"></div>
-        <div id="portal"></div>
-        <script src="bundle.js"></script>
-        <script src="js/bootstrap-native.min.js"></script>
-    </body>
-</html>

src/index.js

-// This file is just a wrapper so that webpack will call our main function
-require('../output/Main').main();