From 7f52c2d55ba01c6352bf6ed674955ae52ba1372f Mon Sep 17 00:00:00 2001
From: drishu <aszilagyi@live.com>
Date: Mon, 16 Aug 2021 10:51:33 +0000
Subject: [PATCH] OEL-309: Update scaffold.

---
 bcl-builder.config.js                     | 18 +-----------
 composer.json                             |  2 +-
 config/install/oe_whitelabel.settings.yml | 17 -----------
 oe_whitelabel.breakpoints.yml             | 36 -----------------------
 oe_whitelabel.info.yml                    |  3 +-
 oe_whitelabel.libraries.yml               |  7 ++---
 package.json                              |  6 ++--
 runner.yml.dist                           |  2 +-
 8 files changed, 9 insertions(+), 82 deletions(-)
 delete mode 100644 config/install/oe_whitelabel.settings.yml
 delete mode 100644 oe_whitelabel.breakpoints.yml

diff --git a/bcl-builder.config.js b/bcl-builder.config.js
index b26233a7e..34746966b 100644
--- a/bcl-builder.config.js
+++ b/bcl-builder.config.js
@@ -18,21 +18,5 @@ module.exports = {
       },
     },
   ],
-  copy: [
-    {
-      from: ["node_modules/@openeuropa/bcl-theme-default/css/oe-bcl-default.min.css"],
-      to: path.resolve(outputFolder, "assets/css"),
-      options: { up: true },
-    },
-    {
-      from: ["node_modules/@openeuropa/bcl-theme-default/css/oe-bcl-default.min.css.map"],
-      to: path.resolve(outputFolder, "assets/css"),
-      options: { up: true },
-    },
-    {
-      from: ["node_modules/@openeuropa/bcl-theme-default/js/oe-bcl-default.bundle.js"],
-      to: path.resolve(outputFolder, "assets/js"),
-      options: { up: true },
-    }
-  ],
+  copy: []
 };
diff --git a/composer.json b/composer.json
index a2ac9b46f..94661705c 100644
--- a/composer.json
+++ b/composer.json
@@ -7,7 +7,7 @@
     "prefer-stable": true,
     "require": {
         "drupal/core": "^8.9 || ^9.1",
-        "openeuropa/oe_bootstrap_theme": "1.0.0-alpha1",
+        "openeuropa/oe_bootstrap_theme": "1.x-dev",
         "php": ">=7.3"
     },
     "require-dev": {
diff --git a/config/install/oe_whitelabel.settings.yml b/config/install/oe_whitelabel.settings.yml
deleted file mode 100644
index c2375f029..000000000
--- a/config/install/oe_whitelabel.settings.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-# Default settings should not be located here. This file is only used to
-# initially install a theme's "settings".
-#
-# Instead, the Drupal Bootstrap base theme uses the @BootstrapSetting
-# annotated plugin discovery process. This ensures that sub-theme settings are
-# inherited from base themes themes properly and to determine when a setting
-# should be saved to config as "overridden".
-#
-# @see \Drupal\bootstrap\Plugin\SettingBase
-# @see \Drupal\bootstrap\Plugin\SettingInterface
-# @see \Drupal\bootstrap\Plugin\SettingManager
-# @see \Drupal\bootstrap\Plugin\Form\SystemThemeSettings
-# @see \Drupal\bootstrap\ThemeSettings
-
-# This file cannot be empty, so install an initial empty array for "schemas".
-# @see https://www.drupal.org/node/2813829
-schemas: []
diff --git a/oe_whitelabel.breakpoints.yml b/oe_whitelabel.breakpoints.yml
deleted file mode 100644
index 4afd2d6aa..000000000
--- a/oe_whitelabel.breakpoints.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-default.xs:
-  label: XS
-  mediaQuery: '(max-width: 575px)'
-  weight: 0
-  multipliers:
-    - 1x
-default.sm:
-  label: SM
-  mediaQuery: '(min-width: 576px) and (max-width: 767px)'
-  weight: 1
-  multipliers:
-    - 1x
-default.md:
-  label: MD
-  mediaQuery: '(min-width: 768px) and (max-width: 991px)'
-  weight: 1
-  multipliers:
-    - 1x
-default.lg:
-  label: LG
-  mediaQuery: '(min-width: 992px) and (max-width: 1199px)'
-  weight: 1
-  multipliers:
-    - 1x
-default.xl:
-  label: XL
-  mediaQuery: '(min-width: 1200px) and (max-width: 1399px)'
-  weight: 1
-  multipliers:
-    - 1x
-default.xxl:
-  label: XXL
-  mediaQuery: '(min-width: 1400px)'
-  weight: 1
-  multipliers:
-    - 1x
diff --git a/oe_whitelabel.info.yml b/oe_whitelabel.info.yml
index 23a5660a2..b18d2a024 100644
--- a/oe_whitelabel.info.yml
+++ b/oe_whitelabel.info.yml
@@ -6,14 +6,13 @@ base theme: oe_bootstrap_theme
 core_version_requirement: ^8.9 || ^9.1
 
 libraries:
-  - oe_whitelabel/bcl
+  - oe_whitelabel/style
 
 libraries-override:
   system/admin:
     css:
       theme:
         css/system.admin.css: false
-  oe_bootstrap_theme/bcl: false
 
 ckeditor_stylesheets:
   - assets/css/oe-bcl-default.min.css
diff --git a/oe_whitelabel.libraries.yml b/oe_whitelabel.libraries.yml
index cedadb7f3..3243b9da6 100644
--- a/oe_whitelabel.libraries.yml
+++ b/oe_whitelabel.libraries.yml
@@ -1,6 +1,5 @@
-bcl:
-  js:
-    assets/js/oe-bcl-default.bundle.min.js: {}
+style:
+  version: VERSION
   css:
     theme:
-      assets/css/oe-bcl-default.min.css: {}
+      assets/css/oe_whitelabel.style.min.css: {}
diff --git a/package.json b/package.json
index 635358359..cfab7b570 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "oe_whitelabel",
   "version": "1.0.0",
-  "description": "OE_BOOTSTRAP_THEME_SUBTHEME_DESCRIPTION",
+  "description": "The OpenEuropa Whitelabel theme.",
   "private": true,
   "scripts": {
     "build": "npm-run-all build:*",
@@ -14,9 +14,7 @@
   },
   "devDependencies": {
     "@openeuropa/bcl-builder": "0.4.0",
-    "@openeuropa/bcl-theme-default": "0.4.0",
-    "bootstrap-ie11": "5.0.2",
-    "chokidar-cli": "1.2.0",
+    "chokidar-cli": "^3.0.0",
     "copyfiles": "2.4.1",
     "cross-env": "7.0.3",
     "glob": "7.1.7",
diff --git a/runner.yml.dist b/runner.yml.dist
index 136f12816..b4d202e6a 100644
--- a/runner.yml.dist
+++ b/runner.yml.dist
@@ -7,7 +7,7 @@ drupal:
   database:
     host: "mysql"
     port: "3306"
-    name: "oe_whitelabel"
+    name: "drupal"
     user: "root"
     password: ""
   post_install: