Skip to content

Commit

Permalink
OEL-309: Update scaffold.
Browse files Browse the repository at this point in the history
  • Loading branch information
drishu committed Aug 16, 2021
1 parent 4bf4030 commit 7f52c2d
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 82 deletions.
18 changes: 1 addition & 17 deletions bcl-builder.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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: []
};
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
17 changes: 0 additions & 17 deletions config/install/oe_whitelabel.settings.yml

This file was deleted.

36 changes: 0 additions & 36 deletions oe_whitelabel.breakpoints.yml

This file was deleted.

3 changes: 1 addition & 2 deletions oe_whitelabel.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 3 additions & 4 deletions oe_whitelabel.libraries.yml
Original file line number Diff line number Diff line change
@@ -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: {}
6 changes: 2 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -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:*",
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion runner.yml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ drupal:
database:
host: "mysql"
port: "3306"
name: "oe_whitelabel"
name: "drupal"
user: "root"
password: ""
post_install:
Expand Down

0 comments on commit 7f52c2d

Please sign in to comment.