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 2018/02/20 09:36:34 UTC
[myfaces-tobago] branch master updated (fa43575 -> 513ffc7)
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 fa43575 cleanup pom: mojarra
new 37baa8e TOBAGO-1645 It is not possible to display an image (png, jpg, ...) with the image-attribute of <tc:section>
new 513ffc7 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:
.../renderkit/renderer/CommandRendererBase.java | 14 +---
.../renderkit/renderer/SectionRenderer.java | 9 +--
.../tobago/internal/util/HtmlRendererUtils.java | 15 ++++
tobago-core/src/main/resources/scss/_tobago.scss | 2 +-
.../050-container/40-section/section.xhtml | 17 ++---
.../tobago-theme-charlotteville/rebuild-theme.txt | 46 ++++++------
.../tobago-theme-roxborough/rebuild-theme.txt | 72 +++++++++----------
.../tobago-bootstrap/_version/css/bootstrap.css | 2 +-
.../_version/css/bootstrap.css.map | 2 +-
.../_version/css/bootstrap.min.css | 2 +-
.../_version/css/bootstrap.min.css.map | 2 +-
.../tobago-theme-scarborough/rebuild-theme.txt | 72 +++++++++----------
.../tobago-bootstrap/_version/css/bootstrap.css | 2 +-
.../_version/css/bootstrap.css.map | 2 +-
.../_version/css/bootstrap.min.css | 2 +-
.../_version/css/bootstrap.min.css.map | 2 +-
.../tobago-theme-speyside/rebuild-theme.txt | 72 +++++++++----------
.../tobago-bootstrap/_version/css/bootstrap.css | 2 +-
.../_version/css/bootstrap.css.map | 2 +-
.../_version/css/bootstrap.min.css | 2 +-
.../_version/css/bootstrap.min.css.map | 2 +-
.../tobago-theme-standard/rebuild-theme.txt | 82 +++++++++++-----------
.../tobago-bootstrap/_version/css/bootstrap.css | 2 +-
.../_version/css/bootstrap.css.map | 2 +-
.../_version/css/bootstrap.min.css | 2 +-
.../_version/css/bootstrap.min.css.map | 2 +-
26 files changed, 214 insertions(+), 219 deletions(-)
--
To stop receiving notification emails like this one, please contact
hnoeth@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 513ffc7b3bd13503b10d9fc496f54471d7de4899
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Tue Feb 20 10:33:31 2018 +0100
rebuild themes after update
---
.../tobago-theme-charlotteville/rebuild-theme.txt | 46 ++++++------
.../tobago-theme-roxborough/rebuild-theme.txt | 72 +++++++++----------
.../tobago-bootstrap/_version/css/bootstrap.css | 2 +-
.../_version/css/bootstrap.css.map | 2 +-
.../_version/css/bootstrap.min.css | 2 +-
.../_version/css/bootstrap.min.css.map | 2 +-
.../tobago-theme-scarborough/rebuild-theme.txt | 72 +++++++++----------
.../tobago-bootstrap/_version/css/bootstrap.css | 2 +-
.../_version/css/bootstrap.css.map | 2 +-
.../_version/css/bootstrap.min.css | 2 +-
.../_version/css/bootstrap.min.css.map | 2 +-
.../tobago-theme-speyside/rebuild-theme.txt | 72 +++++++++----------
.../tobago-bootstrap/_version/css/bootstrap.css | 2 +-
.../_version/css/bootstrap.css.map | 2 +-
.../_version/css/bootstrap.min.css | 2 +-
.../_version/css/bootstrap.min.css.map | 2 +-
.../tobago-theme-standard/rebuild-theme.txt | 82 +++++++++++-----------
.../tobago-bootstrap/_version/css/bootstrap.css | 2 +-
.../_version/css/bootstrap.css.map | 2 +-
.../_version/css/bootstrap.min.css | 2 +-
.../_version/css/bootstrap.min.css.map | 2 +-
21 files changed, 185 insertions(+), 191 deletions(-)
diff --git a/tobago-theme/tobago-theme-charlotteville/rebuild-theme.txt b/tobago-theme/tobago-theme-charlotteville/rebuild-theme.txt
index 33d91a8..32ea7d3 100644
--- a/tobago-theme/tobago-theme-charlotteville/rebuild-theme.txt
+++ b/tobago-theme/tobago-theme-charlotteville/rebuild-theme.txt
@@ -1,9 +1,11 @@
-Build date: 2018-01-29 14:56:26
+Build date: 2018-02-20 09:51:07
[INFO] Scanning for projects...
[INFO]
[INFO] ------------------------------------------------------------------------
[INFO] Building Tobago Theme Charlotteville 4.1.0-SNAPSHOT
[INFO] ------------------------------------------------------------------------
+[INFO] Downloading from apache.snapshots: https://repository.apache.org/snapshots/org/apache/myfaces/tobago/tobago-theme-standard/4.1.0-SNAPSHOT/maven-metadata.xml
+[INFO] Downloading from apache.snapshots: https://repository.apache.org/snapshots/org/apache/myfaces/tobago/tobago-core/4.1.0-SNAPSHOT/maven-metadata.xml
[INFO]
[INFO] --- maven-enforcer-plugin:3.0.0-M1:enforce (enforce) @ tobago-theme-charlotteville ---
[INFO]
@@ -71,7 +73,7 @@ Build date: 2018-01-29 14:56:26
[INFO]
[WARNING] npm WARN bootstrap@4.0.0 requires a peer of jquery@1.9.1 - 3 but none is installed. You must install peer dependencies yourself.
[ERROR]
-[INFO] added 1405 packages in 26.302s
+[INFO] added 1405 packages in 15.945s
[INFO]
[INFO] --- frontend-maven-plugin:1.4:npm (step #8: npm run css-compile) @ tobago-theme-charlotteville ---
[INFO] Running 'npm run css-compile' in __CURRENT__/tobago-theme-charlotteville/target/bootstrap
@@ -80,14 +82,14 @@ Build date: 2018-01-29 14:56:26
[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-charlotteville/target/bootstrap/dist/css/bootstrap.css.map
[ERROR] Wrote CSS to __CURRENT__/tobago-theme-charlotteville/target/bootstrap/dist/css/bootstrap.css
+[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-charlotteville/target/bootstrap/dist/css/bootstrap.css.map
[ERROR] Rendering Complete, saving .css file...
-[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-charlotteville/target/bootstrap/dist/css/bootstrap-grid.css.map
[ERROR] Wrote CSS to __CURRENT__/tobago-theme-charlotteville/target/bootstrap/dist/css/bootstrap-grid.css
+[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-charlotteville/target/bootstrap/dist/css/bootstrap-grid.css.map
[ERROR] Rendering Complete, saving .css file...
-[ERROR] Wrote CSS to __CURRENT__/tobago-theme-charlotteville/target/bootstrap/dist/css/bootstrap-reboot.css
[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-charlotteville/target/bootstrap/dist/css/bootstrap-reboot.css.map
+[ERROR] Wrote CSS to __CURRENT__/tobago-theme-charlotteville/target/bootstrap/dist/css/bootstrap-reboot.css
[INFO]
[INFO] --- frontend-maven-plugin:1.4:npm (step #9: npm run css-prefix) @ tobago-theme-charlotteville ---
[INFO] Running 'npm run css-prefix' in __CURRENT__/tobago-theme-charlotteville/target/bootstrap
@@ -95,9 +97,9 @@ Build date: 2018-01-29 14:56:26
[INFO] > bootstrap@4.0.0 css-prefix __CURRENT__/tobago-theme-charlotteville/target/bootstrap
[INFO] > postcss --config build/postcss.config.js --replace "dist/css/*.css" "!dist/css/*.min.css"
[INFO]
-[ERROR] ✔ Finished dist/css/bootstrap-grid.css (967 ms)
-[ERROR] ✔ Finished dist/css/bootstrap.css (967 ms)
-[ERROR] ✔ Finished dist/css/bootstrap-reboot.css (967 ms)
+[ERROR] ✔ Finished dist/css/bootstrap-grid.css (1.15 s)
+[ERROR] ✔ Finished dist/css/bootstrap-reboot.css (1.15 s)
+[ERROR] ✔ Finished dist/css/bootstrap.css (1.15 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
@@ -125,6 +127,10 @@ Build date: 2018-01-29 14:56:26
[INFO] > npm-run-all --parallel js-compile-*
[INFO]
[INFO]
+[INFO] > bootstrap@4.0.0 js-compile-standalone __CURRENT__/tobago-theme-charlotteville/target/bootstrap
+[INFO] > rollup --environment BUNDLE:false --config build/rollup.config.js --sourcemap
+[INFO]
+[INFO]
[INFO] > bootstrap@4.0.0 js-compile-plugins __CURRENT__/tobago-theme-charlotteville/target/bootstrap
[INFO] > cross-env PLUGINS=true babel js/src/ --out-dir js/dist/ --source-maps
[INFO]
@@ -132,10 +138,6 @@ Build date: 2018-01-29 14:56:26
[INFO] > bootstrap@4.0.0 js-compile-bundle __CURRENT__/tobago-theme-charlotteville/target/bootstrap
[INFO] > rollup --environment BUNDLE:true --config build/rollup.config.js --sourcemap
[INFO]
-[INFO]
-[INFO] > bootstrap@4.0.0 js-compile-standalone __CURRENT__/tobago-theme-charlotteville/target/bootstrap
-[INFO] > 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]
@@ -152,26 +154,26 @@ Build date: 2018-01-29 14:56:26
[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 2.5s
-[ERROR] created dist/js/bootstrap.bundle.js in 2.7s
+[ERROR] created dist/js/bootstrap.js in 2.2s
+[ERROR] created dist/js/bootstrap.bundle.js in 2.4s
[INFO]
[INFO] > bootstrap@4.0.0 js-minify __CURRENT__/tobago-theme-charlotteville/target/bootstrap
[INFO] > npm-run-all --parallel js-minify-*
[INFO]
[INFO]
-[INFO] > bootstrap@4.0.0 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] > bootstrap@4.0.0 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
[INFO]
[INFO]
[INFO] > bootstrap@4.0.0 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/*.js"
[INFO]
[INFO]
-[INFO] > bootstrap@4.0.0 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
+[INFO] > bootstrap@4.0.0 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
+[ERROR] INFO: Using input source map: dist/js/bootstrap.bundle.js.map
[INFO]
[INFO] --- maven-resources-plugin:2.7:resources (default-resources) @ tobago-theme-charlotteville ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
@@ -216,7 +218,7 @@ main:
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
-[INFO] Total time: 54.163 s
-[INFO] Finished at: 2018-01-29T14:57:21+01:00
-[INFO] Final Memory: 36M/505M
+[INFO] Total time: 46.544 s
+[INFO] Finished at: 2018-02-20T09:51:54+01:00
+[INFO] Final Memory: 31M/538M
[INFO] ------------------------------------------------------------------------
diff --git a/tobago-theme/tobago-theme-roxborough/rebuild-theme.txt b/tobago-theme/tobago-theme-roxborough/rebuild-theme.txt
index a49f9c5..2f8c9b1 100644
--- a/tobago-theme/tobago-theme-roxborough/rebuild-theme.txt
+++ b/tobago-theme/tobago-theme-roxborough/rebuild-theme.txt
@@ -1,8 +1,8 @@
-Build date: 2018-01-29 14:57:22
+Build date: 2018-02-20 09:51:55
[INFO] Scanning for projects...
[INFO]
[INFO] ------------------------------------------------------------------------
-[INFO] Building Tobago Theme Roxborough 4.1.0-SNAPSHOT
+[INFO] Building Tobago Theme Roxborough 4.1.1-SNAPSHOT
[INFO] ------------------------------------------------------------------------
[INFO]
[INFO] --- maven-enforcer-plugin:3.0.0-M1:enforce (enforce) @ tobago-theme-roxborough ---
@@ -26,19 +26,17 @@ Build date: 2018-01-29 14:57:22
[INFO] Applying patch: append-tobago-theme-to-bootstrap.patch
[INFO]
[INFO] --- maven-dependency-plugin:3.0.2:unpack (step #5: unpack-custom) @ tobago-theme-roxborough ---
-[INFO] Configured Artifact: org.apache.myfaces.tobago:tobago-core:4.1.0-SNAPSHOT:jar
-[INFO] Unpacking __REPO__/org/apache/myfaces/tobago/tobago-core/4.1.0-SNAPSHOT/tobago-core-4.1.0-SNAPSHOT.jar to __CURRENT__/tobago-theme-roxborough/target/bootstrap with includes "**/*.scss" and excludes ""
+[INFO] Configured Artifact: org.apache.myfaces.tobago:tobago-core:4.1.1-SNAPSHOT:jar
+[INFO] Unpacking __REPO__/org/apache/myfaces/tobago/tobago-core/4.1.1-SNAPSHOT/tobago-core-4.1.1-SNAPSHOT.jar to __CURRENT__/tobago-theme-roxborough/target/bootstrap with includes "**/*.scss" and excludes ""
[INFO]
-[INFO] --- frontend-maven-plugin:1.4:install-node-and-npm (step #6: install node and npm) @ tobago-theme-roxborough ---
+[INFO] --- frontend-maven-plugin:1.6:install-node-and-npm (step #6: install node and npm) @ tobago-theme-roxborough ---
[INFO] Installing node version v8.9.3
[INFO] Unpacking __REPO__/com/github/eirslett/node/8.9.3/node-8.9.3-darwin-x64.tar.gz into __CURRENT__/tobago-theme-roxborough/target/frontend/node/tmp
[INFO] Copying node binary from __CURRENT__/tobago-theme-roxborough/target/frontend/node/tmp/node-v8.9.3-darwin-x64/bin/node to __CURRENT__/tobago-theme-roxborough/target/frontend/node/node
+[INFO] Extracting NPM
[INFO] Installed node locally.
-[INFO] Installing npm version 5.5.1
-[INFO] Unpacking __REPO__/com/github/eirslett/npm/5.5.1/npm-5.5.1.tar.gz into __CURRENT__/tobago-theme-roxborough/target/frontend/node/node_modules
-[INFO] Installed npm locally.
[INFO]
-[INFO] --- frontend-maven-plugin:1.4:npm (step #7: npm install) @ tobago-theme-roxborough ---
+[INFO] --- frontend-maven-plugin:1.6:npm (step #7: npm install) @ tobago-theme-roxborough ---
[INFO] Running 'npm install' in __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO]
[INFO] > fsevents@1.1.3 install __CURRENT__/tobago-theme-roxborough/target/bootstrap/node_modules/fsevents
@@ -71,42 +69,42 @@ Build date: 2018-01-29 14:57:22
[INFO]
[WARNING] npm WARN bootstrap@4.0.0 requires a peer of jquery@1.9.1 - 3 but none is installed. You must install peer dependencies yourself.
[ERROR]
-[INFO] added 1405 packages in 28.336s
+[INFO] added 1405 packages in 13.811s
[INFO]
-[INFO] --- frontend-maven-plugin:1.4:npm (step #8: npm run css-compile) @ tobago-theme-roxborough ---
+[INFO] --- frontend-maven-plugin:1.6:npm (step #8: npm run css-compile) @ tobago-theme-roxborough ---
[INFO] Running 'npm run css-compile' in __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO]
[INFO] > bootstrap@4.0.0 css-compile __CURRENT__/tobago-theme-roxborough/target/bootstrap
[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 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] Wrote CSS to __CURRENT__/tobago-theme-roxborough/target/bootstrap/dist/css/bootstrap.css
[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
[ERROR] Rendering Complete, saving .css file...
-[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-roxborough/target/bootstrap/dist/css/bootstrap-reboot.css.map
[ERROR] Wrote CSS to __CURRENT__/tobago-theme-roxborough/target/bootstrap/dist/css/bootstrap-reboot.css
+[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-roxborough/target/bootstrap/dist/css/bootstrap-reboot.css.map
[INFO]
-[INFO] --- frontend-maven-plugin:1.4:npm (step #9: npm run css-prefix) @ tobago-theme-roxborough ---
+[INFO] --- frontend-maven-plugin:1.6:npm (step #9: npm run css-prefix) @ tobago-theme-roxborough ---
[INFO] Running 'npm run css-prefix' in __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO]
[INFO] > bootstrap@4.0.0 css-prefix __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO] > postcss --config build/postcss.config.js --replace "dist/css/*.css" "!dist/css/*.min.css"
[INFO]
-[ERROR] ✔ Finished dist/css/bootstrap-reboot.css (916 ms)
-[ERROR] ✔ Finished dist/css/bootstrap.css (919 ms)
-[ERROR] ✔ Finished dist/css/bootstrap-grid.css (919 ms)
+[ERROR] ✔ Finished dist/css/bootstrap-grid.css (1.16 s)
+[ERROR] ✔ Finished dist/css/bootstrap.css (1.16 s)
+[ERROR] ✔ Finished dist/css/bootstrap-reboot.css (1.16 s)
[INFO]
-[INFO] --- frontend-maven-plugin:1.4:npm (step #10: npm run css-minify) @ tobago-theme-roxborough ---
+[INFO] --- frontend-maven-plugin:1.6:npm (step #10: npm run css-minify) @ tobago-theme-roxborough ---
[INFO] Running 'npm run css-minify' in __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO]
[INFO] > bootstrap@4.0.0 css-minify __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO] > cleancss --level 1 --source-map --source-map-inline-sources --output dist/css/bootstrap.min.css dist/css/bootstrap.css && cleancss --level 1 --source-map --source-map-inline-sources --output dist/css/bootstrap-grid.min.css dist/css/bootstrap-grid.css && cleancss --level 1 --source-map --source-map-inline-sources --output dist/css/bootstrap-reboot.min.css dist/css/bootstrap-reboot.css
[INFO]
[INFO]
-[INFO] --- frontend-maven-plugin:1.4:npm (step #11: npm run js) @ tobago-theme-roxborough ---
+[INFO] --- frontend-maven-plugin:1.6:npm (step #11: npm run js) @ tobago-theme-roxborough ---
[INFO] Running 'npm run js' in __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO]
[INFO] > bootstrap@4.0.0 js __CURRENT__/tobago-theme-roxborough/target/bootstrap
@@ -125,21 +123,21 @@ Build date: 2018-01-29 14:57:22
[INFO] > npm-run-all --parallel js-compile-*
[INFO]
[INFO]
-[INFO] > bootstrap@4.0.0 js-compile-bundle __CURRENT__/tobago-theme-roxborough/target/bootstrap
-[INFO] > rollup --environment BUNDLE:true --config build/rollup.config.js --sourcemap
-[INFO]
-[INFO]
[INFO] > bootstrap@4.0.0 js-compile-standalone __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO] > rollup --environment BUNDLE:false --config build/rollup.config.js --sourcemap
[INFO]
[INFO]
+[INFO] > bootstrap@4.0.0 js-compile-bundle __CURRENT__/tobago-theme-roxborough/target/bootstrap
+[INFO] > rollup --environment BUNDLE:true --config build/rollup.config.js --sourcemap
+[INFO]
+[INFO]
[INFO] > bootstrap@4.0.0 js-compile-plugins __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO] > cross-env PLUGINS=true babel js/src/ --out-dir js/dist/ --source-maps
[INFO]
[ERROR]
-[ERROR] __CURRENT__/tobago-theme-roxborough/target/bootstrap/js/src/index.js → dist/js/bootstrap.bundle.js...
-[ERROR]
[ERROR] __CURRENT__/tobago-theme-roxborough/target/bootstrap/js/src/index.js → dist/js/bootstrap.js...
+[ERROR]
+[ERROR] __CURRENT__/tobago-theme-roxborough/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
@@ -152,21 +150,21 @@ Build date: 2018-01-29 14:57:22
[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 2.2s
-[ERROR] created dist/js/bootstrap.bundle.js in 2.4s
+[ERROR] created dist/js/bootstrap.js in 1.6s
+[ERROR] created dist/js/bootstrap.bundle.js in 1.8s
[INFO]
[INFO] > bootstrap@4.0.0 js-minify __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO] > npm-run-all --parallel js-minify-*
[INFO]
[INFO]
-[INFO] > bootstrap@4.0.0 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]
-[INFO]
[INFO] > bootstrap@4.0.0 js-minify-bundle __CURRENT__/tobago-theme-roxborough/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 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]
+[INFO]
[INFO] > bootstrap@4.0.0 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/*.js"
[INFO]
@@ -205,18 +203,18 @@ main:
[INFO] --- maven-surefire-plugin:2.19.1:test (default-test) @ tobago-theme-roxborough ---
[INFO]
[INFO] --- maven-jar-plugin:3.0.2:jar (default-jar) @ tobago-theme-roxborough ---
-[INFO] Building jar: __CURRENT__/tobago-theme-roxborough/target/tobago-theme-roxborough-4.1.0-SNAPSHOT.jar
+[INFO] Building jar: __CURRENT__/tobago-theme-roxborough/target/tobago-theme-roxborough-4.1.1-SNAPSHOT.jar
[INFO]
[INFO] --- maven-site-plugin:3.6:attach-descriptor (attach-descriptor) @ tobago-theme-roxborough ---
[INFO] Skipping because packaging 'jar' is not pom.
[INFO]
[INFO] --- maven-install-plugin:2.5.2:install (default-install) @ tobago-theme-roxborough ---
-[INFO] Installing __CURRENT__/tobago-theme-roxborough/target/tobago-theme-roxborough-4.1.0-SNAPSHOT.jar to __REPO__/org/apache/myfaces/tobago/tobago-theme-roxborough/4.1.0-SNAPSHOT/tobago-theme-roxborough-4.1.0-SNAPSHOT.jar
-[INFO] Installing __CURRENT__/tobago-theme-roxborough/pom.xml to __REPO__/org/apache/myfaces/tobago/tobago-theme-roxborough/4.1.0-SNAPSHOT/tobago-theme-roxborough-4.1.0-SNAPSHOT.pom
+[INFO] Installing __CURRENT__/tobago-theme-roxborough/target/tobago-theme-roxborough-4.1.1-SNAPSHOT.jar to __REPO__/org/apache/myfaces/tobago/tobago-theme-roxborough/4.1.1-SNAPSHOT/tobago-theme-roxborough-4.1.1-SNAPSHOT.jar
+[INFO] Installing __CURRENT__/tobago-theme-roxborough/pom.xml to __REPO__/org/apache/myfaces/tobago/tobago-theme-roxborough/4.1.1-SNAPSHOT/tobago-theme-roxborough-4.1.1-SNAPSHOT.pom
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
-[INFO] Total time: 55.113 s
-[INFO] Finished at: 2018-01-29T14:58:18+01:00
-[INFO] Final Memory: 36M/507M
+[INFO] Total time: 41.120 s
+[INFO] Finished at: 2018-02-20T09:52:37+01:00
+[INFO] Final Memory: 31M/410M
[INFO] ------------------------------------------------------------------------
diff --git a/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/css/bootstrap.css b/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/css/bootstrap.css
index 71893a6..378789e 100644
--- a/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/css/bootstrap.css
+++ b/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/css/bootstrap.css
@@ -9716,7 +9716,7 @@ span.tobago-out:empty:before {
/* section ----------------------------------------------------------- */
/* to separate the icon from the rest of the title */
-h1 > .fa:first-child, h2 > .fa:first-child, h3 > .fa:first-child, h4 > .fa:first-child, h5 > .fa:first-child, h6 > .fa:first-child {
+h1 > .fa:first-child, h1 > img, h2 > .fa:first-child, h2 > img, h3 > .fa:first-child, h3 > img, h4 > .fa:first-child, h4 > img, h5 > .fa:first-child, h5 > img, h6 > .fa:first-child, h6 > img {
margin-right: 0.7em;
}
diff --git a/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/css/bootstrap.css.map b/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/css/bootstrap.css.map
index 27053ae..0da5095 100644
--- a/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/css/bootstrap.css.map
+++ b/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/css/bootstrap.css.map
@@ -1 +1 @@
-{"version":3,"sources":["bootstrap.css","../../scss/bootstrap.scss","../../scss/_custom.scss","../../scss/_root.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/_code.scss","../../scss/_grid.scss","../../scss/mixins/_grid.scss","../../scss/mixins/_breakpoints.scss","../../scss/mixi [...]
\ No newline at end of file
+{"version":3,"sources":["bootstrap.css","../../scss/bootstrap.scss","../../scss/_custom.scss","../../scss/_root.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/_code.scss","../../scss/_grid.scss","../../scss/mixins/_grid.scss","../../scss/mixins/_breakpoints.scss","../../scss/mixi [...]
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/css/bootstrap.min.css b/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/css/bootstrap.min.css
index a4bd660..a11c2c0 100644
--- a/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/css/bootstrap.min.css
+++ b/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/css/bootstrap.min.css
@@ -3,5 +3,5 @@
* Copyright 2011-2018 The Bootstrap Authors
* Copyright 2011-2018 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- */@font-face{font-family:Amaranth;font-style:normal;font-weight:400;src:url(../fonts/Amaranth-Regular.otf) format("opentype")}@font-face{font-family:Amaranth;font-style:normal;font-weight:700;src:url(../fonts/Amaranth-Bold.otf) format("opentype")}@font-face{font-family:Amaranth;font-style:italic;src:url(../fonts/Amaranth-Italic.otf) format("opentype")}@font-face{font-family:Amaranth;font-style:italic;font-weight:700;src:url(../fonts/Amaranth-BoldItalic.otf) format("opentype")}.tobago-bo [...]
+ */@font-face{font-family:Amaranth;font-style:normal;font-weight:400;src:url(../fonts/Amaranth-Regular.otf) format("opentype")}@font-face{font-family:Amaranth;font-style:normal;font-weight:700;src:url(../fonts/Amaranth-Bold.otf) format("opentype")}@font-face{font-family:Amaranth;font-style:italic;src:url(../fonts/Amaranth-Italic.otf) format("opentype")}@font-face{font-family:Amaranth;font-style:italic;font-weight:700;src:url(../fonts/Amaranth-BoldItalic.otf) format("opentype")}.tobago-bo [...]
/*# sourceMappingURL=bootstrap.min.css.map */
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/css/bootstrap.min.css.map b/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/css/bootstrap.min.css.map
index a4e25b9..c540ede 100644
--- a/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/css/bootstrap.min.css.map
+++ b/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/css/bootstrap.min.css.map
@@ -1 +1 @@
-{"version":3,"sources":["../../scss/bootstrap.scss","../../scss/_custom.scss","../../scss/_root.scss","../../scss/_reboot.scss","dist/css/bootstrap.css","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/_code.scss","../../scss/_grid.scss","../../scss/mixins/_grid.scss","../../scss/mixins/_breakpoints.scss","../../scss/mixins/_ [...]
\ No newline at end of file
+{"version":3,"sources":["../../scss/bootstrap.scss","../../scss/_custom.scss","../../scss/_root.scss","../../scss/_reboot.scss","dist/css/bootstrap.css","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/_code.scss","../../scss/_grid.scss","../../scss/mixins/_grid.scss","../../scss/mixins/_breakpoints.scss","../../scss/mixins/_ [...]
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-scarborough/rebuild-theme.txt b/tobago-theme/tobago-theme-scarborough/rebuild-theme.txt
index 473de3f..8885871 100644
--- a/tobago-theme/tobago-theme-scarborough/rebuild-theme.txt
+++ b/tobago-theme/tobago-theme-scarborough/rebuild-theme.txt
@@ -1,8 +1,8 @@
-Build date: 2018-01-29 14:58:18
+Build date: 2018-02-20 09:52:37
[INFO] Scanning for projects...
[INFO]
[INFO] ------------------------------------------------------------------------
-[INFO] Building Tobago Theme Scarborough 4.1.0-SNAPSHOT
+[INFO] Building Tobago Theme Scarborough 4.1.1-SNAPSHOT
[INFO] ------------------------------------------------------------------------
[INFO]
[INFO] --- maven-enforcer-plugin:3.0.0-M1:enforce (enforce) @ tobago-theme-scarborough ---
@@ -26,19 +26,17 @@ Build date: 2018-01-29 14:58:18
[INFO] Applying patch: append-tobago-theme-to-bootstrap.patch
[INFO]
[INFO] --- maven-dependency-plugin:3.0.2:unpack (step #5: unpack-custom) @ tobago-theme-scarborough ---
-[INFO] Configured Artifact: org.apache.myfaces.tobago:tobago-core:4.1.0-SNAPSHOT:jar
-[INFO] Unpacking __REPO__/org/apache/myfaces/tobago/tobago-core/4.1.0-SNAPSHOT/tobago-core-4.1.0-SNAPSHOT.jar to __CURRENT__/tobago-theme-scarborough/target/bootstrap with includes "**/*.scss" and excludes ""
+[INFO] Configured Artifact: org.apache.myfaces.tobago:tobago-core:4.1.1-SNAPSHOT:jar
+[INFO] Unpacking __REPO__/org/apache/myfaces/tobago/tobago-core/4.1.1-SNAPSHOT/tobago-core-4.1.1-SNAPSHOT.jar to __CURRENT__/tobago-theme-scarborough/target/bootstrap with includes "**/*.scss" and excludes ""
[INFO]
-[INFO] --- frontend-maven-plugin:1.4:install-node-and-npm (step #6: install node and npm) @ tobago-theme-scarborough ---
+[INFO] --- frontend-maven-plugin:1.6:install-node-and-npm (step #6: install node and npm) @ tobago-theme-scarborough ---
[INFO] Installing node version v8.9.3
[INFO] Unpacking __REPO__/com/github/eirslett/node/8.9.3/node-8.9.3-darwin-x64.tar.gz into __CURRENT__/tobago-theme-scarborough/target/frontend/node/tmp
[INFO] Copying node binary from __CURRENT__/tobago-theme-scarborough/target/frontend/node/tmp/node-v8.9.3-darwin-x64/bin/node to __CURRENT__/tobago-theme-scarborough/target/frontend/node/node
+[INFO] Extracting NPM
[INFO] Installed node locally.
-[INFO] Installing npm version 5.5.1
-[INFO] Unpacking __REPO__/com/github/eirslett/npm/5.5.1/npm-5.5.1.tar.gz into __CURRENT__/tobago-theme-scarborough/target/frontend/node/node_modules
-[INFO] Installed npm locally.
[INFO]
-[INFO] --- frontend-maven-plugin:1.4:npm (step #7: npm install) @ tobago-theme-scarborough ---
+[INFO] --- frontend-maven-plugin:1.6:npm (step #7: npm install) @ tobago-theme-scarborough ---
[INFO] Running 'npm install' in __CURRENT__/tobago-theme-scarborough/target/bootstrap
[INFO]
[INFO] > fsevents@1.1.3 install __CURRENT__/tobago-theme-scarborough/target/bootstrap/node_modules/fsevents
@@ -71,9 +69,9 @@ Build date: 2018-01-29 14:58:18
[INFO]
[WARNING] npm WARN bootstrap@4.0.0 requires a peer of jquery@1.9.1 - 3 but none is installed. You must install peer dependencies yourself.
[ERROR]
-[INFO] added 1405 packages in 25.76s
+[INFO] added 1405 packages in 18.578s
[INFO]
-[INFO] --- frontend-maven-plugin:1.4:npm (step #8: npm run css-compile) @ tobago-theme-scarborough ---
+[INFO] --- frontend-maven-plugin:1.6:npm (step #8: npm run css-compile) @ tobago-theme-scarborough ---
[INFO] Running 'npm run css-compile' in __CURRENT__/tobago-theme-scarborough/target/bootstrap
[INFO]
[INFO] > bootstrap@4.0.0 css-compile __CURRENT__/tobago-theme-scarborough/target/bootstrap
@@ -86,27 +84,27 @@ Build date: 2018-01-29 14:58:18
[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] 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] --- frontend-maven-plugin:1.6:npm (step #9: npm run css-prefix) @ tobago-theme-scarborough ---
[INFO] Running 'npm run css-prefix' in __CURRENT__/tobago-theme-scarborough/target/bootstrap
[INFO]
[INFO] > bootstrap@4.0.0 css-prefix __CURRENT__/tobago-theme-scarborough/target/bootstrap
[INFO] > postcss --config build/postcss.config.js --replace "dist/css/*.css" "!dist/css/*.min.css"
[INFO]
-[ERROR] ✔ Finished dist/css/bootstrap-reboot.css (967 ms)
-[ERROR] ✔ Finished dist/css/bootstrap-grid.css (969 ms)
-[ERROR] ✔ Finished dist/css/bootstrap.css (969 ms)
+[ERROR] ✔ Finished dist/css/bootstrap-grid.css (1.17 s)
+[ERROR] ✔ Finished dist/css/bootstrap-reboot.css (1.17 s)
+[ERROR] ✔ Finished dist/css/bootstrap.css (1.17 s)
[INFO]
-[INFO] --- frontend-maven-plugin:1.4:npm (step #10: npm run css-minify) @ tobago-theme-scarborough ---
+[INFO] --- frontend-maven-plugin:1.6:npm (step #10: npm run css-minify) @ tobago-theme-scarborough ---
[INFO] Running 'npm run css-minify' in __CURRENT__/tobago-theme-scarborough/target/bootstrap
[INFO]
[INFO] > bootstrap@4.0.0 css-minify __CURRENT__/tobago-theme-scarborough/target/bootstrap
[INFO] > cleancss --level 1 --source-map --source-map-inline-sources --output dist/css/bootstrap.min.css dist/css/bootstrap.css && cleancss --level 1 --source-map --source-map-inline-sources --output dist/css/bootstrap-grid.min.css dist/css/bootstrap-grid.css && cleancss --level 1 --source-map --source-map-inline-sources --output dist/css/bootstrap-reboot.min.css dist/css/bootstrap-reboot.css
[INFO]
[INFO]
-[INFO] --- frontend-maven-plugin:1.4:npm (step #11: npm run js) @ tobago-theme-scarborough ---
+[INFO] --- frontend-maven-plugin:1.6:npm (step #11: npm run js) @ tobago-theme-scarborough ---
[INFO] Running 'npm run js' in __CURRENT__/tobago-theme-scarborough/target/bootstrap
[INFO]
[INFO] > bootstrap@4.0.0 js __CURRENT__/tobago-theme-scarborough/target/bootstrap
@@ -125,21 +123,21 @@ Build date: 2018-01-29 14:58:18
[INFO] > npm-run-all --parallel js-compile-*
[INFO]
[INFO]
-[INFO] > bootstrap@4.0.0 js-compile-bundle __CURRENT__/tobago-theme-scarborough/target/bootstrap
-[INFO] > rollup --environment BUNDLE:true --config build/rollup.config.js --sourcemap
+[INFO] > bootstrap@4.0.0 js-compile-standalone __CURRENT__/tobago-theme-scarborough/target/bootstrap
+[INFO] > rollup --environment BUNDLE:false --config build/rollup.config.js --sourcemap
[INFO]
[INFO]
[INFO] > bootstrap@4.0.0 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 js-compile-standalone __CURRENT__/tobago-theme-scarborough/target/bootstrap
-[INFO] > rollup --environment BUNDLE:false --config build/rollup.config.js --sourcemap
+[INFO] > bootstrap@4.0.0 js-compile-bundle __CURRENT__/tobago-theme-scarborough/target/bootstrap
+[INFO] > 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]
[ERROR] __CURRENT__/tobago-theme-scarborough/target/bootstrap/js/src/index.js → dist/js/bootstrap.js...
+[ERROR]
+[ERROR] __CURRENT__/tobago-theme-scarborough/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
@@ -152,8 +150,8 @@ Build date: 2018-01-29 14:58:18
[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 3.2s
-[ERROR] created dist/js/bootstrap.bundle.js in 3.6s
+[ERROR] created dist/js/bootstrap.js in 1.6s
+[ERROR] created dist/js/bootstrap.bundle.js in 1.9s
[INFO]
[INFO] > bootstrap@4.0.0 js-minify __CURRENT__/tobago-theme-scarborough/target/bootstrap
[INFO] > npm-run-all --parallel js-minify-*
@@ -163,15 +161,15 @@ Build date: 2018-01-29 14:58:18
[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 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 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/*.js"
[INFO]
-[ERROR] INFO: Using input source map: dist/js/bootstrap.bundle.js.map
+[INFO]
+[INFO] > bootstrap@4.0.0 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]
[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] --- maven-resources-plugin:2.7:resources (default-resources) @ tobago-theme-scarborough ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
@@ -205,18 +203,18 @@ main:
[INFO] --- maven-surefire-plugin:2.19.1:test (default-test) @ tobago-theme-scarborough ---
[INFO]
[INFO] --- maven-jar-plugin:3.0.2:jar (default-jar) @ tobago-theme-scarborough ---
-[INFO] Building jar: __CURRENT__/tobago-theme-scarborough/target/tobago-theme-scarborough-4.1.0-SNAPSHOT.jar
+[INFO] Building jar: __CURRENT__/tobago-theme-scarborough/target/tobago-theme-scarborough-4.1.1-SNAPSHOT.jar
[INFO]
[INFO] --- maven-site-plugin:3.6:attach-descriptor (attach-descriptor) @ tobago-theme-scarborough ---
[INFO] Skipping because packaging 'jar' is not pom.
[INFO]
[INFO] --- maven-install-plugin:2.5.2:install (default-install) @ tobago-theme-scarborough ---
-[INFO] Installing __CURRENT__/tobago-theme-scarborough/target/tobago-theme-scarborough-4.1.0-SNAPSHOT.jar to __REPO__/org/apache/myfaces/tobago/tobago-theme-scarborough/4.1.0-SNAPSHOT/tobago-theme-scarborough-4.1.0-SNAPSHOT.jar
-[INFO] Installing __CURRENT__/tobago-theme-scarborough/pom.xml to __REPO__/org/apache/myfaces/tobago/tobago-theme-scarborough/4.1.0-SNAPSHOT/tobago-theme-scarborough-4.1.0-SNAPSHOT.pom
+[INFO] Installing __CURRENT__/tobago-theme-scarborough/target/tobago-theme-scarborough-4.1.1-SNAPSHOT.jar to __REPO__/org/apache/myfaces/tobago/tobago-theme-scarborough/4.1.1-SNAPSHOT/tobago-theme-scarborough-4.1.1-SNAPSHOT.jar
+[INFO] Installing __CURRENT__/tobago-theme-scarborough/pom.xml to __REPO__/org/apache/myfaces/tobago/tobago-theme-scarborough/4.1.1-SNAPSHOT/tobago-theme-scarborough-4.1.1-SNAPSHOT.pom
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
-[INFO] Total time: 56.263 s
-[INFO] Finished at: 2018-01-29T14:59:16+01:00
-[INFO] Final Memory: 36M/508M
+[INFO] Total time: 46.941 s
+[INFO] Finished at: 2018-02-20T09:53:25+01:00
+[INFO] Final Memory: 31M/416M
[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 6728a07..e07d61e 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
@@ -9719,7 +9719,7 @@ span.tobago-out:empty:before {
/* section ----------------------------------------------------------- */
/* to separate the icon from the rest of the title */
-h1 > .fa:first-child, h2 > .fa:first-child, h3 > .fa:first-child, h4 > .fa:first-child, h5 > .fa:first-child, h6 > .fa:first-child {
+h1 > .fa:first-child, h1 > img, h2 > .fa:first-child, h2 > img, h3 > .fa:first-child, h3 > img, h4 > .fa:first-child, h4 > img, h5 > .fa:first-child, h5 > img, h6 > .fa:first-child, h6 > img {
margin-right: 0.7em;
}
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 1cd98a6..4bc8372 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/_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/_code.scss","../../scss/_grid.scss","../../scss/mixins/_grid.scss","../../scss/mixins/_breakpoints.scss","../../scss/mixi [...]
\ No newline at end of file
+{"version":3,"sources":["bootstrap.css","../../scss/bootstrap.scss","../../scss/_custom.scss","../../scss/_root.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/_code.scss","../../scss/_grid.scss","../../scss/mixins/_grid.scss","../../scss/mixins/_breakpoints.scss","../../scss/mixi [...]
\ 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 0e18846..0e99ffd 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-2018 The Bootstrap Authors
* Copyright 2011-2018 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:#6c757d;--gray-dark:#343a40;--primary:#007bff;--secondary:#6c757d;--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:#6c757d;--gray-dark:#343a40;--primary:#007bff;--secondary:#6c757d;--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 d8d38da..ca1f6a4 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/_reboot.scss","dist/css/bootstrap.css","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/_code.scss","../../scss/_grid.scss","../../scss/mixins/_grid.scss","../../scss/mixins/_breakpoints.scss","../../scss/mixins/_grid-framework.scss","../. [...]
\ No newline at end of file
+{"version":3,"sources":["../../scss/bootstrap.scss","../../scss/_root.scss","../../scss/_reboot.scss","dist/css/bootstrap.css","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/_code.scss","../../scss/_grid.scss","../../scss/mixins/_grid.scss","../../scss/mixins/_breakpoints.scss","../../scss/mixins/_grid-framework.scss","../. [...]
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-speyside/rebuild-theme.txt b/tobago-theme/tobago-theme-speyside/rebuild-theme.txt
index f032211..a6ea0f8 100644
--- a/tobago-theme/tobago-theme-speyside/rebuild-theme.txt
+++ b/tobago-theme/tobago-theme-speyside/rebuild-theme.txt
@@ -1,8 +1,8 @@
-Build date: 2018-01-29 14:59:16
+Build date: 2018-02-20 09:53:26
[INFO] Scanning for projects...
[INFO]
[INFO] ------------------------------------------------------------------------
-[INFO] Building Tobago Theme Speyside 4.1.0-SNAPSHOT
+[INFO] Building Tobago Theme Speyside 4.1.1-SNAPSHOT
[INFO] ------------------------------------------------------------------------
[INFO]
[INFO] --- maven-enforcer-plugin:3.0.0-M1:enforce (enforce) @ tobago-theme-speyside ---
@@ -26,19 +26,17 @@ Build date: 2018-01-29 14:59:16
[INFO] Applying patch: append-tobago-theme-to-bootstrap.patch
[INFO]
[INFO] --- maven-dependency-plugin:3.0.2:unpack (step #5: unpack-custom) @ tobago-theme-speyside ---
-[INFO] Configured Artifact: org.apache.myfaces.tobago:tobago-core:4.1.0-SNAPSHOT:jar
-[INFO] Unpacking __REPO__/org/apache/myfaces/tobago/tobago-core/4.1.0-SNAPSHOT/tobago-core-4.1.0-SNAPSHOT.jar to __CURRENT__/tobago-theme-speyside/target/bootstrap with includes "**/*.scss" and excludes ""
+[INFO] Configured Artifact: org.apache.myfaces.tobago:tobago-core:4.1.1-SNAPSHOT:jar
+[INFO] Unpacking __REPO__/org/apache/myfaces/tobago/tobago-core/4.1.1-SNAPSHOT/tobago-core-4.1.1-SNAPSHOT.jar to __CURRENT__/tobago-theme-speyside/target/bootstrap with includes "**/*.scss" and excludes ""
[INFO]
-[INFO] --- frontend-maven-plugin:1.4:install-node-and-npm (step #6: install node and npm) @ tobago-theme-speyside ---
+[INFO] --- frontend-maven-plugin:1.6:install-node-and-npm (step #6: install node and npm) @ tobago-theme-speyside ---
[INFO] Installing node version v8.9.3
[INFO] Unpacking __REPO__/com/github/eirslett/node/8.9.3/node-8.9.3-darwin-x64.tar.gz into __CURRENT__/tobago-theme-speyside/target/frontend/node/tmp
[INFO] Copying node binary from __CURRENT__/tobago-theme-speyside/target/frontend/node/tmp/node-v8.9.3-darwin-x64/bin/node to __CURRENT__/tobago-theme-speyside/target/frontend/node/node
+[INFO] Extracting NPM
[INFO] Installed node locally.
-[INFO] Installing npm version 5.5.1
-[INFO] Unpacking __REPO__/com/github/eirslett/npm/5.5.1/npm-5.5.1.tar.gz into __CURRENT__/tobago-theme-speyside/target/frontend/node/node_modules
-[INFO] Installed npm locally.
[INFO]
-[INFO] --- frontend-maven-plugin:1.4:npm (step #7: npm install) @ tobago-theme-speyside ---
+[INFO] --- frontend-maven-plugin:1.6:npm (step #7: npm install) @ tobago-theme-speyside ---
[INFO] Running 'npm install' in __CURRENT__/tobago-theme-speyside/target/bootstrap
[INFO]
[INFO] > fsevents@1.1.3 install __CURRENT__/tobago-theme-speyside/target/bootstrap/node_modules/fsevents
@@ -71,17 +69,17 @@ Build date: 2018-01-29 14:59:16
[INFO]
[WARNING] npm WARN bootstrap@4.0.0 requires a peer of jquery@1.9.1 - 3 but none is installed. You must install peer dependencies yourself.
[ERROR]
-[INFO] added 1405 packages in 26.897s
+[INFO] added 1405 packages in 15.06s
[INFO]
-[INFO] --- frontend-maven-plugin:1.4:npm (step #8: npm run css-compile) @ tobago-theme-speyside ---
+[INFO] --- frontend-maven-plugin:1.6:npm (step #8: npm run css-compile) @ tobago-theme-speyside ---
[INFO] Running 'npm run css-compile' in __CURRENT__/tobago-theme-speyside/target/bootstrap
[INFO]
[INFO] > bootstrap@4.0.0 css-compile __CURRENT__/tobago-theme-speyside/target/bootstrap
[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 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] Wrote CSS to __CURRENT__/tobago-theme-speyside/target/bootstrap/dist/css/bootstrap.css
[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
@@ -89,24 +87,24 @@ Build date: 2018-01-29 14:59:16
[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
[INFO]
-[INFO] --- frontend-maven-plugin:1.4:npm (step #9: npm run css-prefix) @ tobago-theme-speyside ---
+[INFO] --- frontend-maven-plugin:1.6:npm (step #9: npm run css-prefix) @ tobago-theme-speyside ---
[INFO] Running 'npm run css-prefix' in __CURRENT__/tobago-theme-speyside/target/bootstrap
[INFO]
[INFO] > bootstrap@4.0.0 css-prefix __CURRENT__/tobago-theme-speyside/target/bootstrap
[INFO] > postcss --config build/postcss.config.js --replace "dist/css/*.css" "!dist/css/*.min.css"
[INFO]
-[ERROR] ✔ Finished dist/css/bootstrap-reboot.css (998 ms)
-[ERROR] ✔ Finished dist/css/bootstrap-grid.css (1 s)
-[ERROR] ✔ Finished dist/css/bootstrap.css (1 s)
+[ERROR] ✔ Finished dist/css/bootstrap-grid.css (898 ms)
+[ERROR] ✔ Finished dist/css/bootstrap-reboot.css (900 ms)
+[ERROR] ✔ Finished dist/css/bootstrap.css (900 ms)
[INFO]
-[INFO] --- frontend-maven-plugin:1.4:npm (step #10: npm run css-minify) @ tobago-theme-speyside ---
+[INFO] --- frontend-maven-plugin:1.6:npm (step #10: npm run css-minify) @ tobago-theme-speyside ---
[INFO] Running 'npm run css-minify' in __CURRENT__/tobago-theme-speyside/target/bootstrap
[INFO]
[INFO] > bootstrap@4.0.0 css-minify __CURRENT__/tobago-theme-speyside/target/bootstrap
[INFO] > cleancss --level 1 --source-map --source-map-inline-sources --output dist/css/bootstrap.min.css dist/css/bootstrap.css && cleancss --level 1 --source-map --source-map-inline-sources --output dist/css/bootstrap-grid.min.css dist/css/bootstrap-grid.css && cleancss --level 1 --source-map --source-map-inline-sources --output dist/css/bootstrap-reboot.min.css dist/css/bootstrap-reboot.css
[INFO]
[INFO]
-[INFO] --- frontend-maven-plugin:1.4:npm (step #11: npm run js) @ tobago-theme-speyside ---
+[INFO] --- frontend-maven-plugin:1.6:npm (step #11: npm run js) @ tobago-theme-speyside ---
[INFO] Running 'npm run js' in __CURRENT__/tobago-theme-speyside/target/bootstrap
[INFO]
[INFO] > bootstrap@4.0.0 js __CURRENT__/tobago-theme-speyside/target/bootstrap
@@ -125,21 +123,21 @@ Build date: 2018-01-29 14:59:16
[INFO] > npm-run-all --parallel js-compile-*
[INFO]
[INFO]
-[INFO] > bootstrap@4.0.0 js-compile-standalone __CURRENT__/tobago-theme-speyside/target/bootstrap
-[INFO] > rollup --environment BUNDLE:false --config build/rollup.config.js --sourcemap
-[INFO]
-[INFO]
[INFO] > bootstrap@4.0.0 js-compile-bundle __CURRENT__/tobago-theme-speyside/target/bootstrap
[INFO] > rollup --environment BUNDLE:true --config build/rollup.config.js --sourcemap
[INFO]
[INFO]
+[INFO] > bootstrap@4.0.0 js-compile-standalone __CURRENT__/tobago-theme-speyside/target/bootstrap
+[INFO] > rollup --environment BUNDLE:false --config build/rollup.config.js --sourcemap
+[INFO]
+[INFO]
[INFO] > bootstrap@4.0.0 js-compile-plugins __CURRENT__/tobago-theme-speyside/target/bootstrap
[INFO] > cross-env PLUGINS=true babel js/src/ --out-dir js/dist/ --source-maps
[INFO]
[ERROR]
-[ERROR] __CURRENT__/tobago-theme-speyside/target/bootstrap/js/src/index.js → dist/js/bootstrap.js...
-[ERROR]
[ERROR] __CURRENT__/tobago-theme-speyside/target/bootstrap/js/src/index.js → dist/js/bootstrap.bundle.js...
+[ERROR]
+[ERROR] __CURRENT__/tobago-theme-speyside/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
@@ -152,8 +150,8 @@ Build date: 2018-01-29 14:59:16
[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 2.2s
-[ERROR] created dist/js/bootstrap.bundle.js in 2.4s
+[ERROR] created dist/js/bootstrap.js in 2s
+[ERROR] created dist/js/bootstrap.bundle.js in 2.3s
[INFO]
[INFO] > bootstrap@4.0.0 js-minify __CURRENT__/tobago-theme-speyside/target/bootstrap
[INFO] > npm-run-all --parallel js-minify-*
@@ -163,15 +161,15 @@ Build date: 2018-01-29 14:59:16
[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 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/*.js"
-[INFO]
-[INFO]
[INFO] > bootstrap@4.0.0 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]
-[ERROR] INFO: Using input source map: dist/js/bootstrap.js.map
+[INFO]
+[INFO] > bootstrap@4.0.0 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/*.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] --- maven-resources-plugin:2.7:resources (default-resources) @ tobago-theme-speyside ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
@@ -205,18 +203,18 @@ main:
[INFO] --- maven-surefire-plugin:2.19.1:test (default-test) @ tobago-theme-speyside ---
[INFO]
[INFO] --- maven-jar-plugin:3.0.2:jar (default-jar) @ tobago-theme-speyside ---
-[INFO] Building jar: __CURRENT__/tobago-theme-speyside/target/tobago-theme-speyside-4.1.0-SNAPSHOT.jar
+[INFO] Building jar: __CURRENT__/tobago-theme-speyside/target/tobago-theme-speyside-4.1.1-SNAPSHOT.jar
[INFO]
[INFO] --- maven-site-plugin:3.6:attach-descriptor (attach-descriptor) @ tobago-theme-speyside ---
[INFO] Skipping because packaging 'jar' is not pom.
[INFO]
[INFO] --- maven-install-plugin:2.5.2:install (default-install) @ tobago-theme-speyside ---
-[INFO] Installing __CURRENT__/tobago-theme-speyside/target/tobago-theme-speyside-4.1.0-SNAPSHOT.jar to __REPO__/org/apache/myfaces/tobago/tobago-theme-speyside/4.1.0-SNAPSHOT/tobago-theme-speyside-4.1.0-SNAPSHOT.jar
-[INFO] Installing __CURRENT__/tobago-theme-speyside/pom.xml to __REPO__/org/apache/myfaces/tobago/tobago-theme-speyside/4.1.0-SNAPSHOT/tobago-theme-speyside-4.1.0-SNAPSHOT.pom
+[INFO] Installing __CURRENT__/tobago-theme-speyside/target/tobago-theme-speyside-4.1.1-SNAPSHOT.jar to __REPO__/org/apache/myfaces/tobago/tobago-theme-speyside/4.1.1-SNAPSHOT/tobago-theme-speyside-4.1.1-SNAPSHOT.jar
+[INFO] Installing __CURRENT__/tobago-theme-speyside/pom.xml to __REPO__/org/apache/myfaces/tobago/tobago-theme-speyside/4.1.1-SNAPSHOT/tobago-theme-speyside-4.1.1-SNAPSHOT.pom
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
-[INFO] Total time: 53.913 s
-[INFO] Finished at: 2018-01-29T15:00:11+01:00
-[INFO] Final Memory: 36M/506M
+[INFO] Total time: 41.454 s
+[INFO] Finished at: 2018-02-20T09:54:09+01:00
+[INFO] Final Memory: 32M/424M
[INFO] ------------------------------------------------------------------------
diff --git a/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/resources/tobago/speyside/tobago-bootstrap/_version/css/bootstrap.css b/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/resources/tobago/speyside/tobago-bootstrap/_version/css/bootstrap.css
index b523c52..961567d 100644
--- a/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/resources/tobago/speyside/tobago-bootstrap/_version/css/bootstrap.css
+++ b/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/resources/tobago/speyside/tobago-bootstrap/_version/css/bootstrap.css
@@ -9476,7 +9476,7 @@ span.tobago-out:empty:before {
/* section ----------------------------------------------------------- */
/* to separate the icon from the rest of the title */
-h1 > .fa:first-child, h2 > .fa:first-child, h3 > .fa:first-child, h4 > .fa:first-child, h5 > .fa:first-child, h6 > .fa:first-child {
+h1 > .fa:first-child, h1 > img, h2 > .fa:first-child, h2 > img, h3 > .fa:first-child, h3 > img, h4 > .fa:first-child, h4 > img, h5 > .fa:first-child, h5 > img, h6 > .fa:first-child, h6 > img {
margin-right: 0.7em;
}
diff --git a/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/resources/tobago/speyside/tobago-bootstrap/_version/css/bootstrap.css.map b/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/resources/tobago/speyside/tobago-bootstrap/_version/css/bootstrap.css.map
index 6451d2e..9b5c93c 100644
--- a/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/resources/tobago/speyside/tobago-bootstrap/_version/css/bootstrap.css.map
+++ b/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/resources/tobago/speyside/tobago-bootstrap/_version/css/bootstrap.css.map
@@ -1 +1 @@
-{"version":3,"sources":["bootstrap.css","../../scss/bootstrap.scss","../../scss/_custom.scss","../../scss/_root.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/_code.scss","../../scss/_grid.scss","../../scss/mixins/_grid.scss","../../scss/mixins/_breakpoints.scss","../../scss/mixins/_grid-framework.scss","../../scss/_ta [...]
\ No newline at end of file
+{"version":3,"sources":["bootstrap.css","../../scss/bootstrap.scss","../../scss/_custom.scss","../../scss/_root.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/_code.scss","../../scss/_grid.scss","../../scss/mixins/_grid.scss","../../scss/mixins/_breakpoints.scss","../../scss/mixins/_grid-framework.scss","../../scss/_ta [...]
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/resources/tobago/speyside/tobago-bootstrap/_version/css/bootstrap.min.css b/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/resources/tobago/speyside/tobago-bootstrap/_version/css/bootstrap.min.css
index c476f2e..9c05131 100644
--- a/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/resources/tobago/speyside/tobago-bootstrap/_version/css/bootstrap.min.css
+++ b/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/resources/tobago/speyside/tobago-bootstrap/_version/css/bootstrap.min.css
@@ -3,5 +3,5 @@
* Copyright 2011-2018 The Bootstrap Authors
* Copyright 2011-2018 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:#6c757d;--gray-dark:#343a40;--primary:#185722;--secondary:#d7d7d7;--success:#1da332;--info:#5bc0de;--warning:#f0ad4e;--danger:#d30040;--light:#f7f7f7;--dark:#323232;--breakpoint-xs:0;--breakpoint-sm:576px;--breakpoint-md:768px;--breakpoint-lg:992px;--breakpoint-xl:1200px;--font-family-sans-serif:verdana, [...]
+ */:root{--blue:#007bff;--indigo:#6610f2;--purple:#6f42c1;--pink:#e83e8c;--red:#dc3545;--orange:#fd7e14;--yellow:#ffc107;--green:#28a745;--teal:#20c997;--cyan:#17a2b8;--white:#fff;--gray:#6c757d;--gray-dark:#343a40;--primary:#185722;--secondary:#d7d7d7;--success:#1da332;--info:#5bc0de;--warning:#f0ad4e;--danger:#d30040;--light:#f7f7f7;--dark:#323232;--breakpoint-xs:0;--breakpoint-sm:576px;--breakpoint-md:768px;--breakpoint-lg:992px;--breakpoint-xl:1200px;--font-family-sans-serif:verdana, [...]
/*# sourceMappingURL=bootstrap.min.css.map */
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/resources/tobago/speyside/tobago-bootstrap/_version/css/bootstrap.min.css.map b/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/resources/tobago/speyside/tobago-bootstrap/_version/css/bootstrap.min.css.map
index 464865f..a6ecf47 100644
--- a/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/resources/tobago/speyside/tobago-bootstrap/_version/css/bootstrap.min.css.map
+++ b/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/resources/tobago/speyside/tobago-bootstrap/_version/css/bootstrap.min.css.map
@@ -1 +1 @@
-{"version":3,"sources":["../../scss/bootstrap.scss","../../scss/_root.scss","../../scss/_reboot.scss","dist/css/bootstrap.css","bootstrap.css","../../scss/mixins/_hover.scss","../../scss/_type.scss","../../scss/mixins/_lists.scss","../../scss/_images.scss","../../scss/mixins/_image.scss","../../scss/_code.scss","../../scss/_grid.scss","../../scss/mixins/_grid.scss","../../scss/mixins/_breakpoints.scss","../../scss/mixins/_grid-framework.scss","../../scss/_tables.scss","../../scss/mixins/ [...]
\ No newline at end of file
+{"version":3,"sources":["../../scss/bootstrap.scss","../../scss/_root.scss","../../scss/_reboot.scss","dist/css/bootstrap.css","bootstrap.css","../../scss/mixins/_hover.scss","../../scss/_type.scss","../../scss/mixins/_lists.scss","../../scss/_images.scss","../../scss/mixins/_image.scss","../../scss/_code.scss","../../scss/_grid.scss","../../scss/mixins/_grid.scss","../../scss/mixins/_breakpoints.scss","../../scss/mixins/_grid-framework.scss","../../scss/_tables.scss","../../scss/mixins/ [...]
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-standard/rebuild-theme.txt b/tobago-theme/tobago-theme-standard/rebuild-theme.txt
index 72b483d..6622c63 100644
--- a/tobago-theme/tobago-theme-standard/rebuild-theme.txt
+++ b/tobago-theme/tobago-theme-standard/rebuild-theme.txt
@@ -1,8 +1,8 @@
-Build date: 2018-01-29 15:00:11
+Build date: 2018-02-20 09:54:09
[INFO] Scanning for projects...
[INFO]
[INFO] ------------------------------------------------------------------------
-[INFO] Building Tobago Theme Standard 4.1.0-SNAPSHOT
+[INFO] Building Tobago Theme Standard 4.1.1-SNAPSHOT
[INFO] ------------------------------------------------------------------------
[INFO]
[INFO] --- maven-enforcer-plugin:3.0.0-M1:enforce (enforce) @ tobago-theme-standard ---
@@ -26,19 +26,17 @@ Build date: 2018-01-29 15:00:11
[INFO] Applying patch: append-tobago-theme-to-bootstrap.patch
[INFO]
[INFO] --- maven-dependency-plugin:3.0.2:unpack (step #5: unpack-custom) @ tobago-theme-standard ---
-[INFO] Configured Artifact: org.apache.myfaces.tobago:tobago-core:4.1.0-SNAPSHOT:jar
-[INFO] Unpacking __REPO__/org/apache/myfaces/tobago/tobago-core/4.1.0-SNAPSHOT/tobago-core-4.1.0-SNAPSHOT.jar to __CURRENT__/tobago-theme-standard/target/bootstrap with includes "**/*.scss" and excludes ""
+[INFO] Configured Artifact: org.apache.myfaces.tobago:tobago-core:4.1.1-SNAPSHOT:jar
+[INFO] Unpacking __REPO__/org/apache/myfaces/tobago/tobago-core/4.1.1-SNAPSHOT/tobago-core-4.1.1-SNAPSHOT.jar to __CURRENT__/tobago-theme-standard/target/bootstrap with includes "**/*.scss" and excludes ""
[INFO]
-[INFO] --- frontend-maven-plugin:1.4:install-node-and-npm (step #6: install node and npm) @ tobago-theme-standard ---
+[INFO] --- frontend-maven-plugin:1.6:install-node-and-npm (step #6: install node and npm) @ tobago-theme-standard ---
[INFO] Installing node version v8.9.3
[INFO] Unpacking __REPO__/com/github/eirslett/node/8.9.3/node-8.9.3-darwin-x64.tar.gz into __CURRENT__/tobago-theme-standard/target/frontend/node/tmp
[INFO] Copying node binary from __CURRENT__/tobago-theme-standard/target/frontend/node/tmp/node-v8.9.3-darwin-x64/bin/node to __CURRENT__/tobago-theme-standard/target/frontend/node/node
+[INFO] Extracting NPM
[INFO] Installed node locally.
-[INFO] Installing npm version 5.5.1
-[INFO] Unpacking __REPO__/com/github/eirslett/npm/5.5.1/npm-5.5.1.tar.gz into __CURRENT__/tobago-theme-standard/target/frontend/node/node_modules
-[INFO] Installed npm locally.
[INFO]
-[INFO] --- frontend-maven-plugin:1.4:npm (step #7: npm install) @ tobago-theme-standard ---
+[INFO] --- frontend-maven-plugin:1.6:npm (step #7: npm install) @ tobago-theme-standard ---
[INFO] Running 'npm install' in __CURRENT__/tobago-theme-standard/target/bootstrap
[INFO]
[INFO] > fsevents@1.1.3 install __CURRENT__/tobago-theme-standard/target/bootstrap/node_modules/fsevents
@@ -71,9 +69,9 @@ Build date: 2018-01-29 15:00:11
[INFO]
[WARNING] npm WARN bootstrap@4.0.0 requires a peer of jquery@1.9.1 - 3 but none is installed. You must install peer dependencies yourself.
[ERROR]
-[INFO] added 1405 packages in 25.106s
+[INFO] added 1405 packages in 17.075s
[INFO]
-[INFO] --- frontend-maven-plugin:1.4:npm (step #8: npm run css-compile) @ tobago-theme-standard ---
+[INFO] --- frontend-maven-plugin:1.6:npm (step #8: npm run css-compile) @ tobago-theme-standard ---
[INFO] Running 'npm run css-compile' in __CURRENT__/tobago-theme-standard/target/bootstrap
[INFO]
[INFO] > bootstrap@4.0.0 css-compile __CURRENT__/tobago-theme-standard/target/bootstrap
@@ -86,27 +84,27 @@ Build date: 2018-01-29 15:00:11
[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
[ERROR] Rendering Complete, saving .css file...
-[ERROR] Wrote CSS to __CURRENT__/tobago-theme-standard/target/bootstrap/dist/css/bootstrap-reboot.css
[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-standard/target/bootstrap/dist/css/bootstrap-reboot.css.map
+[ERROR] Wrote CSS to __CURRENT__/tobago-theme-standard/target/bootstrap/dist/css/bootstrap-reboot.css
[INFO]
-[INFO] --- frontend-maven-plugin:1.4:npm (step #9: npm run css-prefix) @ tobago-theme-standard ---
+[INFO] --- frontend-maven-plugin:1.6:npm (step #9: npm run css-prefix) @ tobago-theme-standard ---
[INFO] Running 'npm run css-prefix' in __CURRENT__/tobago-theme-standard/target/bootstrap
[INFO]
[INFO] > bootstrap@4.0.0 css-prefix __CURRENT__/tobago-theme-standard/target/bootstrap
[INFO] > postcss --config build/postcss.config.js --replace "dist/css/*.css" "!dist/css/*.min.css"
[INFO]
-[ERROR] ✔ Finished dist/css/bootstrap-reboot.css (931 ms)
-[ERROR] ✔ Finished dist/css/bootstrap-grid.css (933 ms)
-[ERROR] ✔ Finished dist/css/bootstrap.css (933 ms)
+[ERROR] ✔ Finished dist/css/bootstrap-reboot.css (1.02 s)
+[ERROR] ✔ Finished dist/css/bootstrap-grid.css (1.02 s)
+[ERROR] ✔ Finished dist/css/bootstrap.css (1.02 s)
[INFO]
-[INFO] --- frontend-maven-plugin:1.4:npm (step #10: npm run css-minify) @ tobago-theme-standard ---
+[INFO] --- frontend-maven-plugin:1.6:npm (step #10: npm run css-minify) @ tobago-theme-standard ---
[INFO] Running 'npm run css-minify' in __CURRENT__/tobago-theme-standard/target/bootstrap
[INFO]
[INFO] > bootstrap@4.0.0 css-minify __CURRENT__/tobago-theme-standard/target/bootstrap
[INFO] > cleancss --level 1 --source-map --source-map-inline-sources --output dist/css/bootstrap.min.css dist/css/bootstrap.css && cleancss --level 1 --source-map --source-map-inline-sources --output dist/css/bootstrap-grid.min.css dist/css/bootstrap-grid.css && cleancss --level 1 --source-map --source-map-inline-sources --output dist/css/bootstrap-reboot.min.css dist/css/bootstrap-reboot.css
[INFO]
[INFO]
-[INFO] --- frontend-maven-plugin:1.4:npm (step #11: npm run js) @ tobago-theme-standard ---
+[INFO] --- frontend-maven-plugin:1.6:npm (step #11: npm run js) @ tobago-theme-standard ---
[INFO] Running 'npm run js' in __CURRENT__/tobago-theme-standard/target/bootstrap
[INFO]
[INFO] > bootstrap@4.0.0 js __CURRENT__/tobago-theme-standard/target/bootstrap
@@ -125,21 +123,21 @@ Build date: 2018-01-29 15:00:11
[INFO] > npm-run-all --parallel js-compile-*
[INFO]
[INFO]
-[INFO] > bootstrap@4.0.0 js-compile-standalone __CURRENT__/tobago-theme-standard/target/bootstrap
-[INFO] > rollup --environment BUNDLE:false --config build/rollup.config.js --sourcemap
-[INFO]
-[INFO]
[INFO] > bootstrap@4.0.0 js-compile-bundle __CURRENT__/tobago-theme-standard/target/bootstrap
[INFO] > rollup --environment BUNDLE:true --config build/rollup.config.js --sourcemap
[INFO]
[INFO]
+[INFO] > bootstrap@4.0.0 js-compile-standalone __CURRENT__/tobago-theme-standard/target/bootstrap
+[INFO] > rollup --environment BUNDLE:false --config build/rollup.config.js --sourcemap
+[INFO]
+[INFO]
[INFO] > bootstrap@4.0.0 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.js...
-[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...
[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
@@ -152,8 +150,8 @@ Build date: 2018-01-29 15:00:11
[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 2.3s
-[ERROR] created dist/js/bootstrap.bundle.js in 2.5s
+[ERROR] created dist/js/bootstrap.js in 2.1s
+[ERROR] created dist/js/bootstrap.bundle.js in 2.3s
[INFO]
[INFO] > bootstrap@4.0.0 js-minify __CURRENT__/tobago-theme-standard/target/bootstrap
[INFO] > npm-run-all --parallel js-minify-*
@@ -163,13 +161,13 @@ Build date: 2018-01-29 15:00:11
[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/*.js"
[INFO]
[INFO]
-[INFO] > bootstrap@4.0.0 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]
-[INFO]
[INFO] > bootstrap@4.0.0 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 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]
[ERROR] INFO: Using input source map: dist/js/bootstrap.bundle.js.map
[ERROR] INFO: Using input source map: dist/js/bootstrap.js.map
[INFO]
@@ -195,8 +193,8 @@ Build date: 2018-01-29 15:00:11
[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 (167012b) -> bootstrap.min.min.css (166750b)[99%]
-[INFO] bootstrap.css (213684b) -> bootstrap.min.css (167249b)[78%]
+[INFO] bootstrap.min.css (167054b) -> bootstrap.min.min.css (166792b)[99%]
+[INFO] bootstrap.css (213744b) -> bootstrap.min.css (167291b)[78%]
[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
@@ -209,11 +207,11 @@ Build date: 2018-01-29 15:00:11
[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] nothing to do, __CURRENT__/tobago-theme-standard/target/classes/META-INF/resources/tobago/standard/tobago-bootstrap/_version/css/bootstrap.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/tobago-bootstrap/_version/css/bootstrap.min.css is younger than original, use 'force' option or clean your target
+[INFO] bootstrap.min.css (167054b) -> bootstrap.min.min.css (166792b)[99%]
+[INFO] bootstrap.css (213744b) -> bootstrap.min.css (167291b)[78%]
[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 (429612b) -> output (382847b)[89%]
+[INFO] total input (810512b) -> output (717014b)[88%]
[INFO] nb warnings: 0, nb errors: 0
[INFO]
[INFO] --- maven-compiler-plugin:3.6.2:compile (default-compile) @ tobago-theme-standard ---
@@ -248,7 +246,7 @@ main:
T E S T S
-------------------------------------------------------
Running org.apache.myfaces.tobago.renderkit.css.BootstrapClassUnitTest
-Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.365 sec - in org.apache.myfaces.tobago.renderkit.css.BootstrapClassUnitTest
+Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.265 sec - in org.apache.myfaces.tobago.renderkit.css.BootstrapClassUnitTest
Results :
@@ -256,18 +254,18 @@ Tests run: 3, Failures: 0, Errors: 0, Skipped: 0
[INFO]
[INFO] --- maven-jar-plugin:3.0.2:jar (default-jar) @ tobago-theme-standard ---
-[INFO] Building jar: __CURRENT__/tobago-theme-standard/target/tobago-theme-standard-4.1.0-SNAPSHOT.jar
+[INFO] Building jar: __CURRENT__/tobago-theme-standard/target/tobago-theme-standard-4.1.1-SNAPSHOT.jar
[INFO]
[INFO] --- maven-site-plugin:3.6:attach-descriptor (attach-descriptor) @ tobago-theme-standard ---
[INFO] Skipping because packaging 'jar' is not pom.
[INFO]
[INFO] --- maven-install-plugin:2.5.2:install (default-install) @ tobago-theme-standard ---
-[INFO] Installing __CURRENT__/tobago-theme-standard/target/tobago-theme-standard-4.1.0-SNAPSHOT.jar to __REPO__/org/apache/myfaces/tobago/tobago-theme-standard/4.1.0-SNAPSHOT/tobago-theme-standard-4.1.0-SNAPSHOT.jar
-[INFO] Installing __CURRENT__/tobago-theme-standard/pom.xml to __REPO__/org/apache/myfaces/tobago/tobago-theme-standard/4.1.0-SNAPSHOT/tobago-theme-standard-4.1.0-SNAPSHOT.pom
+[INFO] Installing __CURRENT__/tobago-theme-standard/target/tobago-theme-standard-4.1.1-SNAPSHOT.jar to __REPO__/org/apache/myfaces/tobago/tobago-theme-standard/4.1.1-SNAPSHOT/tobago-theme-standard-4.1.1-SNAPSHOT.jar
+[INFO] Installing __CURRENT__/tobago-theme-standard/pom.xml to __REPO__/org/apache/myfaces/tobago/tobago-theme-standard/4.1.1-SNAPSHOT/tobago-theme-standard-4.1.1-SNAPSHOT.pom
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
-[INFO] Total time: 58.107 s
-[INFO] Finished at: 2018-01-29T15:01:11+01:00
-[INFO] Final Memory: 40M/696M
+[INFO] Total time: 47.866 s
+[INFO] Finished at: 2018-02-20T09:54:58+01:00
+[INFO] Final Memory: 43M/796M
[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 e010e09..5100c30 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
@@ -9685,7 +9685,7 @@ span.tobago-out:empty:before {
/* section ----------------------------------------------------------- */
/* to separate the icon from the rest of the title */
-h1 > .fa:first-child, h2 > .fa:first-child, h3 > .fa:first-child, h4 > .fa:first-child, h5 > .fa:first-child, h6 > .fa:first-child {
+h1 > .fa:first-child, h1 > img, h2 > .fa:first-child, h2 > img, h3 > .fa:first-child, h3 > img, h4 > .fa:first-child, h4 > img, h5 > .fa:first-child, h5 > img, h6 > .fa:first-child, h6 > img {
margin-right: 0.7em;
}
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 a14bbe0..e4895be 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/_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/_code.scss","../../scss/_grid.scss","../../scss/mixins/_grid.scss","../../scss/mixins/_breakpoints.scss","../../scss/mixi [...]
\ No newline at end of file
+{"version":3,"sources":["bootstrap.css","../../scss/bootstrap.scss","../../scss/_custom.scss","../../scss/_root.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/_code.scss","../../scss/_grid.scss","../../scss/mixins/_grid.scss","../../scss/mixins/_breakpoints.scss","../../scss/mixi [...]
\ 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 bdb9616..1794e00 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-2018 The Bootstrap Authors
* Copyright 2011-2018 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:#6c757d;--gray-dark:#343a40;--primary:#007bff;--secondary:#6c757d;--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:#6c757d;--gray-dark:#343a40;--primary:#007bff;--secondary:#6c757d;--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 ad1bc9c..35895c1 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/_reboot.scss","dist/css/bootstrap.css","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/_code.scss","../../scss/_grid.scss","../../scss/mixins/_grid.scss","../../scss/mixins/_breakpoints.scss","../../scss/mixins/_grid-framework.scss","../. [...]
\ No newline at end of file
+{"version":3,"sources":["../../scss/bootstrap.scss","../../scss/_root.scss","../../scss/_reboot.scss","dist/css/bootstrap.css","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/_code.scss","../../scss/_grid.scss","../../scss/mixins/_grid.scss","../../scss/mixins/_breakpoints.scss","../../scss/mixins/_grid-framework.scss","../. [...]
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
hnoeth@apache.org.
[myfaces-tobago] 01/02: TOBAGO-1645 It is not possible to display
an image (png, jpg, ...) with the image-attribute of
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 37baa8ed602e13d40ac1de8b1543a57ee217cb0f
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Tue Feb 20 10:33:05 2018 +0100
TOBAGO-1645 It is not possible to display an image (png, jpg, ...) with the image-attribute of <tc:section>
* image attribute of tc:section can render an image
* styles added for <img> tag in section-header
* demo updated
* reuse code for CommandRendererBase and SectionRenderer
---
.../renderkit/renderer/CommandRendererBase.java | 14 +-------------
.../internal/renderkit/renderer/SectionRenderer.java | 9 +++------
.../myfaces/tobago/internal/util/HtmlRendererUtils.java | 15 +++++++++++++++
tobago-core/src/main/resources/scss/_tobago.scss | 2 +-
.../20-component/050-container/40-section/section.xhtml | 17 +++++++++--------
5 files changed, 29 insertions(+), 28 deletions(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/CommandRendererBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/CommandRendererBase.java
index 8e9989e..3c612d0 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/CommandRendererBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/CommandRendererBase.java
@@ -35,7 +35,6 @@ import org.apache.myfaces.tobago.internal.util.RenderUtils;
import org.apache.myfaces.tobago.renderkit.LabelWithAccessKey;
import org.apache.myfaces.tobago.renderkit.css.BootstrapClass;
import org.apache.myfaces.tobago.renderkit.css.CssItem;
-import org.apache.myfaces.tobago.renderkit.css.Icons;
import org.apache.myfaces.tobago.renderkit.css.TobagoClass;
import org.apache.myfaces.tobago.renderkit.html.Arias;
import org.apache.myfaces.tobago.renderkit.html.DataAttributes;
@@ -129,18 +128,7 @@ public abstract class CommandRendererBase extends DecodingCommandRendererBase {
}
final String image = ComponentUtils.getStringAttribute(command, Attributes.image);
- if (image != null) {
- if (image.startsWith("fa-")) {
- writer.startElement(HtmlElements.I);
- writer.writeClassAttribute(Icons.FA, Icons.custom(image));
- writer.endElement(HtmlElements.I);
- } else {
- writer.startElement(HtmlElements.IMG);
- writer.writeAttribute(HtmlAttributes.SRC, image, true);
- writer.writeAttribute(HtmlAttributes.ALT, "", false);
- writer.endElement(HtmlElements.IMG);
- }
- }
+ HtmlRendererUtils.encodeIconOrImage(writer, image);
if (label.getLabel() != null) {
writer.startElement(HtmlElements.SPAN);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SectionRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SectionRenderer.java
index 5413879..b19135f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SectionRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SectionRenderer.java
@@ -25,7 +25,6 @@ import org.apache.myfaces.tobago.internal.component.AbstractUISection;
import org.apache.myfaces.tobago.internal.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.internal.util.JsonUtils;
import org.apache.myfaces.tobago.model.CollapseMode;
-import org.apache.myfaces.tobago.renderkit.css.Icons;
import org.apache.myfaces.tobago.renderkit.css.TobagoClass;
import org.apache.myfaces.tobago.renderkit.html.DataAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
@@ -86,12 +85,10 @@ public class SectionRenderer extends PanelRendererBase {
writer.startElement(HtmlElements.DIV);
writer.writeClassAttribute(TobagoClass.SECTION__HEADER);
writer.startElement(tag);
+
final String image = section.getImage();
- if (image != null && image.startsWith("fa-")) {
- writer.startElement(HtmlElements.I);
- writer.writeClassAttribute(Icons.FA, Icons.custom(image));
- writer.endElement(HtmlElements.I);
- }
+ HtmlRendererUtils.encodeIconOrImage(writer, image);
+
if (label != null) {
writer.startElement(HtmlElements.SPAN);
writer.writeText(label);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlRendererUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlRendererUtils.java
index 25f89bc..af7a6e2 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlRendererUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlRendererUtils.java
@@ -109,6 +109,21 @@ public final class HtmlRendererUtils {
}
}
+ public static void encodeIconOrImage(final TobagoResponseWriter writer, final String image) throws IOException {
+ if (image != null) {
+ if (image.startsWith("fa-")) {
+ writer.startElement(HtmlElements.I);
+ writer.writeClassAttribute(Icons.FA, Icons.custom(image));
+ writer.endElement(HtmlElements.I);
+ } else {
+ writer.startElement(HtmlElements.IMG);
+ writer.writeAttribute(HtmlAttributes.SRC, image, true);
+ writer.writeAttribute(HtmlAttributes.ALT, "", false);
+ writer.endElement(HtmlElements.IMG);
+ }
+ }
+ }
+
/**
* @deprecated 4.0.0.
*/
diff --git a/tobago-core/src/main/resources/scss/_tobago.scss b/tobago-core/src/main/resources/scss/_tobago.scss
index 547ece8..3504fa7 100644
--- a/tobago-core/src/main/resources/scss/_tobago.scss
+++ b/tobago-core/src/main/resources/scss/_tobago.scss
@@ -796,7 +796,7 @@ span.tobago-out:empty:before {
/* to separate the icon from the rest of the title */
h1, h2, h3, h4, h5, h6 {
- > .fa:first-child {
+ > .fa:first-child, > img {
margin-right: 0.7em;
}
}
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/40-section/section.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/40-section/section.xhtml
index e1cfa84..126cd3c 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/40-section/section.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/40-section/section.xhtml
@@ -52,15 +52,16 @@
</tc:section>
<tc:section label="Image">
- <p>A section can have an image in the header. The following section have pie-chart in the header.</p>
- <pre><code class="language-markup"><tc:section label="Pie-Chart" image="fa-pie-chart"></code></pre>
- <tc:section label="Pie-Chart" image="fa-pie-chart">
- <p>It's also possible to use image files, instead of font awesome.</p>
+ <p>Sections can have an image or a FontAwesome icon in the header.</p>
+ <tc:section image="fa-pie-chart" label="FontAwesome: Pie-Chart">
+ <pre><code class="language-markup"><tc:section
+ image="fa-pie-chart"
+ label="FontAwesome: Pie-Chart"></code></pre>
</tc:section>
- <tc:section label="Image Files" image="/image/alps.png">
- <p><b>(TODO: currently not working!)</b></p>
- <!-- todo: this image is only a reminder. -->
- <tc:image value="/image/alps.png"/>
+ <tc:section image="#{request.contextPath}/image/feather-leaf.png" label="Image File: feather-leaf.png">
+ <pre><code class="language-markup"><tc:section
+ image="#{request.contextPath}/image/feather-leaf.png"
+ label="Image File: feather-leaf.png"></code></pre>
</tc:section>
</tc:section>
</ui:composition>
--
To stop receiving notification emails like this one, please contact
hnoeth@apache.org.