Merge pull request #38 from OpenConext/feature/restore-styling

Restore bootstrap layout

package.json

@@ -6,7 +6,7 @@
     "import-glob-loader": "^1",
     "node-sass": "^4",
     "query-string": "^6.8.3",
-    "sass-loader": "^7",
+    "sass-loader": "^9.0.1",
     "ts-loader": "^5.3.0",
     "tslint": "^5",
     "tslint-config-airbnb": "^5",
@@ -22,7 +22,7 @@
     "@types/urlsafe-base64": "^1.0.28",
     "@types/webappsec-credential-management": "^0.5.1",
     "axios": "^0.19.0",
-    "bootstrap-sass": "^3.4.1",
+    "bootstrap": "^3",
     "core-js": "^3.2.1",
     "css-loader": "^0",
     "handlebars": ">=4.4.5",
@@ -37,12 +37,14 @@
     "select2": "^4",
     "serialize-javascript": ">=2.1.1",
     "ts-jest": "^24.0.2",
-    "urlsafe-base64": "^1.0.0"
+    "urlsafe-base64": "^1.0.0",
+    "yargs-parser": ">=18.1.2"
   },
   "resolutions": {
     "js-yaml": ">=3.13.1",
     "handlebars": ">=4.5.2",
     "serialize-javascript": ">=2.1.1",
     "yargs-parser": ">=18.1.2"
-  }
+  },
+  "license": "Apache-2.0"
 }

public/scss/application.scss

@@ -1,8 +1,6 @@
 @charset "utf-8";
 
-@icon-font-path: "node_modules/bootstrap-sass/assets/fonts/bootstrap"
-@import "node_modules/bootstrap-sass/assets/stylesheets/bootstrap";
-@import "node_modules/bootstrap-sass/assets/stylesheets/bootstrap-sprockets";
+@import "bootstrap";
 @import "vars";
 
 .main-content {

webpack.config.js

@@ -8,11 +8,10 @@ Encore
     .addEntry('registration', './public/typescript/registration.tsx')
     .addEntry('authentication', './public/typescript/authentication.tsx')
     .enableSassLoader(function (options) {
-        // https://github.com/sass/node-sass#options.
-        options.includePaths = [
-            'node_modules/bootstrap-sass/assets/stylesheets'
-        ];
-        options.outputStyle = 'expanded';
+        options.sassOptions = {
+            outputStyle: 'expanded',
+            includePaths: ['public'],
+        };
     })
     .enableTypeScriptLoader()
     .cleanupOutputBeforeBuild()