Fix UI icons

mihaitodor · mihaitodor · commit 0b828ac6e948 · 2018-05-09T22:47:10.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -8,4 +8,5 @@ bower_components
 node_modules
 npm-debug.log
 .idea/
-.DS_Store
+.DS_Store
+ui/package-lock.json
diff --git a/ui/app/bower.json b/ui/app/bower.json
@@ -14,6 +14,6 @@
     "html5-boilerplate": "^5.3.0",
     "underscore": "1.8.3",
     "papaparse": "4.1.2",
-    "bootstrap": "^3.3.7"
+    "bootswatch-dist": "superhero"
   }
 }
diff --git a/ui/app/css/bootstrap-superhero.min.css b/ui/app/css/bootstrap-superhero.min.css
diff --git a/ui/app/index.html b/ui/app/index.html
@@ -10,7 +10,7 @@
   <meta name="description" content="">
 
   <script src="bower_components/html5-boilerplate/dist/js/vendor/modernizr-2.8.3.min.js"></script>
-  <link rel="stylesheet" type="text/css" href="css/bootstrap-superhero.min.css">
+  <link rel="stylesheet" type="text/css" href="bower_components/bootswatch-dist/css/bootstrap.min.css">
 </head>
 <body>
   <!--[if lt IE 7]>
diff --git a/ui/package.json b/ui/package.json
@@ -18,20 +18,18 @@
   },
   "scripts": {
     "postinstall": "cd app && bower install",
-
     "prestart": "npm install",
     "start": "http-server -a localhost -p 8000 -c-1 ./app",
-
     "pretest": "npm install",
     "test": "karma start karma.conf.js",
     "test-single-run": "karma start karma.conf.js --single-run",
-
     "preupdate-webdriver": "npm install",
     "update-webdriver": "webdriver-manager update",
-
     "preprotractor": "npm run update-webdriver",
     "protractor": "protractor e2e-tests/protractor.conf.js",
-
     "update-index-async": "node -e \"var fs=require('fs'),indexFile='app/index-async.html',loaderFile='app/bower_components/angular-loader/angular-loader.min.js',loaderText=fs.readFileSync(loaderFile,'utf-8').split(/sourceMappingURL=angular-loader.min.js.map/).join('sourceMappingURL=bower_components/angular-loader/angular-loader.min.js.map'),indexText=fs.readFileSync(indexFile,'utf-8').split(/\\/\\/@@NG_LOADER_START@@[\\s\\S]*\\/\\/@@NG_LOADER_END@@/).join('//@@NG_LOADER_START@@\\n'+loaderText+'    //@@NG_LOADER_END@@');fs.writeFileSync(indexFile,indexText);\""
+  },
+  "dependencies": {
+    "npm": "^6.0.0"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,6 @@`
`14`	`14`	`"html5-boilerplate": "^5.3.0",`
`15`	`15`	`"underscore": "1.8.3",`
`16`	`16`	`"papaparse": "4.1.2",`
`17`		`- "bootstrap": "^3.3.7"`
	`17`	`+ "bootswatch-dist": "superhero"`
`18`	`18`	`}`
`19`	`19`	`}`