Merge pull request #119 from maykinmedia/feature/114-admin-override

💄 [#114] updated admin ui

Author: joeribekker

.babelrc

@@ -1,5 +1,10 @@
 {
     "presets": [
-        "@babel/preset-env",
-    ]
+        "@babel/preset-env"
+    ],
+    "env": {
+        "test": {
+        "plugins": [ "istanbul" ]
+        }
+    }
 }

karma.conf.js

@@ -4,18 +4,6 @@ const webpackConfig = require('./webpack.config.js');
 // Prevent testing infrastructure from crashing (MIGHT REQUIRE --production --sourcemap NOT TO BE SET!
 webpackConfig.output.library = undefined;
 
-// Add istanbul-instrumenter to webpack configuration
-webpackConfig.module.rules.push({
-    test: /\.js$/,
-    include: __dirname + '/' + paths.jsSrcDir,
-    loader: 'istanbul-instrumenter-loader',
-    enforce: 'post',
-
-    options: {
-        esModules: true
-    }
-});
-
 
 // The preprocessor config
 const preprocessors = {};

package-lock.json

@@ -21,18 +21,22 @@
   "license": "UNLICENSED",
   "homepage": "https://maykinmedia.nl",
   "dependencies": {
-    "microscope-sass": "latest"
+    "microscope-sass": "^2.0.0"
+  },
+  "nyc": {
+    "sourceMap": false,
+    "instrument": false
   },
   "devDependencies": {
     "@babel/core": "latest",
     "@babel/polyfill": "latest",
     "@babel/preset-env": "latest",
     "autoprefixer": "latest",
     "babel-loader": "latest",
+    "babel-plugin-istanbul": "^6.1.1",
     "chai": "latest",
     "css-loader": "latest",
     "cssnano": "latest",
-    "istanbul-instrumenter-loader": "latest",
     "karma": "^6.3.14",
     "karma-chrome-launcher": "latest",
     "karma-coverage": "latest",

package.json

@@ -0,0 +1,26 @@
+/* Colors */
+$color_primary: #04a5bb;
+$color_primary_dark: #017092;
+$color_primary_light: #c3eaef;
+
+$color_secondary: #f3f3f3;
+$color_secondary_dark: #ddd;
+$color_secondary_light: #fff;
+
+$color_link: #017092;
+$color_link_hover: #051f31;
+
+$color_darkest: #000;
+$color_dark: #333;
+$color_dark_light: #888;
+$color_lightest: #fff;
+
+$color-error: #ba2121; // default django admin color
+
+$color-tooltip-background: #fffeaa;
+$color-tooltip-border: #f7f071;
+$color-tooltip-text: #000;
+$django-hijack-yellow: #ffe761;
+
+/* Dimensions */
+$input-field-size: 40em; // original: 20em;