You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by hn...@apache.org on 2017/11/16 10:01:55 UTC
[myfaces-tobago] branch master updated (c8732e6 -> 9e76731)
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git.
from c8732e6 TOBAGO-1818 Progress in the Measure class (cleanup and CSS support) * update javadoc for *ListEditor classes * tc:segmentLayout margins can now separated by space * adjust description for segment layout attributes * fix NPE: BootstrapClass.valueOf(Measure, Attributes) * correct segment values greater than 12 or lower than 1 and log it * fix SegmentLayoutConstraint overwrite attributes * add a test for BootstrapClass.valueOf(Measure, Attributes) * improve segment layout d [...]
new 1f38c92 TOBAGO-1825 Plain bootstrap for 'Standard' theme, 'Scarborough' is the new default. * scarborough as default theme * create plain bootstrap standard theme
new 9e76731 rebuild themes after update
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
tobago-example/pom.xml | 2 -
.../src/main/webapp/WEB-INF/tobago-config.xml | 4 +-
tobago-theme/pom.xml | 1 +
.../tobago-theme-charlotteville/rebuild-theme.log | 56 ++++++++--------
.../tobago-theme-roxborough/rebuild-theme.log | 58 ++++++++--------
.../tobago-theme-scarborough/rebuild-theme.log | 64 +++++++++---------
.../tobago-bootstrap/_version/css/bootstrap.css | 29 ++++++++
.../_version/css/bootstrap.css.map | 2 +-
.../_version/css/bootstrap.min.css | 2 +-
.../_version/css/bootstrap.min.css.map | 2 +-
.../src/main/scss/_tobago-theme.scss | 7 ++
.../tobago-theme-speyside/rebuild-theme.log | 60 ++++++++---------
.../tobago-theme-standard/rebuild-theme.log | 77 +++++++++++-----------
.../tobago-bootstrap/_version/css/bootstrap.css | 29 --------
.../_version/css/bootstrap.css.map | 2 +-
.../_version/css/bootstrap.min.css | 2 +-
.../_version/css/bootstrap.min.css.map | 2 +-
.../src/main/scss/_tobago-theme.scss | 7 --
18 files changed, 202 insertions(+), 204 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@myfaces.apache.org" <co...@myfaces.apache.org>'].
[myfaces-tobago] 02/02: rebuild themes after update
Posted by hn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 9e76731710ff41b1e77063d8cc24d3050c52d4a2
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Thu Nov 16 11:01:05 2017 +0100
rebuild themes after update
---
.../tobago-theme-charlotteville/rebuild-theme.log | 56 ++++++++--------
.../tobago-theme-roxborough/rebuild-theme.log | 58 ++++++++--------
.../tobago-theme-scarborough/rebuild-theme.log | 64 +++++++++---------
.../tobago-bootstrap/_version/css/bootstrap.css | 29 ++++++++
.../_version/css/bootstrap.css.map | 2 +-
.../_version/css/bootstrap.min.css | 2 +-
.../_version/css/bootstrap.min.css.map | 2 +-
.../tobago-theme-speyside/rebuild-theme.log | 60 ++++++++---------
.../tobago-theme-standard/rebuild-theme.log | 77 +++++++++++-----------
.../tobago-bootstrap/_version/css/bootstrap.css | 29 --------
.../_version/css/bootstrap.css.map | 2 +-
.../_version/css/bootstrap.min.css | 2 +-
.../_version/css/bootstrap.min.css.map | 2 +-
13 files changed, 192 insertions(+), 193 deletions(-)
diff --git a/tobago-theme/tobago-theme-charlotteville/rebuild-theme.log b/tobago-theme/tobago-theme-charlotteville/rebuild-theme.log
index d9042ae..0424ac6 100644
--- a/tobago-theme/tobago-theme-charlotteville/rebuild-theme.log
+++ b/tobago-theme/tobago-theme-charlotteville/rebuild-theme.log
@@ -1,4 +1,4 @@
-Build date: 2017-11-15 14:49:00
+Build date: 2017-11-16 10:39:35
[INFO] Scanning for projects...
[INFO]
[INFO] ------------------------------------------------------------------------
@@ -55,11 +55,11 @@ Build date: 2017-11-15 14:49:00
[INFO] > node install.js
[INFO]
[INFO] PhantomJS not found on PATH
-[INFO] Download already available at /var/folders/w0/pg4pxr7972l6bq85x08s5cl00000gn/T/phantomjs/phantomjs-2.1.1-macosx.zip
+[INFO] Download already available at /var/folders/yp/1vrxjnrs20798ydt_yl8wrpr0000gp/T/phantomjs/phantomjs-2.1.1-macosx.zip
[INFO] Verified checksum of previously downloaded file
[INFO] Extracting zip contents
[INFO] Removing __CURRENT__/tobago-theme-charlotteville/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom
-[INFO] Copying extracted folder /var/folders/w0/pg4pxr7972l6bq85x08s5cl00000gn/T/phantomjs/phantomjs-2.1.1-macosx.zip-extract-1510753777326/phantomjs-2.1.1-macosx -> __CURRENT__/tobago-theme-charlotteville/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom
+[INFO] Copying extracted folder /var/folders/yp/1vrxjnrs20798ydt_yl8wrpr0000gp/T/phantomjs/phantomjs-2.1.1-macosx.zip-extract-1510825268495/phantomjs-2.1.1-macosx -> __CURRENT__/tobago-theme-charlotteville/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom
[INFO] Writing location.js file
[INFO] Done. Phantomjs binary available at __CURRENT__/tobago-theme-charlotteville/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs
[INFO]
@@ -73,7 +73,7 @@ Build date: 2017-11-15 14:49:00
[INFO] ├─┬ autoprefixer@7.1.6
[INFO] │ ├─┬ browserslist@2.9.0
[INFO] │ │ └── electron-to-chromium@1.3.27
-[INFO] │ ├── caniuse-lite@1.0.30000764
+[INFO] │ ├── caniuse-lite@1.0.30000765
[INFO] │ ├── normalize-range@0.1.2
[INFO] │ ├── num2fraction@1.2.2
[INFO] │ ├─┬ postcss@6.0.14
@@ -130,7 +130,6 @@ Build date: 2017-11-15 14:49:00
[INFO] │ │ │ │ ├─┬ are-we-there-yet@1.1.4
[INFO] │ │ │ │ │ └── delegates@1.0.0
[INFO] │ │ │ │ ├── console-control-strings@1.1.0
-[WARNING] npm WARN bootstrap@4.0.0-beta.2 requires a peer of jquery@1.9.1 - 3 but none was installed.
[INFO] │ │ │ │ ├─┬ gauge@2.7.4
[INFO] │ │ │ │ │ ├── aproba@1.1.1
[INFO] │ │ │ │ │ ├── has-unicode@2.0.1
@@ -313,6 +312,7 @@ Build date: 2017-11-15 14:49:00
[INFO] │ │ ├── regenerate-unicode-properties@5.1.3
[INFO] │ │ ├── regjsgen@0.3.0
[INFO] │ │ ├─┬ regjsparser@0.2.1
+[WARNING] npm WARN bootstrap@4.0.0-beta.2 requires a peer of jquery@1.9.1 - 3 but none was installed.
[INFO] │ │ │ └── jsesc@0.5.0
[INFO] │ │ ├─┬ unicode-match-property-ecmascript@1.0.3
[INFO] │ │ │ ├── unicode-canonical-property-names-ecmascript@1.0.3
@@ -492,7 +492,7 @@ Build date: 2017-11-15 14:49:00
[INFO] │ └── text-table@0.2.0
[INFO] ├─┬ eslint-plugin-compat@2.1.0
[INFO] │ ├── babel-runtime@6.26.0
-[INFO] │ ├── caniuse-db@1.0.30000764
+[INFO] │ ├── caniuse-db@1.0.30000765
[INFO] │ └── requireindex@1.1.0
[INFO] ├─┬ htmllint-cli@0.0.6
[INFO] │ ├── bluebird@3.5.1
@@ -1035,12 +1035,12 @@ Build date: 2017-11-15 14:49:00
[INFO] > bootstrap@4.0.0-beta.2 css-prefix __CURRENT__/tobago-theme-charlotteville/target/bootstrap
[INFO] > postcss --config build/postcss.config.js --replace "dist/css/*.css"
[INFO]
-[ERROR] ✔ Finished dist/css/bootstrap-grid.css (1.06 s)
-[ERROR] ✔ Finished dist/css/bootstrap-grid.min.css (1.06 s)
-[ERROR] ✔ Finished dist/css/bootstrap-reboot.css (1.06 s)
-[ERROR] ✔ Finished dist/css/bootstrap.min.css (1.07 s)
-[ERROR] ✔ Finished dist/css/bootstrap.css (1.07 s)
-[ERROR] ✔ Finished dist/css/bootstrap-reboot.min.css (1.07 s)
+[ERROR] ✔ Finished dist/css/bootstrap-grid.css (1.05 s)
+[ERROR] ✔ Finished dist/css/bootstrap-grid.min.css (1.05 s)
+[ERROR] ✔ Finished dist/css/bootstrap-reboot.css (1.05 s)
+[ERROR] ✔ Finished dist/css/bootstrap-reboot.min.css (1.05 s)
+[ERROR] ✔ Finished dist/css/bootstrap.min.css (1.05 s)
+[ERROR] ✔ Finished dist/css/bootstrap.css (1.05 s)
[INFO]
[INFO] --- frontend-maven-plugin:1.4:npm (step #10: npm run css-minify) @ tobago-theme-charlotteville ---
[INFO] Running 'npm run css-minify' in __CURRENT__/tobago-theme-charlotteville/target/bootstrap
@@ -1068,14 +1068,14 @@ Build date: 2017-11-15 14:49:00
[INFO] > npm-run-all --parallel js-compile-*
[INFO]
[INFO]
-[INFO] > bootstrap@4.0.0-beta.2 js-compile-plugins __CURRENT__/tobago-theme-charlotteville/target/bootstrap
-[INFO] > cross-env PLUGINS=true babel js/src/ --out-dir js/dist/ --source-maps
-[INFO]
-[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-compile-standalone __CURRENT__/tobago-theme-charlotteville/target/bootstrap
[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:false --config build/rollup.config.js --sourcemap
[INFO]
[INFO]
+[INFO] > bootstrap@4.0.0-beta.2 js-compile-plugins __CURRENT__/tobago-theme-charlotteville/target/bootstrap
+[INFO] > cross-env PLUGINS=true babel js/src/ --out-dir js/dist/ --source-maps
+[INFO]
+[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-compile-bundle __CURRENT__/tobago-theme-charlotteville/target/bootstrap
[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:true --config build/rollup.config.js --sourcemap
[INFO]
@@ -1095,22 +1095,22 @@ Build date: 2017-11-15 14:49:00
[INFO] js/src/tab.js -> js/dist/tab.js
[INFO] js/src/tooltip.js -> js/dist/tooltip.js
[INFO] js/src/util.js -> js/dist/util.js
-[ERROR] created dist/js/bootstrap.js in 1.7s
-[ERROR] created dist/js/bootstrap.bundle.js in 1.8s
+[ERROR] created dist/js/bootstrap.js in 3.5s
+[ERROR] created dist/js/bootstrap.bundle.js in 3.6s
[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-compile-standalone __CURRENT__/tobago-theme-charlotteville/target/bootstrap
[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:false --config build/rollup.config.js --sourcemap
[INFO]
[ERROR]
[ERROR] __CURRENT__/tobago-theme-charlotteville/target/bootstrap/js/src/index.js → dist/js/bootstrap.js...
-[ERROR] created dist/js/bootstrap.js in 1.4s
+[ERROR] created dist/js/bootstrap.js in 3.5s
[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-compile-bundle __CURRENT__/tobago-theme-charlotteville/target/bootstrap
[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:true --config build/rollup.config.js --sourcemap
[INFO]
[ERROR]
[ERROR] __CURRENT__/tobago-theme-charlotteville/target/bootstrap/js/src/index.js → dist/js/bootstrap.bundle.js...
-[ERROR] created dist/js/bootstrap.bundle.js in 1.6s
+[ERROR] created dist/js/bootstrap.bundle.js in 2.5s
[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-compile-plugins __CURRENT__/tobago-theme-charlotteville/target/bootstrap
[INFO] > cross-env PLUGINS=true babel js/src/ --out-dir js/dist/ --source-maps
@@ -1136,15 +1136,15 @@ Build date: 2017-11-15 14:49:00
[INFO] > uglifyjs --compress typeofs=false --mangle --comments "/^!/" --source-map "content=dist/js/bootstrap.js.map,includeSources,url=bootstrap.min.js.map" --output dist/js/bootstrap.min.js dist/js/bootstrap.js
[INFO]
[INFO]
-[INFO] > bootstrap@4.0.0-beta.2 js-minify-bundle __CURRENT__/tobago-theme-charlotteville/target/bootstrap
-[INFO] > uglifyjs --compress typeofs=false --mangle --comments "/^!/" --source-map "content=dist/js/bootstrap.bundle.js.map,includeSources,url=bootstrap.bundle.min.js.map" --output dist/js/bootstrap.bundle.min.js dist/js/bootstrap.bundle.js
-[INFO]
-[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-minify-docs __CURRENT__/tobago-theme-charlotteville/target/bootstrap
[INFO] > uglifyjs --mangle --comments "/^!/" --output assets/js/docs.min.js assets/js/vendor/anchor.min.js assets/js/vendor/clipboard.min.js assets/js/vendor/holder.min.js assets/js/src/application.js assets/js/src/pwa.js
[INFO]
-[ERROR] INFO: Using input source map: dist/js/bootstrap.js.map
+[INFO]
+[INFO] > bootstrap@4.0.0-beta.2 js-minify-bundle __CURRENT__/tobago-theme-charlotteville/target/bootstrap
+[INFO] > uglifyjs --compress typeofs=false --mangle --comments "/^!/" --source-map "content=dist/js/bootstrap.bundle.js.map,includeSources,url=bootstrap.bundle.min.js.map" --output dist/js/bootstrap.bundle.min.js dist/js/bootstrap.bundle.js
+[INFO]
[ERROR] INFO: Using input source map: dist/js/bootstrap.bundle.js.map
+[ERROR] INFO: Using input source map: dist/js/bootstrap.js.map
[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-minify-standalone __CURRENT__/tobago-theme-charlotteville/target/bootstrap
[INFO] > uglifyjs --compress typeofs=false --mangle --comments "/^!/" --source-map "content=dist/js/bootstrap.js.map,includeSources,url=bootstrap.min.js.map" --output dist/js/bootstrap.min.js dist/js/bootstrap.js
@@ -1201,7 +1201,7 @@ main:
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
-[INFO] Total time: 01:07 min
-[INFO] Finished at: 2017-11-15T14:50:09+01:00
-[INFO] Final Memory: 28M/388M
+[INFO] Total time: 02:20 min
+[INFO] Finished at: 2017-11-16T10:41:57+01:00
+[INFO] Final Memory: 26M/86M
[INFO] ------------------------------------------------------------------------
diff --git a/tobago-theme/tobago-theme-roxborough/rebuild-theme.log b/tobago-theme/tobago-theme-roxborough/rebuild-theme.log
index 08303d5..ee92980 100644
--- a/tobago-theme/tobago-theme-roxborough/rebuild-theme.log
+++ b/tobago-theme/tobago-theme-roxborough/rebuild-theme.log
@@ -1,4 +1,4 @@
-Build date: 2017-11-15 14:50:09
+Build date: 2017-11-16 10:41:57
[INFO] Scanning for projects...
[INFO]
[INFO] ------------------------------------------------------------------------
@@ -55,11 +55,11 @@ Build date: 2017-11-15 14:50:09
[INFO] > node install.js
[INFO]
[INFO] PhantomJS not found on PATH
-[INFO] Download already available at /var/folders/w0/pg4pxr7972l6bq85x08s5cl00000gn/T/phantomjs/phantomjs-2.1.1-macosx.zip
+[INFO] Download already available at /var/folders/yp/1vrxjnrs20798ydt_yl8wrpr0000gp/T/phantomjs/phantomjs-2.1.1-macosx.zip
[INFO] Verified checksum of previously downloaded file
[INFO] Extracting zip contents
[INFO] Removing __CURRENT__/tobago-theme-roxborough/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom
-[INFO] Copying extracted folder /var/folders/w0/pg4pxr7972l6bq85x08s5cl00000gn/T/phantomjs/phantomjs-2.1.1-macosx.zip-extract-1510753847781/phantomjs-2.1.1-macosx -> __CURRENT__/tobago-theme-roxborough/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom
+[INFO] Copying extracted folder /var/folders/yp/1vrxjnrs20798ydt_yl8wrpr0000gp/T/phantomjs/phantomjs-2.1.1-macosx.zip-extract-1510825367794/phantomjs-2.1.1-macosx -> __CURRENT__/tobago-theme-roxborough/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom
[INFO] Writing location.js file
[INFO] Done. Phantomjs binary available at __CURRENT__/tobago-theme-roxborough/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs
[INFO]
@@ -73,7 +73,7 @@ Build date: 2017-11-15 14:50:09
[INFO] ├─┬ autoprefixer@7.1.6
[INFO] │ ├─┬ browserslist@2.9.0
[INFO] │ │ └── electron-to-chromium@1.3.27
-[INFO] │ ├── caniuse-lite@1.0.30000764
+[INFO] │ ├── caniuse-lite@1.0.30000765
[INFO] │ ├── normalize-range@0.1.2
[INFO] │ ├── num2fraction@1.2.2
[INFO] │ ├─┬ postcss@6.0.14
@@ -94,6 +94,7 @@ Build date: 2017-11-15 14:50:09
[INFO] │ │ ├── babel-types@7.0.0-beta.2
[INFO] │ │ ├── babylon@7.0.0-beta.25
[INFO] │ │ ├── json5@0.5.1
+[WARNING] npm WARN bootstrap@4.0.0-beta.2 requires a peer of jquery@1.9.1 - 3 but none was installed.
[INFO] │ │ └── source-map@0.5.7
[INFO] │ ├─┬ babel-polyfill@7.0.0-beta.2
[INFO] │ │ ├── core-js@2.5.1
@@ -125,7 +126,6 @@ Build date: 2017-11-15 14:50:09
[INFO] │ │ │ │ ├── abbrev@1.1.0
[INFO] │ │ │ │ └─┬ osenv@0.1.4
[INFO] │ │ │ │ ├── os-homedir@1.0.2
-[WARNING] npm WARN bootstrap@4.0.0-beta.2 requires a peer of jquery@1.9.1 - 3 but none was installed.
[INFO] │ │ │ │ └── os-tmpdir@1.0.2
[INFO] │ │ │ ├─┬ npmlog@4.1.0
[INFO] │ │ │ │ ├─┬ are-we-there-yet@1.1.4
@@ -492,7 +492,7 @@ Build date: 2017-11-15 14:50:09
[INFO] │ └── text-table@0.2.0
[INFO] ├─┬ eslint-plugin-compat@2.1.0
[INFO] │ ├── babel-runtime@6.26.0
-[INFO] │ ├── caniuse-db@1.0.30000764
+[INFO] │ ├── caniuse-db@1.0.30000765
[INFO] │ └── requireindex@1.1.0
[INFO] ├─┬ htmllint-cli@0.0.6
[INFO] │ ├── bluebird@3.5.1
@@ -1020,8 +1020,8 @@ Build date: 2017-11-15 14:50:09
[INFO] > node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap.scss dist/css/bootstrap.css && node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap-grid.scss dist/css/bootstrap-grid.css && node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap-reboot.scss dist/css/bootstrap-reboot.css
[INFO]
[ERROR] Rendering Complete, saving .css file...
-[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-roxborough/target/bootstrap/dist/css/bootstrap.css.map
[ERROR] Wrote CSS to __CURRENT__/tobago-theme-roxborough/target/bootstrap/dist/css/bootstrap.css
+[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-roxborough/target/bootstrap/dist/css/bootstrap.css.map
[ERROR] Rendering Complete, saving .css file...
[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-roxborough/target/bootstrap/dist/css/bootstrap-grid.css.map
[ERROR] Wrote CSS to __CURRENT__/tobago-theme-roxborough/target/bootstrap/dist/css/bootstrap-grid.css
@@ -1035,12 +1035,12 @@ Build date: 2017-11-15 14:50:09
[INFO] > bootstrap@4.0.0-beta.2 css-prefix __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO] > postcss --config build/postcss.config.js --replace "dist/css/*.css"
[INFO]
-[ERROR] ✔ Finished dist/css/bootstrap-grid.css (1.04 s)
-[ERROR] ✔ Finished dist/css/bootstrap-grid.min.css (1.04 s)
-[ERROR] ✔ Finished dist/css/bootstrap-reboot.css (1.04 s)
-[ERROR] ✔ Finished dist/css/bootstrap-reboot.min.css (1.04 s)
-[ERROR] ✔ Finished dist/css/bootstrap.css (1.04 s)
-[ERROR] ✔ Finished dist/css/bootstrap.min.css (1.04 s)
+[ERROR] ✔ Finished dist/css/bootstrap-grid.min.css (1.28 s)
+[ERROR] ✔ Finished dist/css/bootstrap-grid.css (1.28 s)
+[ERROR] ✔ Finished dist/css/bootstrap-reboot.css (1.28 s)
+[ERROR] ✔ Finished dist/css/bootstrap-reboot.min.css (1.28 s)
+[ERROR] ✔ Finished dist/css/bootstrap.min.css (1.28 s)
+[ERROR] ✔ Finished dist/css/bootstrap.css (1.28 s)
[INFO]
[INFO] --- frontend-maven-plugin:1.4:npm (step #10: npm run css-minify) @ tobago-theme-roxborough ---
[INFO] Running 'npm run css-minify' in __CURRENT__/tobago-theme-roxborough/target/bootstrap
@@ -1068,6 +1068,10 @@ Build date: 2017-11-15 14:50:09
[INFO] > npm-run-all --parallel js-compile-*
[INFO]
[INFO]
+[INFO] > bootstrap@4.0.0-beta.2 js-compile-standalone __CURRENT__/tobago-theme-roxborough/target/bootstrap
+[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:false --config build/rollup.config.js --sourcemap
+[INFO]
+[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-compile-bundle __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:true --config build/rollup.config.js --sourcemap
[INFO]
@@ -1075,10 +1079,6 @@ Build date: 2017-11-15 14:50:09
[INFO] > bootstrap@4.0.0-beta.2 js-compile-plugins __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO] > cross-env PLUGINS=true babel js/src/ --out-dir js/dist/ --source-maps
[INFO]
-[INFO]
-[INFO] > bootstrap@4.0.0-beta.2 js-compile-standalone __CURRENT__/tobago-theme-roxborough/target/bootstrap
-[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:false --config build/rollup.config.js --sourcemap
-[INFO]
[ERROR]
[ERROR] __CURRENT__/tobago-theme-roxborough/target/bootstrap/js/src/index.js → dist/js/bootstrap.js...
[ERROR]
@@ -1095,22 +1095,22 @@ Build date: 2017-11-15 14:50:09
[INFO] js/src/tab.js -> js/dist/tab.js
[INFO] js/src/tooltip.js -> js/dist/tooltip.js
[INFO] js/src/util.js -> js/dist/util.js
-[ERROR] created dist/js/bootstrap.js in 1.6s
-[ERROR] created dist/js/bootstrap.bundle.js in 1.8s
+[ERROR] created dist/js/bootstrap.js in 2.7s
+[ERROR] created dist/js/bootstrap.bundle.js in 2.9s
[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-compile-standalone __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:false --config build/rollup.config.js --sourcemap
[INFO]
[ERROR]
[ERROR] __CURRENT__/tobago-theme-roxborough/target/bootstrap/js/src/index.js → dist/js/bootstrap.js...
-[ERROR] created dist/js/bootstrap.js in 1.4s
+[ERROR] created dist/js/bootstrap.js in 1.5s
[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-compile-bundle __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:true --config build/rollup.config.js --sourcemap
[INFO]
[ERROR]
[ERROR] __CURRENT__/tobago-theme-roxborough/target/bootstrap/js/src/index.js → dist/js/bootstrap.bundle.js...
-[ERROR] created dist/js/bootstrap.bundle.js in 1.6s
+[ERROR] created dist/js/bootstrap.bundle.js in 1.8s
[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-compile-plugins __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO] > cross-env PLUGINS=true babel js/src/ --out-dir js/dist/ --source-maps
@@ -1136,15 +1136,15 @@ Build date: 2017-11-15 14:50:09
[INFO] > uglifyjs --compress typeofs=false --mangle --comments "/^!/" --source-map "content=dist/js/bootstrap.bundle.js.map,includeSources,url=bootstrap.bundle.min.js.map" --output dist/js/bootstrap.bundle.min.js dist/js/bootstrap.bundle.js
[INFO]
[INFO]
-[INFO] > bootstrap@4.0.0-beta.2 js-minify-docs __CURRENT__/tobago-theme-roxborough/target/bootstrap
-[INFO] > uglifyjs --mangle --comments "/^!/" --output assets/js/docs.min.js assets/js/vendor/anchor.min.js assets/js/vendor/clipboard.min.js assets/js/vendor/holder.min.js assets/js/src/application.js assets/js/src/pwa.js
-[INFO]
-[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-minify-standalone __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO] > uglifyjs --compress typeofs=false --mangle --comments "/^!/" --source-map "content=dist/js/bootstrap.js.map,includeSources,url=bootstrap.min.js.map" --output dist/js/bootstrap.min.js dist/js/bootstrap.js
[INFO]
-[ERROR] INFO: Using input source map: dist/js/bootstrap.bundle.js.map
+[INFO]
+[INFO] > bootstrap@4.0.0-beta.2 js-minify-docs __CURRENT__/tobago-theme-roxborough/target/bootstrap
+[INFO] > uglifyjs --mangle --comments "/^!/" --output assets/js/docs.min.js assets/js/vendor/anchor.min.js assets/js/vendor/clipboard.min.js assets/js/vendor/holder.min.js assets/js/src/application.js assets/js/src/pwa.js
+[INFO]
[ERROR] INFO: Using input source map: dist/js/bootstrap.js.map
+[ERROR] INFO: Using input source map: dist/js/bootstrap.bundle.js.map
[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-minify-standalone __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO] > uglifyjs --compress typeofs=false --mangle --comments "/^!/" --source-map "content=dist/js/bootstrap.js.map,includeSources,url=bootstrap.min.js.map" --output dist/js/bootstrap.min.js dist/js/bootstrap.js
@@ -1201,7 +1201,7 @@ main:
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
-[INFO] Total time: 01:08 min
-[INFO] Finished at: 2017-11-15T14:51:20+01:00
-[INFO] Final Memory: 29M/392M
+[INFO] Total time: 01:30 min
+[INFO] Finished at: 2017-11-16T10:43:29+01:00
+[INFO] Final Memory: 26M/86M
[INFO] ------------------------------------------------------------------------
diff --git a/tobago-theme/tobago-theme-scarborough/rebuild-theme.log b/tobago-theme/tobago-theme-scarborough/rebuild-theme.log
index d4cc105..12e5cd2 100644
--- a/tobago-theme/tobago-theme-scarborough/rebuild-theme.log
+++ b/tobago-theme/tobago-theme-scarborough/rebuild-theme.log
@@ -1,4 +1,4 @@
-Build date: 2017-11-15 14:51:20
+Build date: 2017-11-16 10:43:29
[INFO] Scanning for projects...
[INFO]
[INFO] ------------------------------------------------------------------------
@@ -55,11 +55,11 @@ Build date: 2017-11-15 14:51:20
[INFO] > node install.js
[INFO]
[INFO] PhantomJS not found on PATH
-[INFO] Download already available at /var/folders/w0/pg4pxr7972l6bq85x08s5cl00000gn/T/phantomjs/phantomjs-2.1.1-macosx.zip
+[INFO] Download already available at /var/folders/yp/1vrxjnrs20798ydt_yl8wrpr0000gp/T/phantomjs/phantomjs-2.1.1-macosx.zip
[INFO] Verified checksum of previously downloaded file
[INFO] Extracting zip contents
[INFO] Removing __CURRENT__/tobago-theme-scarborough/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom
-[INFO] Copying extracted folder /var/folders/w0/pg4pxr7972l6bq85x08s5cl00000gn/T/phantomjs/phantomjs-2.1.1-macosx.zip-extract-1510753918712/phantomjs-2.1.1-macosx -> __CURRENT__/tobago-theme-scarborough/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom
+[INFO] Copying extracted folder /var/folders/yp/1vrxjnrs20798ydt_yl8wrpr0000gp/T/phantomjs/phantomjs-2.1.1-macosx.zip-extract-1510825469173/phantomjs-2.1.1-macosx -> __CURRENT__/tobago-theme-scarborough/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom
[INFO] Writing location.js file
[INFO] Done. Phantomjs binary available at __CURRENT__/tobago-theme-scarborough/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs
[INFO]
@@ -73,7 +73,7 @@ Build date: 2017-11-15 14:51:20
[INFO] ├─┬ autoprefixer@7.1.6
[INFO] │ ├─┬ browserslist@2.9.0
[INFO] │ │ └── electron-to-chromium@1.3.27
-[INFO] │ ├── caniuse-lite@1.0.30000764
+[INFO] │ ├── caniuse-lite@1.0.30000765
[INFO] │ ├── normalize-range@0.1.2
[INFO] │ ├── num2fraction@1.2.2
[INFO] │ ├─┬ postcss@6.0.14
@@ -119,7 +119,6 @@ Build date: 2017-11-15 14:51:20
[INFO] │ │ │ │ ├── cryptiles@2.0.5
[INFO] │ │ │ │ ├── hoek@2.16.3
[INFO] │ │ │ │ └── sntp@1.0.9
-[WARNING] npm WARN bootstrap@4.0.0-beta.2 requires a peer of jquery@1.9.1 - 3 but none was installed.
[INFO] │ │ │ ├─┬ mkdirp@0.5.1
[INFO] │ │ │ │ └── minimist@0.0.8
[INFO] │ │ │ ├─┬ nopt@4.0.1
@@ -492,7 +491,7 @@ Build date: 2017-11-15 14:51:20
[INFO] │ └── text-table@0.2.0
[INFO] ├─┬ eslint-plugin-compat@2.1.0
[INFO] │ ├── babel-runtime@6.26.0
-[INFO] │ ├── caniuse-db@1.0.30000764
+[INFO] │ ├── caniuse-db@1.0.30000765
[INFO] │ └── requireindex@1.1.0
[INFO] ├─┬ htmllint-cli@0.0.6
[INFO] │ ├── bluebird@3.5.1
@@ -1012,6 +1011,7 @@ Build date: 2017-11-15 14:51:20
[INFO] │ └── lodash.templatesettings@4.1.0
[INFO] └── workbox-sw@2.1.1
[INFO]
+[WARNING] npm WARN bootstrap@4.0.0-beta.2 requires a peer of jquery@1.9.1 - 3 but none was installed.
[INFO]
[INFO] --- frontend-maven-plugin:1.4:npm (step #8: npm run css-compile) @ tobago-theme-scarborough ---
[INFO] Running 'npm run css-compile' in __CURRENT__/tobago-theme-scarborough/target/bootstrap
@@ -1020,14 +1020,14 @@ Build date: 2017-11-15 14:51:20
[INFO] > node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap.scss dist/css/bootstrap.css && node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap-grid.scss dist/css/bootstrap-grid.css && node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap-reboot.scss dist/css/bootstrap-reboot.css
[INFO]
[ERROR] Rendering Complete, saving .css file...
-[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-scarborough/target/bootstrap/dist/css/bootstrap.css.map
[ERROR] Wrote CSS to __CURRENT__/tobago-theme-scarborough/target/bootstrap/dist/css/bootstrap.css
+[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-scarborough/target/bootstrap/dist/css/bootstrap.css.map
[ERROR] Rendering Complete, saving .css file...
-[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-scarborough/target/bootstrap/dist/css/bootstrap-grid.css.map
[ERROR] Wrote CSS to __CURRENT__/tobago-theme-scarborough/target/bootstrap/dist/css/bootstrap-grid.css
+[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-scarborough/target/bootstrap/dist/css/bootstrap-grid.css.map
[ERROR] Rendering Complete, saving .css file...
-[ERROR] Wrote CSS to __CURRENT__/tobago-theme-scarborough/target/bootstrap/dist/css/bootstrap-reboot.css
[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-scarborough/target/bootstrap/dist/css/bootstrap-reboot.css.map
+[ERROR] Wrote CSS to __CURRENT__/tobago-theme-scarborough/target/bootstrap/dist/css/bootstrap-reboot.css
[INFO]
[INFO] --- frontend-maven-plugin:1.4:npm (step #9: npm run css-prefix) @ tobago-theme-scarborough ---
[INFO] Running 'npm run css-prefix' in __CURRENT__/tobago-theme-scarborough/target/bootstrap
@@ -1035,12 +1035,12 @@ Build date: 2017-11-15 14:51:20
[INFO] > bootstrap@4.0.0-beta.2 css-prefix __CURRENT__/tobago-theme-scarborough/target/bootstrap
[INFO] > postcss --config build/postcss.config.js --replace "dist/css/*.css"
[INFO]
-[ERROR] ✔ Finished dist/css/bootstrap-reboot.css (1.08 s)
-[ERROR] ✔ Finished dist/css/bootstrap.css (1.08 s)
-[ERROR] ✔ Finished dist/css/bootstrap.min.css (1.08 s)
-[ERROR] ✔ Finished dist/css/bootstrap-grid.css (1.08 s)
-[ERROR] ✔ Finished dist/css/bootstrap-reboot.min.css (1.08 s)
-[ERROR] ✔ Finished dist/css/bootstrap-grid.min.css (1.08 s)
+[ERROR] ✔ Finished dist/css/bootstrap-reboot.css (1.24 s)
+[ERROR] ✔ Finished dist/css/bootstrap-grid.css (1.24 s)
+[ERROR] ✔ Finished dist/css/bootstrap-grid.min.css (1.24 s)
+[ERROR] ✔ Finished dist/css/bootstrap.min.css (1.24 s)
+[ERROR] ✔ Finished dist/css/bootstrap-reboot.min.css (1.24 s)
+[ERROR] ✔ Finished dist/css/bootstrap.css (1.25 s)
[INFO]
[INFO] --- frontend-maven-plugin:1.4:npm (step #10: npm run css-minify) @ tobago-theme-scarborough ---
[INFO] Running 'npm run css-minify' in __CURRENT__/tobago-theme-scarborough/target/bootstrap
@@ -1072,17 +1072,17 @@ Build date: 2017-11-15 14:51:20
[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:false --config build/rollup.config.js --sourcemap
[INFO]
[INFO]
-[INFO] > bootstrap@4.0.0-beta.2 js-compile-plugins __CURRENT__/tobago-theme-scarborough/target/bootstrap
-[INFO] > cross-env PLUGINS=true babel js/src/ --out-dir js/dist/ --source-maps
-[INFO]
-[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-compile-bundle __CURRENT__/tobago-theme-scarborough/target/bootstrap
[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:true --config build/rollup.config.js --sourcemap
[INFO]
-[ERROR]
-[ERROR] __CURRENT__/tobago-theme-scarborough/target/bootstrap/js/src/index.js → dist/js/bootstrap.js...
+[INFO]
+[INFO] > bootstrap@4.0.0-beta.2 js-compile-plugins __CURRENT__/tobago-theme-scarborough/target/bootstrap
+[INFO] > cross-env PLUGINS=true babel js/src/ --out-dir js/dist/ --source-maps
+[INFO]
[ERROR]
[ERROR] __CURRENT__/tobago-theme-scarborough/target/bootstrap/js/src/index.js → dist/js/bootstrap.bundle.js...
+[ERROR]
+[ERROR] __CURRENT__/tobago-theme-scarborough/target/bootstrap/js/src/index.js → dist/js/bootstrap.js...
[INFO] js/src/alert.js -> js/dist/alert.js
[INFO] js/src/button.js -> js/dist/button.js
[INFO] js/src/carousel.js -> js/dist/carousel.js
@@ -1095,22 +1095,22 @@ Build date: 2017-11-15 14:51:20
[INFO] js/src/tab.js -> js/dist/tab.js
[INFO] js/src/tooltip.js -> js/dist/tooltip.js
[INFO] js/src/util.js -> js/dist/util.js
-[ERROR] created dist/js/bootstrap.js in 1.6s
-[ERROR] created dist/js/bootstrap.bundle.js in 1.8s
+[ERROR] created dist/js/bootstrap.js in 3.3s
+[ERROR] created dist/js/bootstrap.bundle.js in 3.6s
[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-compile-standalone __CURRENT__/tobago-theme-scarborough/target/bootstrap
[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:false --config build/rollup.config.js --sourcemap
[INFO]
[ERROR]
[ERROR] __CURRENT__/tobago-theme-scarborough/target/bootstrap/js/src/index.js → dist/js/bootstrap.js...
-[ERROR] created dist/js/bootstrap.js in 1.4s
+[ERROR] created dist/js/bootstrap.js in 1.8s
[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-compile-bundle __CURRENT__/tobago-theme-scarborough/target/bootstrap
[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:true --config build/rollup.config.js --sourcemap
[INFO]
[ERROR]
[ERROR] __CURRENT__/tobago-theme-scarborough/target/bootstrap/js/src/index.js → dist/js/bootstrap.bundle.js...
-[ERROR] created dist/js/bootstrap.bundle.js in 1.5s
+[ERROR] created dist/js/bootstrap.bundle.js in 1.9s
[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-compile-plugins __CURRENT__/tobago-theme-scarborough/target/bootstrap
[INFO] > cross-env PLUGINS=true babel js/src/ --out-dir js/dist/ --source-maps
@@ -1136,13 +1136,13 @@ Build date: 2017-11-15 14:51:20
[INFO] > uglifyjs --compress typeofs=false --mangle --comments "/^!/" --source-map "content=dist/js/bootstrap.js.map,includeSources,url=bootstrap.min.js.map" --output dist/js/bootstrap.min.js dist/js/bootstrap.js
[INFO]
[INFO]
-[INFO] > bootstrap@4.0.0-beta.2 js-minify-docs __CURRENT__/tobago-theme-scarborough/target/bootstrap
-[INFO] > uglifyjs --mangle --comments "/^!/" --output assets/js/docs.min.js assets/js/vendor/anchor.min.js assets/js/vendor/clipboard.min.js assets/js/vendor/holder.min.js assets/js/src/application.js assets/js/src/pwa.js
-[INFO]
-[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-minify-bundle __CURRENT__/tobago-theme-scarborough/target/bootstrap
[INFO] > uglifyjs --compress typeofs=false --mangle --comments "/^!/" --source-map "content=dist/js/bootstrap.bundle.js.map,includeSources,url=bootstrap.bundle.min.js.map" --output dist/js/bootstrap.bundle.min.js dist/js/bootstrap.bundle.js
[INFO]
+[INFO]
+[INFO] > bootstrap@4.0.0-beta.2 js-minify-docs __CURRENT__/tobago-theme-scarborough/target/bootstrap
+[INFO] > uglifyjs --mangle --comments "/^!/" --output assets/js/docs.min.js assets/js/vendor/anchor.min.js assets/js/vendor/clipboard.min.js assets/js/vendor/holder.min.js assets/js/src/application.js assets/js/src/pwa.js
+[INFO]
[ERROR] INFO: Using input source map: dist/js/bootstrap.js.map
[ERROR] INFO: Using input source map: dist/js/bootstrap.bundle.js.map
[INFO]
@@ -1201,7 +1201,7 @@ main:
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
-[INFO] Total time: 01:10 min
-[INFO] Finished at: 2017-11-15T14:52:31+01:00
-[INFO] Final Memory: 28M/373M
+[INFO] Total time: 01:43 min
+[INFO] Finished at: 2017-11-16T10:45:14+01:00
+[INFO] Final Memory: 26M/86M
[INFO] ------------------------------------------------------------------------
diff --git a/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/resources/tobago/scarborough/tobago-bootstrap/_version/css/bootstrap.css b/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/resources/tobago/scarborough/tobago-bootstrap/_version/css/bootstrap.css
index 6324168..d2dff8d 100644
--- a/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/resources/tobago/scarborough/tobago-bootstrap/_version/css/bootstrap.css
+++ b/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/resources/tobago/scarborough/tobago-bootstrap/_version/css/bootstrap.css
@@ -8405,6 +8405,35 @@ a.text-dark:focus, a.text-dark:hover {
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+.btn-secondary {
+ color: #111;
+ background-color: #fff;
+ border-color: #ced4da;
+}
+
+.btn-secondary:hover {
+ color: #111;
+ background-color: #ececec;
+ border-color: #b1bbc4;
+}
+
+.btn-secondary:focus, .btn-secondary.focus {
+ box-shadow: 0 0 0 0.2rem rgba(206, 212, 218, 0.5);
+}
+
+.btn-secondary.disabled, .btn-secondary:disabled {
+ background-color: #fff;
+ border-color: #ced4da;
+}
+
+.btn-secondary:not([disabled]):not(.disabled):active, .btn-secondary:not([disabled]):not(.disabled).active,
+.show > .btn-secondary.dropdown-toggle {
+ color: #111;
+ background-color: #e6e6e6;
+ border-color: #aab4bf;
+ box-shadow: 0 0 0 0.2rem rgba(206, 212, 218, 0.5);
+}
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/resources/tobago/scarborough/tobago-bootstrap/_version/css/bootstrap.css.map b/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/resources/tobago/scarborough/tobago-bootstrap/_version/css/bootstrap.css.map
index ecc1e20..285ffd3 100644
--- a/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/resources/tobago/scarborough/tobago-bootstrap/_version/css/bootstrap.css.map
+++ b/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/resources/tobago/scarborough/tobago-bootstrap/_version/css/bootstrap.css.map
@@ -1 +1 @@
-{"version":3,"sources":["bootstrap.css","../../scss/bootstrap.scss","../../scss/_custom.scss","../../scss/_root.scss","../../scss/_print.scss","../../scss/_reboot.scss","../../scss/_variables.scss","../../scss/mixins/_hover.scss","../../scss/_type.scss","../../scss/mixins/_lists.scss","../../scss/_images.scss","../../scss/mixins/_image.scss","../../scss/mixins/_border-radius.scss","../../scss/mixins/_transition.scss","../../scss/_code.scss","../../scss/_grid.scss","../../scss/mixins/_gri [...]
\ No newline at end of file
+{"version":3,"sources":["bootstrap.css","../../scss/bootstrap.scss","../../scss/_custom.scss","../../scss/_root.scss","../../scss/_print.scss","../../scss/_reboot.scss","../../scss/_variables.scss","../../scss/mixins/_hover.scss","../../scss/_type.scss","../../scss/mixins/_lists.scss","../../scss/_images.scss","../../scss/mixins/_image.scss","../../scss/mixins/_border-radius.scss","../../scss/mixins/_transition.scss","../../scss/_code.scss","../../scss/_grid.scss","../../scss/mixins/_gri [...]
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/resources/tobago/scarborough/tobago-bootstrap/_version/css/bootstrap.min.css b/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/resources/tobago/scarborough/tobago-bootstrap/_version/css/bootstrap.min.css
index 8ea42d2..8f57230 100644
--- a/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/resources/tobago/scarborough/tobago-bootstrap/_version/css/bootstrap.min.css
+++ b/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/resources/tobago/scarborough/tobago-bootstrap/_version/css/bootstrap.min.css
@@ -3,5 +3,5 @@
* Copyright 2011-2017 The Bootstrap Authors
* Copyright 2011-2017 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- */:root{--blue:#007bff;--indigo:#6610f2;--purple:#6f42c1;--pink:#e83e8c;--red:#dc3545;--orange:#fd7e14;--yellow:#ffc107;--green:#28a745;--teal:#20c997;--cyan:#17a2b8;--white:#fff;--gray:#868e96;--gray-dark:#343a40;--primary:#007bff;--secondary:#868e96;--success:#28a745;--info:#17a2b8;--warning:#ffc107;--danger:#dc3545;--light:#f8f9fa;--dark:#343a40;--breakpoint-xs:0;--breakpoint-sm:576px;--breakpoint-md:768px;--breakpoint-lg:992px;--breakpoint-xl:1200px;--font-family-sans-serif:-apple-s [...]
+ */:root{--blue:#007bff;--indigo:#6610f2;--purple:#6f42c1;--pink:#e83e8c;--red:#dc3545;--orange:#fd7e14;--yellow:#ffc107;--green:#28a745;--teal:#20c997;--cyan:#17a2b8;--white:#fff;--gray:#868e96;--gray-dark:#343a40;--primary:#007bff;--secondary:#868e96;--success:#28a745;--info:#17a2b8;--warning:#ffc107;--danger:#dc3545;--light:#f8f9fa;--dark:#343a40;--breakpoint-xs:0;--breakpoint-sm:576px;--breakpoint-md:768px;--breakpoint-lg:992px;--breakpoint-xl:1200px;--font-family-sans-serif:-apple-s [...]
/*# sourceMappingURL=bootstrap.min.css.map */
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/resources/tobago/scarborough/tobago-bootstrap/_version/css/bootstrap.min.css.map b/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/resources/tobago/scarborough/tobago-bootstrap/_version/css/bootstrap.min.css.map
index 4a21f85..0cd2e48 100644
--- a/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/resources/tobago/scarborough/tobago-bootstrap/_version/css/bootstrap.min.css.map
+++ b/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/resources/tobago/scarborough/tobago-bootstrap/_version/css/bootstrap.min.css.map
@@ -1 +1 @@
-{"version":3,"sources":["../../scss/bootstrap.scss","../../scss/_root.scss","../../scss/_print.scss","dist/css/bootstrap.css","../../scss/_reboot.scss","bootstrap.css","../../scss/mixins/_hover.scss","../../scss/_type.scss","../../scss/mixins/_lists.scss","../../scss/_images.scss","../../scss/mixins/_image.scss","../../scss/mixins/_border-radius.scss","../../scss/mixins/_transition.scss","../../scss/_code.scss","../../scss/_grid.scss","../../scss/mixins/_grid.scss","../../scss/mixins/_br [...]
\ No newline at end of file
+{"version":3,"sources":["../../scss/bootstrap.scss","../../scss/_root.scss","../../scss/_print.scss","dist/css/bootstrap.css","../../scss/_reboot.scss","bootstrap.css","../../scss/mixins/_hover.scss","../../scss/_type.scss","../../scss/mixins/_lists.scss","../../scss/_images.scss","../../scss/mixins/_image.scss","../../scss/mixins/_border-radius.scss","../../scss/mixins/_transition.scss","../../scss/_code.scss","../../scss/_grid.scss","../../scss/mixins/_grid.scss","../../scss/mixins/_br [...]
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-speyside/rebuild-theme.log b/tobago-theme/tobago-theme-speyside/rebuild-theme.log
index a37fa88..c50249d 100644
--- a/tobago-theme/tobago-theme-speyside/rebuild-theme.log
+++ b/tobago-theme/tobago-theme-speyside/rebuild-theme.log
@@ -1,4 +1,4 @@
-Build date: 2017-11-15 14:52:31
+Build date: 2017-11-16 10:45:14
[INFO] Scanning for projects...
[INFO]
[INFO] ------------------------------------------------------------------------
@@ -55,11 +55,11 @@ Build date: 2017-11-15 14:52:31
[INFO] > node install.js
[INFO]
[INFO] PhantomJS not found on PATH
-[INFO] Download already available at /var/folders/w0/pg4pxr7972l6bq85x08s5cl00000gn/T/phantomjs/phantomjs-2.1.1-macosx.zip
+[INFO] Download already available at /var/folders/yp/1vrxjnrs20798ydt_yl8wrpr0000gp/T/phantomjs/phantomjs-2.1.1-macosx.zip
[INFO] Verified checksum of previously downloaded file
[INFO] Extracting zip contents
[INFO] Removing __CURRENT__/tobago-theme-speyside/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom
-[INFO] Copying extracted folder /var/folders/w0/pg4pxr7972l6bq85x08s5cl00000gn/T/phantomjs/phantomjs-2.1.1-macosx.zip-extract-1510753989616/phantomjs-2.1.1-macosx -> __CURRENT__/tobago-theme-speyside/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom
+[INFO] Copying extracted folder /var/folders/yp/1vrxjnrs20798ydt_yl8wrpr0000gp/T/phantomjs/phantomjs-2.1.1-macosx.zip-extract-1510825560779/phantomjs-2.1.1-macosx -> __CURRENT__/tobago-theme-speyside/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom
[INFO] Writing location.js file
[INFO] Done. Phantomjs binary available at __CURRENT__/tobago-theme-speyside/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs
[INFO]
@@ -73,7 +73,7 @@ Build date: 2017-11-15 14:52:31
[INFO] ├─┬ autoprefixer@7.1.6
[INFO] │ ├─┬ browserslist@2.9.0
[INFO] │ │ └── electron-to-chromium@1.3.27
-[INFO] │ ├── caniuse-lite@1.0.30000764
+[INFO] │ ├── caniuse-lite@1.0.30000765
[INFO] │ ├── normalize-range@0.1.2
[INFO] │ ├── num2fraction@1.2.2
[INFO] │ ├─┬ postcss@6.0.14
@@ -143,10 +143,10 @@ Build date: 2017-11-15 14:52:31
[INFO] │ │ │ │ │ │ └── ansi-regex@2.1.1
[INFO] │ │ │ │ │ └── wide-align@1.1.2
[INFO] │ │ │ │ └── set-blocking@2.0.0
-[WARNING] npm WARN bootstrap@4.0.0-beta.2 requires a peer of jquery@1.9.1 - 3 but none was installed.
[INFO] │ │ │ ├─┬ rc@1.2.1
[INFO] │ │ │ │ ├── deep-extend@0.4.2
[INFO] │ │ │ │ ├── ini@1.3.4
+[WARNING] npm WARN bootstrap@4.0.0-beta.2 requires a peer of jquery@1.9.1 - 3 but none was installed.
[INFO] │ │ │ │ ├── minimist@1.2.0
[INFO] │ │ │ │ └── strip-json-comments@2.0.1
[INFO] │ │ │ ├─┬ request@2.81.0
@@ -492,7 +492,7 @@ Build date: 2017-11-15 14:52:31
[INFO] │ └── text-table@0.2.0
[INFO] ├─┬ eslint-plugin-compat@2.1.0
[INFO] │ ├── babel-runtime@6.26.0
-[INFO] │ ├── caniuse-db@1.0.30000764
+[INFO] │ ├── caniuse-db@1.0.30000765
[INFO] │ └── requireindex@1.1.0
[INFO] ├─┬ htmllint-cli@0.0.6
[INFO] │ ├── bluebird@3.5.1
@@ -1020,14 +1020,14 @@ Build date: 2017-11-15 14:52:31
[INFO] > node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap.scss dist/css/bootstrap.css && node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap-grid.scss dist/css/bootstrap-grid.css && node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap-reboot.scss dist/css/bootstrap-reboot.css
[INFO]
[ERROR] Rendering Complete, saving .css file...
-[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-speyside/target/bootstrap/dist/css/bootstrap.css.map
[ERROR] Wrote CSS to __CURRENT__/tobago-theme-speyside/target/bootstrap/dist/css/bootstrap.css
+[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-speyside/target/bootstrap/dist/css/bootstrap.css.map
[ERROR] Rendering Complete, saving .css file...
[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-speyside/target/bootstrap/dist/css/bootstrap-grid.css.map
[ERROR] Wrote CSS to __CURRENT__/tobago-theme-speyside/target/bootstrap/dist/css/bootstrap-grid.css
[ERROR] Rendering Complete, saving .css file...
-[ERROR] Wrote CSS to __CURRENT__/tobago-theme-speyside/target/bootstrap/dist/css/bootstrap-reboot.css
[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-speyside/target/bootstrap/dist/css/bootstrap-reboot.css.map
+[ERROR] Wrote CSS to __CURRENT__/tobago-theme-speyside/target/bootstrap/dist/css/bootstrap-reboot.css
[INFO]
[INFO] --- frontend-maven-plugin:1.4:npm (step #9: npm run css-prefix) @ tobago-theme-speyside ---
[INFO] Running 'npm run css-prefix' in __CURRENT__/tobago-theme-speyside/target/bootstrap
@@ -1035,12 +1035,12 @@ Build date: 2017-11-15 14:52:31
[INFO] > bootstrap@4.0.0-beta.2 css-prefix __CURRENT__/tobago-theme-speyside/target/bootstrap
[INFO] > postcss --config build/postcss.config.js --replace "dist/css/*.css"
[INFO]
-[ERROR] ✔ Finished dist/css/bootstrap-reboot.min.css (1.13 s)
-[ERROR] ✔ Finished dist/css/bootstrap-reboot.css (1.14 s)
-[ERROR] ✔ Finished dist/css/bootstrap-grid.css (1.14 s)
-[ERROR] ✔ Finished dist/css/bootstrap.css (1.14 s)
-[ERROR] ✔ Finished dist/css/bootstrap-grid.min.css (1.14 s)
-[ERROR] ✔ Finished dist/css/bootstrap.min.css (1.14 s)
+[ERROR] ✔ Finished dist/css/bootstrap-grid.css (1.25 s)
+[ERROR] ✔ Finished dist/css/bootstrap-grid.min.css (1.25 s)
+[ERROR] ✔ Finished dist/css/bootstrap-reboot.css (1.25 s)
+[ERROR] ✔ Finished dist/css/bootstrap-reboot.min.css (1.25 s)
+[ERROR] ✔ Finished dist/css/bootstrap.css (1.26 s)
+[ERROR] ✔ Finished dist/css/bootstrap.min.css (1.26 s)
[INFO]
[INFO] --- frontend-maven-plugin:1.4:npm (step #10: npm run css-minify) @ tobago-theme-speyside ---
[INFO] Running 'npm run css-minify' in __CURRENT__/tobago-theme-speyside/target/bootstrap
@@ -1068,16 +1068,16 @@ Build date: 2017-11-15 14:52:31
[INFO] > npm-run-all --parallel js-compile-*
[INFO]
[INFO]
-[INFO] > bootstrap@4.0.0-beta.2 js-compile-standalone __CURRENT__/tobago-theme-speyside/target/bootstrap
-[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:false --config build/rollup.config.js --sourcemap
+[INFO] > bootstrap@4.0.0-beta.2 js-compile-bundle __CURRENT__/tobago-theme-speyside/target/bootstrap
+[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:true --config build/rollup.config.js --sourcemap
[INFO]
[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-compile-plugins __CURRENT__/tobago-theme-speyside/target/bootstrap
[INFO] > cross-env PLUGINS=true babel js/src/ --out-dir js/dist/ --source-maps
[INFO]
[INFO]
-[INFO] > bootstrap@4.0.0-beta.2 js-compile-bundle __CURRENT__/tobago-theme-speyside/target/bootstrap
-[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:true --config build/rollup.config.js --sourcemap
+[INFO] > bootstrap@4.0.0-beta.2 js-compile-standalone __CURRENT__/tobago-theme-speyside/target/bootstrap
+[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:false --config build/rollup.config.js --sourcemap
[INFO]
[ERROR]
[ERROR] __CURRENT__/tobago-theme-speyside/target/bootstrap/js/src/index.js → dist/js/bootstrap.bundle.js...
@@ -1095,22 +1095,22 @@ Build date: 2017-11-15 14:52:31
[INFO] js/src/tab.js -> js/dist/tab.js
[INFO] js/src/tooltip.js -> js/dist/tooltip.js
[INFO] js/src/util.js -> js/dist/util.js
-[ERROR] created dist/js/bootstrap.js in 1.6s
-[ERROR] created dist/js/bootstrap.bundle.js in 1.8s
+[ERROR] created dist/js/bootstrap.js in 2.7s
+[ERROR] created dist/js/bootstrap.bundle.js in 3s
[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-compile-standalone __CURRENT__/tobago-theme-speyside/target/bootstrap
[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:false --config build/rollup.config.js --sourcemap
[INFO]
[ERROR]
[ERROR] __CURRENT__/tobago-theme-speyside/target/bootstrap/js/src/index.js → dist/js/bootstrap.js...
-[ERROR] created dist/js/bootstrap.js in 1.4s
+[ERROR] created dist/js/bootstrap.js in 1.6s
[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-compile-bundle __CURRENT__/tobago-theme-speyside/target/bootstrap
[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:true --config build/rollup.config.js --sourcemap
[INFO]
[ERROR]
[ERROR] __CURRENT__/tobago-theme-speyside/target/bootstrap/js/src/index.js → dist/js/bootstrap.bundle.js...
-[ERROR] created dist/js/bootstrap.bundle.js in 1.7s
+[ERROR] created dist/js/bootstrap.bundle.js in 1.9s
[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-compile-plugins __CURRENT__/tobago-theme-speyside/target/bootstrap
[INFO] > cross-env PLUGINS=true babel js/src/ --out-dir js/dist/ --source-maps
@@ -1132,10 +1132,6 @@ Build date: 2017-11-15 14:52:31
[INFO] > npm-run-all --parallel js-minify-*
[INFO]
[INFO]
-[INFO] > bootstrap@4.0.0-beta.2 js-minify-standalone __CURRENT__/tobago-theme-speyside/target/bootstrap
-[INFO] > uglifyjs --compress typeofs=false --mangle --comments "/^!/" --source-map "content=dist/js/bootstrap.js.map,includeSources,url=bootstrap.min.js.map" --output dist/js/bootstrap.min.js dist/js/bootstrap.js
-[INFO]
-[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-minify-bundle __CURRENT__/tobago-theme-speyside/target/bootstrap
[INFO] > uglifyjs --compress typeofs=false --mangle --comments "/^!/" --source-map "content=dist/js/bootstrap.bundle.js.map,includeSources,url=bootstrap.bundle.min.js.map" --output dist/js/bootstrap.bundle.min.js dist/js/bootstrap.bundle.js
[INFO]
@@ -1143,8 +1139,12 @@ Build date: 2017-11-15 14:52:31
[INFO] > bootstrap@4.0.0-beta.2 js-minify-docs __CURRENT__/tobago-theme-speyside/target/bootstrap
[INFO] > uglifyjs --mangle --comments "/^!/" --output assets/js/docs.min.js assets/js/vendor/anchor.min.js assets/js/vendor/clipboard.min.js assets/js/vendor/holder.min.js assets/js/src/application.js assets/js/src/pwa.js
[INFO]
-[ERROR] INFO: Using input source map: dist/js/bootstrap.js.map
+[INFO]
+[INFO] > bootstrap@4.0.0-beta.2 js-minify-standalone __CURRENT__/tobago-theme-speyside/target/bootstrap
+[INFO] > uglifyjs --compress typeofs=false --mangle --comments "/^!/" --source-map "content=dist/js/bootstrap.js.map,includeSources,url=bootstrap.min.js.map" --output dist/js/bootstrap.min.js dist/js/bootstrap.js
+[INFO]
[ERROR] INFO: Using input source map: dist/js/bootstrap.bundle.js.map
+[ERROR] INFO: Using input source map: dist/js/bootstrap.js.map
[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-minify-standalone __CURRENT__/tobago-theme-speyside/target/bootstrap
[INFO] > uglifyjs --compress typeofs=false --mangle --comments "/^!/" --source-map "content=dist/js/bootstrap.js.map,includeSources,url=bootstrap.min.js.map" --output dist/js/bootstrap.min.js dist/js/bootstrap.js
@@ -1201,7 +1201,7 @@ main:
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
-[INFO] Total time: 01:10 min
-[INFO] Finished at: 2017-11-15T14:53:42+01:00
-[INFO] Final Memory: 28M/382M
+[INFO] Total time: 01:41 min
+[INFO] Finished at: 2017-11-16T10:46:57+01:00
+[INFO] Final Memory: 26M/86M
[INFO] ------------------------------------------------------------------------
diff --git a/tobago-theme/tobago-theme-standard/rebuild-theme.log b/tobago-theme/tobago-theme-standard/rebuild-theme.log
index 0262c32..d169540 100644
--- a/tobago-theme/tobago-theme-standard/rebuild-theme.log
+++ b/tobago-theme/tobago-theme-standard/rebuild-theme.log
@@ -1,11 +1,9 @@
-Build date: 2017-11-15 14:53:42
+Build date: 2017-11-16 10:46:57
[INFO] Scanning for projects...
[INFO]
[INFO] ------------------------------------------------------------------------
[INFO] Building Tobago Theme Standard 4.0.0-SNAPSHOT
[INFO] ------------------------------------------------------------------------
-[INFO] Downloading: http://repository.apache.org/snapshots/org/apache/myfaces/tobago/tobago-core/4.0.0-SNAPSHOT/tobago-core-4.0.0-20171115.100726-116-tests.jar
-[INFO] Downloaded: http://repository.apache.org/snapshots/org/apache/myfaces/tobago/tobago-core/4.0.0-SNAPSHOT/tobago-core-4.0.0-20171115.100726-116-tests.jar (122 kB at 139 kB/s)
[INFO]
[INFO] --- maven-enforcer-plugin:3.0.0-M1:enforce (enforce) @ tobago-theme-standard ---
[INFO]
@@ -57,11 +55,11 @@ Build date: 2017-11-15 14:53:42
[INFO] > node install.js
[INFO]
[INFO] PhantomJS not found on PATH
-[INFO] Download already available at /var/folders/w0/pg4pxr7972l6bq85x08s5cl00000gn/T/phantomjs/phantomjs-2.1.1-macosx.zip
+[INFO] Download already available at /var/folders/yp/1vrxjnrs20798ydt_yl8wrpr0000gp/T/phantomjs/phantomjs-2.1.1-macosx.zip
[INFO] Verified checksum of previously downloaded file
[INFO] Extracting zip contents
[INFO] Removing __CURRENT__/tobago-theme-standard/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom
-[INFO] Copying extracted folder /var/folders/w0/pg4pxr7972l6bq85x08s5cl00000gn/T/phantomjs/phantomjs-2.1.1-macosx.zip-extract-1510754061209/phantomjs-2.1.1-macosx -> __CURRENT__/tobago-theme-standard/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom
+[INFO] Copying extracted folder /var/folders/yp/1vrxjnrs20798ydt_yl8wrpr0000gp/T/phantomjs/phantomjs-2.1.1-macosx.zip-extract-1510825744935/phantomjs-2.1.1-macosx -> __CURRENT__/tobago-theme-standard/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom
[INFO] Writing location.js file
[INFO] Done. Phantomjs binary available at __CURRENT__/tobago-theme-standard/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs
[INFO]
@@ -75,7 +73,7 @@ Build date: 2017-11-15 14:53:42
[INFO] ├─┬ autoprefixer@7.1.6
[INFO] │ ├─┬ browserslist@2.9.0
[INFO] │ │ └── electron-to-chromium@1.3.27
-[INFO] │ ├── caniuse-lite@1.0.30000764
+[INFO] │ ├── caniuse-lite@1.0.30000765
[INFO] │ ├── normalize-range@0.1.2
[INFO] │ ├── num2fraction@1.2.2
[INFO] │ ├─┬ postcss@6.0.14
@@ -136,7 +134,6 @@ Build date: 2017-11-15 14:53:42
[INFO] │ │ │ │ │ ├── aproba@1.1.1
[INFO] │ │ │ │ │ ├── has-unicode@2.0.1
[INFO] │ │ │ │ │ ├── object-assign@4.1.1
-[WARNING] npm WARN bootstrap@4.0.0-beta.2 requires a peer of jquery@1.9.1 - 3 but none was installed.
[INFO] │ │ │ │ │ ├── signal-exit@3.0.2
[INFO] │ │ │ │ │ ├─┬ string-width@1.0.2
[INFO] │ │ │ │ │ │ ├── code-point-at@1.1.0
@@ -494,7 +491,7 @@ Build date: 2017-11-15 14:53:42
[INFO] │ └── text-table@0.2.0
[INFO] ├─┬ eslint-plugin-compat@2.1.0
[INFO] │ ├── babel-runtime@6.26.0
-[INFO] │ ├── caniuse-db@1.0.30000764
+[INFO] │ ├── caniuse-db@1.0.30000765
[INFO] │ └── requireindex@1.1.0
[INFO] ├─┬ htmllint-cli@0.0.6
[INFO] │ ├── bluebird@3.5.1
@@ -1014,6 +1011,7 @@ Build date: 2017-11-15 14:53:42
[INFO] │ └── lodash.templatesettings@4.1.0
[INFO] └── workbox-sw@2.1.1
[INFO]
+[WARNING] npm WARN bootstrap@4.0.0-beta.2 requires a peer of jquery@1.9.1 - 3 but none was installed.
[INFO]
[INFO] --- frontend-maven-plugin:1.4:npm (step #8: npm run css-compile) @ tobago-theme-standard ---
[INFO] Running 'npm run css-compile' in __CURRENT__/tobago-theme-standard/target/bootstrap
@@ -1022,8 +1020,8 @@ Build date: 2017-11-15 14:53:42
[INFO] > node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap.scss dist/css/bootstrap.css && node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap-grid.scss dist/css/bootstrap-grid.css && node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap-reboot.scss dist/css/bootstrap-reboot.css
[INFO]
[ERROR] Rendering Complete, saving .css file...
-[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-standard/target/bootstrap/dist/css/bootstrap.css.map
[ERROR] Wrote CSS to __CURRENT__/tobago-theme-standard/target/bootstrap/dist/css/bootstrap.css
+[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-standard/target/bootstrap/dist/css/bootstrap.css.map
[ERROR] Rendering Complete, saving .css file...
[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-standard/target/bootstrap/dist/css/bootstrap-grid.css.map
[ERROR] Wrote CSS to __CURRENT__/tobago-theme-standard/target/bootstrap/dist/css/bootstrap-grid.css
@@ -1037,12 +1035,12 @@ Build date: 2017-11-15 14:53:42
[INFO] > bootstrap@4.0.0-beta.2 css-prefix __CURRENT__/tobago-theme-standard/target/bootstrap
[INFO] > postcss --config build/postcss.config.js --replace "dist/css/*.css"
[INFO]
-[ERROR] ✔ Finished dist/css/bootstrap-reboot.min.css (1.2 s)
-[ERROR] ✔ Finished dist/css/bootstrap-reboot.css (1.2 s)
-[ERROR] ✔ Finished dist/css/bootstrap-grid.css (1.2 s)
-[ERROR] ✔ Finished dist/css/bootstrap-grid.min.css (1.2 s)
-[ERROR] ✔ Finished dist/css/bootstrap.css (1.2 s)
-[ERROR] ✔ Finished dist/css/bootstrap.min.css (1.2 s)
+[ERROR] ✔ Finished dist/css/bootstrap-grid.min.css (1.26 s)
+[ERROR] ✔ Finished dist/css/bootstrap-grid.css (1.26 s)
+[ERROR] ✔ Finished dist/css/bootstrap-reboot.css (1.26 s)
+[ERROR] ✔ Finished dist/css/bootstrap.css (1.26 s)
+[ERROR] ✔ Finished dist/css/bootstrap.min.css (1.26 s)
+[ERROR] ✔ Finished dist/css/bootstrap-reboot.min.css (1.26 s)
[INFO]
[INFO] --- frontend-maven-plugin:1.4:npm (step #10: npm run css-minify) @ tobago-theme-standard ---
[INFO] Running 'npm run css-minify' in __CURRENT__/tobago-theme-standard/target/bootstrap
@@ -1070,21 +1068,21 @@ Build date: 2017-11-15 14:53:42
[INFO] > npm-run-all --parallel js-compile-*
[INFO]
[INFO]
-[INFO] > bootstrap@4.0.0-beta.2 js-compile-bundle __CURRENT__/tobago-theme-standard/target/bootstrap
-[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:true --config build/rollup.config.js --sourcemap
-[INFO]
-[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-compile-standalone __CURRENT__/tobago-theme-standard/target/bootstrap
[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:false --config build/rollup.config.js --sourcemap
[INFO]
[INFO]
+[INFO] > bootstrap@4.0.0-beta.2 js-compile-bundle __CURRENT__/tobago-theme-standard/target/bootstrap
+[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:true --config build/rollup.config.js --sourcemap
+[INFO]
+[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-compile-plugins __CURRENT__/tobago-theme-standard/target/bootstrap
[INFO] > cross-env PLUGINS=true babel js/src/ --out-dir js/dist/ --source-maps
[INFO]
[ERROR]
-[ERROR] __CURRENT__/tobago-theme-standard/target/bootstrap/js/src/index.js → dist/js/bootstrap.bundle.js...
-[ERROR]
[ERROR] __CURRENT__/tobago-theme-standard/target/bootstrap/js/src/index.js → dist/js/bootstrap.js...
+[ERROR]
+[ERROR] __CURRENT__/tobago-theme-standard/target/bootstrap/js/src/index.js → dist/js/bootstrap.bundle.js...
[INFO] js/src/alert.js -> js/dist/alert.js
[INFO] js/src/button.js -> js/dist/button.js
[INFO] js/src/carousel.js -> js/dist/carousel.js
@@ -1097,22 +1095,22 @@ Build date: 2017-11-15 14:53:42
[INFO] js/src/tab.js -> js/dist/tab.js
[INFO] js/src/tooltip.js -> js/dist/tooltip.js
[INFO] js/src/util.js -> js/dist/util.js
-[ERROR] created dist/js/bootstrap.js in 1.6s
-[ERROR] created dist/js/bootstrap.bundle.js in 1.8s
+[ERROR] created dist/js/bootstrap.js in 2.6s
+[ERROR] created dist/js/bootstrap.bundle.js in 2.8s
[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-compile-standalone __CURRENT__/tobago-theme-standard/target/bootstrap
[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:false --config build/rollup.config.js --sourcemap
[INFO]
[ERROR]
[ERROR] __CURRENT__/tobago-theme-standard/target/bootstrap/js/src/index.js → dist/js/bootstrap.js...
-[ERROR] created dist/js/bootstrap.js in 1.5s
+[ERROR] created dist/js/bootstrap.js in 1.8s
[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-compile-bundle __CURRENT__/tobago-theme-standard/target/bootstrap
[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:true --config build/rollup.config.js --sourcemap
[INFO]
[ERROR]
[ERROR] __CURRENT__/tobago-theme-standard/target/bootstrap/js/src/index.js → dist/js/bootstrap.bundle.js...
-[ERROR] created dist/js/bootstrap.bundle.js in 1.7s
+[ERROR] created dist/js/bootstrap.bundle.js in 2s
[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-compile-plugins __CURRENT__/tobago-theme-standard/target/bootstrap
[INFO] > cross-env PLUGINS=true babel js/src/ --out-dir js/dist/ --source-maps
@@ -1134,6 +1132,10 @@ Build date: 2017-11-15 14:53:42
[INFO] > npm-run-all --parallel js-minify-*
[INFO]
[INFO]
+[INFO] > bootstrap@4.0.0-beta.2 js-minify-docs __CURRENT__/tobago-theme-standard/target/bootstrap
+[INFO] > uglifyjs --mangle --comments "/^!/" --output assets/js/docs.min.js assets/js/vendor/anchor.min.js assets/js/vendor/clipboard.min.js assets/js/vendor/holder.min.js assets/js/src/application.js assets/js/src/pwa.js
+[INFO]
+[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-minify-standalone __CURRENT__/tobago-theme-standard/target/bootstrap
[INFO] > uglifyjs --compress typeofs=false --mangle --comments "/^!/" --source-map "content=dist/js/bootstrap.js.map,includeSources,url=bootstrap.min.js.map" --output dist/js/bootstrap.min.js dist/js/bootstrap.js
[INFO]
@@ -1141,12 +1143,8 @@ Build date: 2017-11-15 14:53:42
[INFO] > bootstrap@4.0.0-beta.2 js-minify-bundle __CURRENT__/tobago-theme-standard/target/bootstrap
[INFO] > uglifyjs --compress typeofs=false --mangle --comments "/^!/" --source-map "content=dist/js/bootstrap.bundle.js.map,includeSources,url=bootstrap.bundle.min.js.map" --output dist/js/bootstrap.bundle.min.js dist/js/bootstrap.bundle.js
[INFO]
-[INFO]
-[INFO] > bootstrap@4.0.0-beta.2 js-minify-docs __CURRENT__/tobago-theme-standard/target/bootstrap
-[INFO] > uglifyjs --mangle --comments "/^!/" --output assets/js/docs.min.js assets/js/vendor/anchor.min.js assets/js/vendor/clipboard.min.js assets/js/vendor/holder.min.js assets/js/src/application.js assets/js/src/pwa.js
-[INFO]
-[ERROR] INFO: Using input source map: dist/js/bootstrap.bundle.js.map
[ERROR] INFO: Using input source map: dist/js/bootstrap.js.map
+[ERROR] INFO: Using input source map: dist/js/bootstrap.bundle.js.map
[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-minify-standalone __CURRENT__/tobago-theme-standard/target/bootstrap
[INFO] > uglifyjs --compress typeofs=false --mangle --comments "/^!/" --source-map "content=dist/js/bootstrap.js.map,includeSources,url=bootstrap.min.js.map" --output dist/js/bootstrap.min.js dist/js/bootstrap.js
@@ -1183,8 +1181,8 @@ Build date: 2017-11-15 14:53:42
[INFO] nothing to do, __CURRENT__/tobago-theme-standard/target/classes/META-INF/resources/tobago/standard/tether/1.1.1/css/tether-theme-basic.min.css is younger than original, use 'force' option or clean your target
[INFO] tether-theme-arrows-dark.min.css (4681b) -> tether-theme-arrows-dark.min.min.css (4681b)[100%]
[INFO] nothing to do, __CURRENT__/tobago-theme-standard/target/classes/META-INF/resources/tobago/standard/tether/1.1.1/css/tether-theme-arrows.min.css is younger than original, use 'force' option or clean your target
-[INFO] bootstrap.min.css (146119b) -> bootstrap.min.min.css (145863b)[99%]
-[INFO] bootstrap.css (190409b) -> bootstrap.min.css (146291b)[76%]
+[INFO] bootstrap.min.css (145551b) -> bootstrap.min.min.css (145295b)[99%]
+[INFO] bootstrap.css (189748b) -> bootstrap.min.css (145721b)[76%]
[INFO] nothing to do, __CURRENT__/tobago-theme-standard/target/classes/META-INF/resources/tobago/standard/font-awesome/4.7.0/css/font-awesome.min.css is younger than original, use 'force' option or clean your target
[INFO] font-awesome.min.css (31000b) -> font-awesome.min.min.css (30990b)[99%]
[INFO] nothing to do, __CURRENT__/tobago-theme-standard/target/classes/META-INF/resources/tobago/standard/bootstrap-datetimepicker/4.17.45/css/bootstrap-datetimepicker.min.css is younger than original, use 'force' option or clean your target
@@ -1197,11 +1195,11 @@ Build date: 2017-11-15 14:53:42
[INFO] nothing to do, __CURRENT__/tobago-theme-standard/target/classes/META-INF/resources/tobago/standard/tether/1.1.1/css/tether-theme-basic.min.css is younger than original, use 'force' option or clean your target
[INFO] nothing to do, __CURRENT__/tobago-theme-standard/target/classes/META-INF/resources/tobago/standard/tether/1.1.1/css/tether-theme-arrows-dark.min.min.css is younger than original, use 'force' option or clean your target
[INFO] nothing to do, __CURRENT__/tobago-theme-standard/target/classes/META-INF/resources/tobago/standard/tether/1.1.1/css/tether-theme-arrows.min.css is younger than original, use 'force' option or clean your target
-[INFO] bootstrap.min.css (146119b) -> bootstrap.min.min.css (145863b)[99%]
+[INFO] bootstrap.min.css (145551b) -> bootstrap.min.min.css (145295b)[99%]
[INFO] nothing to do, __CURRENT__/tobago-theme-standard/target/classes/META-INF/resources/tobago/standard/tobago-bootstrap/_version/css/bootstrap.min.css is younger than original, use 'force' option or clean your target
[INFO] nothing to do, __CURRENT__/tobago-theme-standard/target/classes/META-INF/resources/tobago/standard/font-awesome/4.7.0/css/font-awesome.min.css is younger than original, use 'force' option or clean your target
[INFO] nothing to do, __CURRENT__/tobago-theme-standard/target/classes/META-INF/resources/tobago/standard/font-awesome/4.7.0/css/font-awesome.min.min.css is younger than original, use 'force' option or clean your target
-[INFO] total input (531563b) -> output (486865b)[91%]
+[INFO] total input (529766b) -> output (485159b)[91%]
[INFO] nb warnings: 0, nb errors: 0
[INFO]
[INFO] --- maven-compiler-plugin:3.6.2:compile (default-compile) @ tobago-theme-standard ---
@@ -1228,6 +1226,7 @@ main:
[INFO]
[INFO] --- maven-compiler-plugin:3.6.2:testCompile (default-testCompile) @ tobago-theme-standard ---
[INFO] Compiling 1 source file to __CURRENT__/tobago-theme-standard/target/test-classes
+[WARNING] bootstrap class path not set in conjunction with -source 1.8
[INFO]
[INFO] --- maven-surefire-plugin:2.19.1:test (default-test) @ tobago-theme-standard ---
@@ -1235,11 +1234,11 @@ main:
T E S T S
-------------------------------------------------------
Running org.apache.myfaces.tobago.renderkit.css.BootstrapClassUnitTest
-Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.325 sec - in org.apache.myfaces.tobago.renderkit.css.BootstrapClassUnitTest
+Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.621 sec - in org.apache.myfaces.tobago.renderkit.css.BootstrapClassUnitTest
Results :
-Tests run: 2, Failures: 0, Errors: 0, Skipped: 0
+Tests run: 3, Failures: 0, Errors: 0, Skipped: 0
[INFO]
[INFO] --- maven-jar-plugin:3.0.2:jar (default-jar) @ tobago-theme-standard ---
@@ -1254,7 +1253,7 @@ Tests run: 2, Failures: 0, Errors: 0, Skipped: 0
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
-[INFO] Total time: 01:16 min
-[INFO] Finished at: 2017-11-15T14:55:00+01:00
-[INFO] Final Memory: 39M/465M
+[INFO] Total time: 02:48 min
+[INFO] Finished at: 2017-11-16T10:49:52+01:00
+[INFO] Final Memory: 33M/112M
[INFO] ------------------------------------------------------------------------
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/_version/css/bootstrap.css b/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/_version/css/bootstrap.css
index d2dff8d..6324168 100644
--- a/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/_version/css/bootstrap.css
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/_version/css/bootstrap.css
@@ -8405,35 +8405,6 @@ a.text-dark:focus, a.text-dark:hover {
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-.btn-secondary {
- color: #111;
- background-color: #fff;
- border-color: #ced4da;
-}
-
-.btn-secondary:hover {
- color: #111;
- background-color: #ececec;
- border-color: #b1bbc4;
-}
-
-.btn-secondary:focus, .btn-secondary.focus {
- box-shadow: 0 0 0 0.2rem rgba(206, 212, 218, 0.5);
-}
-
-.btn-secondary.disabled, .btn-secondary:disabled {
- background-color: #fff;
- border-color: #ced4da;
-}
-
-.btn-secondary:not([disabled]):not(.disabled):active, .btn-secondary:not([disabled]):not(.disabled).active,
-.show > .btn-secondary.dropdown-toggle {
- color: #111;
- background-color: #e6e6e6;
- border-color: #aab4bf;
- box-shadow: 0 0 0 0.2rem rgba(206, 212, 218, 0.5);
-}
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/_version/css/bootstrap.css.map b/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/_version/css/bootstrap.css.map
index 677e724..44acd4d 100644
--- a/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/_version/css/bootstrap.css.map
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/_version/css/bootstrap.css.map
@@ -1 +1 @@
-{"version":3,"sources":["bootstrap.css","../../scss/bootstrap.scss","../../scss/_custom.scss","../../scss/_root.scss","../../scss/_print.scss","../../scss/_reboot.scss","../../scss/_variables.scss","../../scss/mixins/_hover.scss","../../scss/_type.scss","../../scss/mixins/_lists.scss","../../scss/_images.scss","../../scss/mixins/_image.scss","../../scss/mixins/_border-radius.scss","../../scss/mixins/_transition.scss","../../scss/_code.scss","../../scss/_grid.scss","../../scss/mixins/_gri [...]
\ No newline at end of file
+{"version":3,"sources":["bootstrap.css","../../scss/bootstrap.scss","../../scss/_custom.scss","../../scss/_root.scss","../../scss/_print.scss","../../scss/_reboot.scss","../../scss/_variables.scss","../../scss/mixins/_hover.scss","../../scss/_type.scss","../../scss/mixins/_lists.scss","../../scss/_images.scss","../../scss/mixins/_image.scss","../../scss/mixins/_border-radius.scss","../../scss/mixins/_transition.scss","../../scss/_code.scss","../../scss/_grid.scss","../../scss/mixins/_gri [...]
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/_version/css/bootstrap.min.css b/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/_version/css/bootstrap.min.css
index 8f57230..8ea42d2 100644
--- a/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/_version/css/bootstrap.min.css
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/_version/css/bootstrap.min.css
@@ -3,5 +3,5 @@
* Copyright 2011-2017 The Bootstrap Authors
* Copyright 2011-2017 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- */:root{--blue:#007bff;--indigo:#6610f2;--purple:#6f42c1;--pink:#e83e8c;--red:#dc3545;--orange:#fd7e14;--yellow:#ffc107;--green:#28a745;--teal:#20c997;--cyan:#17a2b8;--white:#fff;--gray:#868e96;--gray-dark:#343a40;--primary:#007bff;--secondary:#868e96;--success:#28a745;--info:#17a2b8;--warning:#ffc107;--danger:#dc3545;--light:#f8f9fa;--dark:#343a40;--breakpoint-xs:0;--breakpoint-sm:576px;--breakpoint-md:768px;--breakpoint-lg:992px;--breakpoint-xl:1200px;--font-family-sans-serif:-apple-s [...]
+ */:root{--blue:#007bff;--indigo:#6610f2;--purple:#6f42c1;--pink:#e83e8c;--red:#dc3545;--orange:#fd7e14;--yellow:#ffc107;--green:#28a745;--teal:#20c997;--cyan:#17a2b8;--white:#fff;--gray:#868e96;--gray-dark:#343a40;--primary:#007bff;--secondary:#868e96;--success:#28a745;--info:#17a2b8;--warning:#ffc107;--danger:#dc3545;--light:#f8f9fa;--dark:#343a40;--breakpoint-xs:0;--breakpoint-sm:576px;--breakpoint-md:768px;--breakpoint-lg:992px;--breakpoint-xl:1200px;--font-family-sans-serif:-apple-s [...]
/*# sourceMappingURL=bootstrap.min.css.map */
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/_version/css/bootstrap.min.css.map b/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/_version/css/bootstrap.min.css.map
index 0cd2e48..4a21f85 100644
--- a/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/_version/css/bootstrap.min.css.map
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/_version/css/bootstrap.min.css.map
@@ -1 +1 @@
-{"version":3,"sources":["../../scss/bootstrap.scss","../../scss/_root.scss","../../scss/_print.scss","dist/css/bootstrap.css","../../scss/_reboot.scss","bootstrap.css","../../scss/mixins/_hover.scss","../../scss/_type.scss","../../scss/mixins/_lists.scss","../../scss/_images.scss","../../scss/mixins/_image.scss","../../scss/mixins/_border-radius.scss","../../scss/mixins/_transition.scss","../../scss/_code.scss","../../scss/_grid.scss","../../scss/mixins/_grid.scss","../../scss/mixins/_br [...]
\ No newline at end of file
+{"version":3,"sources":["../../scss/bootstrap.scss","../../scss/_root.scss","../../scss/_print.scss","dist/css/bootstrap.css","../../scss/_reboot.scss","bootstrap.css","../../scss/mixins/_hover.scss","../../scss/_type.scss","../../scss/mixins/_lists.scss","../../scss/_images.scss","../../scss/mixins/_image.scss","../../scss/mixins/_border-radius.scss","../../scss/mixins/_transition.scss","../../scss/_code.scss","../../scss/_grid.scss","../../scss/mixins/_grid.scss","../../scss/mixins/_br [...]
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.
[myfaces-tobago] 01/02: TOBAGO-1825 Plain bootstrap for 'Standard'
theme,
'Scarborough' is the new default. * scarborough as default theme * create
plain bootstrap standard theme
Posted by hn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 1f38c9283d8f4666161d4360787e9285d0fd98e0
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Thu Nov 16 11:00:59 2017 +0100
TOBAGO-1825 Plain bootstrap for 'Standard' theme, 'Scarborough' is the new default.
* scarborough as default theme
* create plain bootstrap standard theme
---
tobago-example/pom.xml | 2 --
.../tobago-example-demo/src/main/webapp/WEB-INF/tobago-config.xml | 4 ++--
tobago-theme/pom.xml | 1 +
.../tobago-theme-scarborough/src/main/scss/_tobago-theme.scss | 7 +++++++
.../tobago-theme-standard/src/main/scss/_tobago-theme.scss | 7 -------
5 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/tobago-example/pom.xml b/tobago-example/pom.xml
index 7933a31..ec6f8ee 100644
--- a/tobago-example/pom.xml
+++ b/tobago-example/pom.xml
@@ -136,13 +136,11 @@
<artifactId>tobago-theme-roxborough</artifactId>
<version>${project.version}</version>
</dependency>
-<!--
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-theme-scarborough</artifactId>
<version>${project.version}</version>
</dependency>
--->
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-theme-speyside</artifactId>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tobago-config.xml b/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tobago-config.xml
index 06f2075..2639de5 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tobago-config.xml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tobago-config.xml
@@ -33,10 +33,10 @@
<!-- using all available themes, if this is not set -->
<theme-config>
- <default-theme>standard</default-theme>
+ <default-theme>scarborough</default-theme>
+ <supported-theme>standard</supported-theme>
<supported-theme>speyside</supported-theme>
<!-- TODO: Can be removed after closing TOBAGO-1664 -->
- <!--<supported-theme>scarborough</supported-theme>-->
<supported-theme>roxborough</supported-theme>
<!--<supported-theme>charlotteville</supported-theme>-->
</theme-config>
diff --git a/tobago-theme/pom.xml b/tobago-theme/pom.xml
index 51bdf86..ad6e4f9 100644
--- a/tobago-theme/pom.xml
+++ b/tobago-theme/pom.xml
@@ -68,6 +68,7 @@
<modules>
<module>tobago-theme-standard</module>
+ <module>tobago-theme-scarborough</module>
<module>tobago-theme-speyside</module>
<module>tobago-theme-roxborough</module>
</modules>
diff --git a/tobago-theme/tobago-theme-scarborough/src/main/scss/_tobago-theme.scss b/tobago-theme/tobago-theme-scarborough/src/main/scss/_tobago-theme.scss
index 270a84b..882905e 100644
--- a/tobago-theme/tobago-theme-scarborough/src/main/scss/_tobago-theme.scss
+++ b/tobago-theme/tobago-theme-scarborough/src/main/scss/_tobago-theme.scss
@@ -18,5 +18,12 @@
// add here code to include after bootstrap
// usually the _tobago.scss file
+$white: #fff !default;
+$gray-400: #ced4da !default;
+
+.btn-secondary {
+ @include button-variant($white, $gray-400);
+}
+
@import "tobago";
diff --git a/tobago-theme/tobago-theme-standard/src/main/scss/_tobago-theme.scss b/tobago-theme/tobago-theme-standard/src/main/scss/_tobago-theme.scss
index 882905e..270a84b 100644
--- a/tobago-theme/tobago-theme-standard/src/main/scss/_tobago-theme.scss
+++ b/tobago-theme/tobago-theme-standard/src/main/scss/_tobago-theme.scss
@@ -18,12 +18,5 @@
// add here code to include after bootstrap
// usually the _tobago.scss file
-$white: #fff !default;
-$gray-400: #ced4da !default;
-
-.btn-secondary {
- @include button-variant($white, $gray-400);
-}
-
@import "tobago";
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.