You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2018/03/09 12:12:20 UTC
[myfaces-tobago] branch master updated: TOBAGO-1874: Optimize and
cleanup theme building
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
The following commit(s) were added to refs/heads/master by this push:
new 1b7ed1f TOBAGO-1874: Optimize and cleanup theme building
1b7ed1f is described below
commit 1b7ed1ff1cddb5782a80753ff44f3bfbeb3c3f1c
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Fri Mar 9 13:12:27 2018 +0100
TOBAGO-1874: Optimize and cleanup theme building
---
tobago-theme/pom.xml | 87 +++++++++++---------
tobago-theme/tobago-theme-charlotteville/pom.xml | 33 +-------
.../tobago-theme-charlotteville/rebuild-theme.txt | 65 ++++++++-------
.../tobago-bootstrap/_version/css/bootstrap.css | 10 +--
.../_version/css/bootstrap.css.map | 2 +-
.../_version/css/bootstrap.min.css | 2 +-
.../_version/css/bootstrap.min.css.map | 2 +-
tobago-theme/tobago-theme-roxborough/pom.xml | 30 -------
.../tobago-theme-roxborough/rebuild-theme.txt | 56 +++++++------
.../tobago-bootstrap/_version/css/bootstrap.css | 4 -
.../_version/css/bootstrap.css.map | 2 +-
.../_version/css/bootstrap.min.css | 2 +-
.../_version/css/bootstrap.min.css.map | 2 +-
tobago-theme/tobago-theme-scarborough/pom.xml | 32 +-------
.../tobago-theme-scarborough/rebuild-theme.txt | 56 +++++++------
.../tobago-bootstrap/_version/css/bootstrap.css | 4 -
.../_version/css/bootstrap.css.map | 2 +-
.../_version/css/bootstrap.min.css | 2 +-
.../_version/css/bootstrap.min.css.map | 2 +-
tobago-theme/tobago-theme-speyside/pom.xml | 31 +------
.../tobago-theme-speyside/rebuild-theme.txt | 58 ++++++-------
.../tobago-bootstrap/_version/css/bootstrap.css | 4 -
.../_version/css/bootstrap.css.map | 2 +-
.../_version/css/bootstrap.min.css | 2 +-
.../_version/css/bootstrap.min.css.map | 2 +-
tobago-theme/tobago-theme-standard/pom.xml | 49 +++--------
.../tobago-theme-standard/rebuild-theme.txt | 96 ++++++++--------------
.../tobago-bootstrap/_version/css/bootstrap.css | 4 -
.../_version/css/bootstrap.css.map | 2 +-
.../_version/css/bootstrap.min.css | 2 +-
.../_version/css/bootstrap.min.css.map | 2 +-
31 files changed, 241 insertions(+), 408 deletions(-)
diff --git a/tobago-theme/pom.xml b/tobago-theme/pom.xml
index afc277a..fd5c7a0 100644
--- a/tobago-theme/pom.xml
+++ b/tobago-theme/pom.xml
@@ -28,59 +28,44 @@
<properties>
<bootstrap.version>4.0.0</bootstrap.version>
+ <theme.name>undefined-theme-name</theme.name>
</properties>
+ <modules>
+ <module>tobago-theme-standard</module>
+ <module>tobago-theme-scarborough</module>
+ <module>tobago-theme-speyside</module>
+ <module>tobago-theme-roxborough</module>
+ <module>tobago-theme-charlotteville</module>
+ </modules>
+
<build>
<resources>
<resource>
<directory>src/main/resources</directory>
<includes>
- <include>META-INF/tobago-config.xml
- </include>
+ <include>META-INF/tobago-config.xml</include>
</includes>
<filtering>true</filtering>
</resource>
<resource>
- <directory>src/main/resources</directory>
+ <directory>src/main/resources/META-INF/resources/tobago/${theme.name}</directory>
<excludes>
- <exclude>META-INF/tobago-config.xml</exclude>
+ <exclude>**/tobago-bootstrap/_version/**</exclude>
</excludes>
<filtering>false</filtering>
+ <targetPath>META-INF/resources/tobago/${theme.name}</targetPath>
+ </resource>
+ <resource>
+ <directory>src/main/resources/META-INF/resources/tobago/${theme.name}/tobago-bootstrap/_version</directory>
+ <filtering>false</filtering>
+ <targetPath>META-INF/resources/tobago/${theme.name}/tobago-bootstrap/${project.version}</targetPath>
</resource>
</resources>
-
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.4.0</version>
- </plugin>
- <plugin>
- <groupId>net.alchim31.maven</groupId>
- <artifactId>yuicompressor-maven-plugin</artifactId>
- <version>1.5.1</version>
- </plugin>
- </plugins>
- </pluginManagement>
+ <plugins>
+ </plugins>
</build>
- <modules>
- <module>tobago-theme-standard</module>
- <module>tobago-theme-scarborough</module>
- <module>tobago-theme-speyside</module>
- <module>tobago-theme-roxborough</module>
- <module>tobago-theme-charlotteville</module>
- </modules>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <optional>true</optional>
- </dependency>
- </dependencies>
-
<profiles>
<profile>
@@ -174,8 +159,8 @@
</configuration>
</execution>
<execution>
- <!-- copy the result to target/classes -->
- <id>step #12: copy-bootstrap-dist</id>
+ <!-- copy the result to src to be under source control -->
+ <id>step #12: copy-bootstrap-dist to src</id>
<phase>process-resources</phase>
<goals>
<goal>copy-resources</goal>
@@ -199,6 +184,34 @@
</resources>
</configuration>
</execution>
+ <execution>
+ <!-- copy the result to target/classes -->
+ <id>step #13: copy-bootstrap-dist to target</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>
+ ${project.build.outputDirectory}/META-INF/resources/tobago/${theme.name}/tobago-bootstrap/${project.version}
+ </outputDirectory>
+ <resources>
+ <resource>
+ <directory>${project.build.directory}/bootstrap/dist</directory>
+ <includes>
+ <include>css/bootstrap.css</include>
+ <include>css/bootstrap.min.css</include>
+ <include>css/bootstrap.css.map</include>
+ <include>css/bootstrap.min.css.map</include>
+ <include>js/bootstrap.js</include>
+ <include>js/bootstrap.min.js</include>
+ </includes>
+ </resource>
+ </resources>
+ <!-- overwrite, because the default maven-resources-plugin step copies an older version to here -->
+ <overwrite>true</overwrite>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
diff --git a/tobago-theme/tobago-theme-charlotteville/pom.xml b/tobago-theme/tobago-theme-charlotteville/pom.xml
index 6f7671c..5260e6a 100644
--- a/tobago-theme/tobago-theme-charlotteville/pom.xml
+++ b/tobago-theme/tobago-theme-charlotteville/pom.xml
@@ -17,6 +17,7 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-theme</artifactId>
@@ -29,37 +30,6 @@
<theme.name>charlotteville</theme.name>
</properties>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>set-version</id>
- <goals>
- <goal>run</goal>
- </goals>
- <phase>compile</phase>
- <configuration>
- <target>
- <move file="${project.build.outputDirectory}/META-INF/resources/tobago/charlotteville/tobago-bootstrap/_version"
- tofile="${project.build.outputDirectory}/META-INF/resources/tobago/charlotteville/tobago-bootstrap/${project.version}">
- </move>
- </target>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-apache-regexp</artifactId>
- <version>1.6.5</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
@@ -72,4 +42,5 @@
<version>${project.version}</version>
</dependency>
</dependencies>
+
</project>
diff --git a/tobago-theme/tobago-theme-charlotteville/rebuild-theme.txt b/tobago-theme/tobago-theme-charlotteville/rebuild-theme.txt
index 1be1d86..44e243f 100644
--- a/tobago-theme/tobago-theme-charlotteville/rebuild-theme.txt
+++ b/tobago-theme/tobago-theme-charlotteville/rebuild-theme.txt
@@ -1,10 +1,14 @@
-Build date: 2018-03-07 17:53:08
[INFO] Scanning for projects...
[INFO]
[INFO] ------------------------------------------------------------------------
[INFO] Building Tobago Theme Charlotteville 4.2.0-SNAPSHOT
[INFO] ------------------------------------------------------------------------
[INFO]
+[INFO] --- maven-clean-plugin:2.6.1:clean (default-clean) @ tobago-theme-charlotteville ---
+[INFO] Deleting __CURRENT__/tobago-theme-charlotteville/target
+[INFO]
+[INFO] --- maven-enforcer-plugin:3.0.0-M1:enforce (enforce-maven-version) @ tobago-theme-charlotteville ---
+[INFO]
[INFO] --- maven-enforcer-plugin:3.0.0-M1:enforce (enforce) @ tobago-theme-charlotteville ---
[INFO]
[INFO] --- maven-remote-resources-plugin:1.5:process (default) @ tobago-theme-charlotteville ---
@@ -69,7 +73,7 @@ Build date: 2018-03-07 17:53:08
[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 27.586s
+[INFO] added 1405 packages in 59.442s
[INFO]
[INFO] --- frontend-maven-plugin:1.6:npm (step #8: npm run css-compile) @ tobago-theme-charlotteville ---
[INFO] Running 'npm run css-compile' in __CURRENT__/tobago-theme-charlotteville/target/bootstrap
@@ -78,8 +82,8 @@ Build date: 2018-03-07 17:53:08
[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-charlotteville/target/bootstrap/dist/css/bootstrap.css
[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] 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
@@ -93,9 +97,9 @@ Build date: 2018-03-07 17:53:08
[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 (1.19 s)
-[ERROR] ✔ Finished dist/css/bootstrap.css (1.19 s)
-[ERROR] ✔ Finished dist/css/bootstrap-reboot.css (1.19 s)
+[ERROR] ✔ Finished dist/css/bootstrap-grid.css (1.91 s)
+[ERROR] ✔ Finished dist/css/bootstrap-reboot.css (1.91 s)
+[ERROR] ✔ Finished dist/css/bootstrap.css (1.91 s)
[INFO]
[INFO] --- frontend-maven-plugin:1.6:npm (step #10: npm run css-minify) @ tobago-theme-charlotteville ---
[INFO] Running 'npm run css-minify' in __CURRENT__/tobago-theme-charlotteville/target/bootstrap
@@ -123,21 +127,21 @@ Build date: 2018-03-07 17:53:08
[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] > 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]
[INFO]
[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-plugins __CURRENT__/tobago-theme-charlotteville/target/bootstrap
-[INFO] > cross-env PLUGINS=true babel js/src/ --out-dir js/dist/ --source-maps
+[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]
[ERROR] __CURRENT__/tobago-theme-charlotteville/target/bootstrap/js/src/index.js → dist/js/bootstrap.bundle.js...
+[ERROR]
+[ERROR] __CURRENT__/tobago-theme-charlotteville/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
@@ -150,17 +154,13 @@ Build date: 2018-03-07 17:53:08
[INFO] js/src/tab.js -> js/dist/tab.js
[INFO] js/src/tooltip.js -> js/dist/tooltip.js
[INFO] js/src/util.js -> js/dist/util.js
-[ERROR] created dist/js/bootstrap.js in 1.7s
-[ERROR] created dist/js/bootstrap.bundle.js in 1.8s
+[ERROR] created dist/js/bootstrap.js in 6.1s
+[ERROR] created dist/js/bootstrap.bundle.js in 6.5s
[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-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-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]
@@ -168,29 +168,32 @@ Build date: 2018-03-07 17:53:08
[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]
-[ERROR] INFO: Using input source map: dist/js/bootstrap.js.mapINFO: Using input source map: dist/js/bootstrap.bundle.js.map
-[ERROR]
+[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]
+[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-charlotteville ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 1 resource
-[INFO] Copying 6 resources
+[INFO] Copying 0 resource to META-INF/resources/tobago/charlotteville
+[INFO] Copying 6 resources to META-INF/resources/tobago/charlotteville/tobago-bootstrap/4.2.0-SNAPSHOT
[INFO] Copying 3 resources
[INFO] Copying 3 resources
[INFO]
-[INFO] --- maven-resources-plugin:2.7:copy-resources (step #12: copy-bootstrap-dist) @ tobago-theme-charlotteville ---
+[INFO] --- maven-resources-plugin:2.7:copy-resources (step #12: copy-bootstrap-dist to src) @ tobago-theme-charlotteville ---
+[INFO] Using 'UTF-8' encoding to copy filtered resources.
+[INFO] Copying 6 resources
+[INFO]
+[INFO] --- maven-resources-plugin:2.7:copy-resources (step #13: copy-bootstrap-dist to target) @ tobago-theme-charlotteville ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 6 resources
[INFO]
[INFO] --- maven-compiler-plugin:3.6.2:compile (default-compile) @ tobago-theme-charlotteville ---
[INFO] No sources to compile
[INFO]
-[INFO] --- maven-antrun-plugin:1.8:run (set-version) @ tobago-theme-charlotteville ---
-[INFO] Executing tasks
-
-main:
-[INFO] Executed tasks
-[INFO]
[INFO] --- maven-resources-plugin:2.7:testResources (default-testResources) @ tobago-theme-charlotteville ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory __CURRENT__/tobago-theme-charlotteville/src/test/resources
@@ -214,7 +217,7 @@ main:
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
-[INFO] Total time: 53.615 s
-[INFO] Finished at: 2018-03-07T17:54:03+01:00
-[INFO] Final Memory: 28M/393M
+[INFO] Total time: 02:30 min
+[INFO] Finished at: 2018-03-09T12:40:41+01:00
+[INFO] Final Memory: 22M/171M
[INFO] ------------------------------------------------------------------------
diff --git a/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/resources/tobago/charlotteville/tobago-bootstrap/_version/css/bootstrap.css b/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/resources/tobago/charlotteville/tobago-bootstrap/_version/css/bootstrap.css
index 7c16801..37cfe7a 100644
--- a/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/resources/tobago/charlotteville/tobago-bootstrap/_version/css/bootstrap.css
+++ b/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/resources/tobago/charlotteville/tobago-bootstrap/_version/css/bootstrap.css
@@ -9060,7 +9060,8 @@ XXX code will be inserted after the _variables.scss
}
.tobago-box > .card-body {
- overflow: auto;
+ overflow-x: hidden;
+ overflow-y: auto;
}
.tobago-box-header {
@@ -9565,11 +9566,8 @@ span.tobago-out:empty:before {
/* panel ------------------------------------------------------------- */
.tobago-panel {
- overflow: auto;
-}
-
-.tobago-bar .tobago-panel {
- overflow: inherit;
+ overflow-x: hidden;
+ overflow-y: auto;
}
/* popup ------------------------------------------------------------- */
diff --git a/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/resources/tobago/charlotteville/tobago-bootstrap/_version/css/bootstrap.css.map b/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/resources/tobago/charlotteville/tobago-bootstrap/_version/css/bootstrap.css.map
index 69a2e31..bfabefa 100644
--- a/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/resources/tobago/charlotteville/tobago-bootstrap/_version/css/bootstrap.css.map
+++ b/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/resources/tobago/charlotteville/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-charlotteville/src/main/resources/META-INF/resources/tobago/charlotteville/tobago-bootstrap/_version/css/bootstrap.min.css b/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/resources/tobago/charlotteville/tobago-bootstrap/_version/css/bootstrap.min.css
index 674fe5a..82bf120 100644
--- a/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/resources/tobago/charlotteville/tobago-bootstrap/_version/css/bootstrap.min.css
+++ b/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/resources/tobago/charlotteville/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:#2a6592;--secondary:#db9833;--success:#8ec3eb;--info:#44aa44;--warning:#db9833;--danger:#ee4444;--light:#8ec3eb;--dark:#2a6592;--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:#2a6592;--secondary:#db9833;--success:#8ec3eb;--info:#44aa44;--warning:#db9833;--danger:#ee4444;--light:#8ec3eb;--dark:#2a6592;--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-charlotteville/src/main/resources/META-INF/resources/tobago/charlotteville/tobago-bootstrap/_version/css/bootstrap.min.css.map b/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/resources/tobago/charlotteville/tobago-bootstrap/_version/css/bootstrap.min.css.map
index 9ae5504..8be4dd5 100644
--- a/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/resources/tobago/charlotteville/tobago-bootstrap/_version/css/bootstrap.min.css.map
+++ b/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/resources/tobago/charlotteville/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-roxborough/pom.xml b/tobago-theme/tobago-theme-roxborough/pom.xml
index 869e3b8..885d3e8 100644
--- a/tobago-theme/tobago-theme-roxborough/pom.xml
+++ b/tobago-theme/tobago-theme-roxborough/pom.xml
@@ -31,36 +31,6 @@
<theme.name>roxborough</theme.name>
</properties>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>set-version</id>
- <goals>
- <goal>run</goal>
- </goals>
- <phase>compile</phase>
- <configuration>
- <target>
- <move file="${project.build.outputDirectory}/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version" tofile="${project.build.outputDirectory}/META-INF/resources/tobago/roxborough/tobago-bootstrap/${project.version}">
- </move>
- </target>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-apache-regexp</artifactId>
- <version>1.6.5</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
diff --git a/tobago-theme/tobago-theme-roxborough/rebuild-theme.txt b/tobago-theme/tobago-theme-roxborough/rebuild-theme.txt
index 063304b..03fb4ee 100644
--- a/tobago-theme/tobago-theme-roxborough/rebuild-theme.txt
+++ b/tobago-theme/tobago-theme-roxborough/rebuild-theme.txt
@@ -4,6 +4,9 @@
[INFO] Building Tobago Theme Roxborough 4.2.0-SNAPSHOT
[INFO] ------------------------------------------------------------------------
[INFO]
+[INFO] --- maven-clean-plugin:2.6.1:clean (default-clean) @ tobago-theme-roxborough ---
+[INFO] Deleting __CURRENT__/tobago-theme-roxborough/target
+[INFO]
[INFO] --- maven-enforcer-plugin:3.0.0-M1:enforce (enforce-maven-version) @ tobago-theme-roxborough ---
[INFO]
[INFO] --- maven-enforcer-plugin:3.0.0-M1:enforce (enforce) @ tobago-theme-roxborough ---
@@ -68,9 +71,9 @@
[INFO] Love nodemon? You can now support the project via the open collective:
[INFO] > https://opencollective.com/nodemon/donate
[INFO]
+[INFO] added 1405 packages in 58.774s
[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 59.152s
[INFO]
[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
@@ -82,8 +85,8 @@
[ERROR] Wrote CSS to __CURRENT__/tobago-theme-roxborough/target/bootstrap/dist/css/bootstrap.css
[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-roxborough/target/bootstrap/dist/css/bootstrap.css.map
[ERROR] Rendering Complete, saving .css file...
-[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-roxborough/target/bootstrap/dist/css/bootstrap-grid.css.map
[ERROR] Wrote CSS to __CURRENT__/tobago-theme-roxborough/target/bootstrap/dist/css/bootstrap-grid.css
+[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-roxborough/target/bootstrap/dist/css/bootstrap-grid.css.map
[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
@@ -94,9 +97,9 @@
[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.css (1.55 s)
-[ERROR] ✔ Finished dist/css/bootstrap-grid.css (1.55 s)
-[ERROR] ✔ Finished dist/css/bootstrap-reboot.css (1.55 s)
+[ERROR] ✔ Finished dist/css/bootstrap-reboot.css (1.65 s)
+[ERROR] ✔ Finished dist/css/bootstrap.css (1.65 s)
+[ERROR] ✔ Finished dist/css/bootstrap-grid.css (1.66 s)
[INFO]
[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
@@ -124,14 +127,14 @@
[INFO] > npm-run-all --parallel js-compile-*
[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-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-plugins __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO] > cross-env PLUGINS=true babel js/src/ --out-dir js/dist/ --source-maps
[INFO]
@@ -151,8 +154,8 @@
[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 6.1s
-[ERROR] created dist/js/bootstrap.bundle.js in 6.5s
+[ERROR] created dist/js/bootstrap.js in 6.2s
+[ERROR] created dist/js/bootstrap.bundle.js in 6.6s
[INFO]
[INFO] > bootstrap@4.0.0 js-minify __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO] > npm-run-all --parallel js-minify-*
@@ -162,36 +165,35 @@
[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-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]
-[ERROR] INFO: Using input source map: dist/js/bootstrap.bundle.js.map
+[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]
[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-roxborough ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 1 resource
-[INFO] Copying 10 resources
+[INFO] Copying 0 resource to META-INF/resources/tobago/roxborough
+[INFO] Copying 10 resources to META-INF/resources/tobago/roxborough/tobago-bootstrap/4.2.0-SNAPSHOT
[INFO] Copying 3 resources
[INFO] Copying 3 resources
[INFO]
-[INFO] --- maven-resources-plugin:2.7:copy-resources (step #12: copy-bootstrap-dist) @ tobago-theme-roxborough ---
+[INFO] --- maven-resources-plugin:2.7:copy-resources (step #12: copy-bootstrap-dist to src) @ tobago-theme-roxborough ---
+[INFO] Using 'UTF-8' encoding to copy filtered resources.
+[INFO] Copying 6 resources
+[INFO]
+[INFO] --- maven-resources-plugin:2.7:copy-resources (step #13: copy-bootstrap-dist to target) @ tobago-theme-roxborough ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 6 resources
[INFO]
[INFO] --- maven-compiler-plugin:3.6.2:compile (default-compile) @ tobago-theme-roxborough ---
[INFO] No sources to compile
[INFO]
-[INFO] --- maven-antrun-plugin:1.8:run (set-version) @ tobago-theme-roxborough ---
-[INFO] Executing tasks
-
-main:
-[INFO] Executed tasks
-[INFO]
[INFO] --- maven-resources-plugin:2.7:testResources (default-testResources) @ tobago-theme-roxborough ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory __CURRENT__/tobago-theme-roxborough/src/test/resources
@@ -215,7 +217,7 @@ main:
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
-[INFO] Total time: 02:04 min
-[INFO] Finished at: 2018-03-08T15:07:34+01:00
-[INFO] Final Memory: 25M/275M
+[INFO] Total time: 02:30 min
+[INFO] Finished at: 2018-03-09T12:40:41+01:00
+[INFO] Final Memory: 22M/152M
[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 a0266e9..e726d09 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
@@ -9601,10 +9601,6 @@ span.tobago-out:empty:before {
overflow-y: auto;
}
-.tobago-bar .tobago-panel {
- overflow-y: inherit;
-}
-
/* popup ------------------------------------------------------------- */
.modal-content > .card {
margin-bottom: 0;
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 84f3479..294ee67 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 6830271..de89b12 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 de547fe..f7752d8 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/pom.xml b/tobago-theme/tobago-theme-scarborough/pom.xml
index 70c3b2b..3f080ac 100644
--- a/tobago-theme/tobago-theme-scarborough/pom.xml
+++ b/tobago-theme/tobago-theme-scarborough/pom.xml
@@ -17,6 +17,7 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-theme</artifactId>
@@ -30,36 +31,6 @@
<theme.name>scarborough</theme.name>
</properties>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>set-version</id>
- <goals>
- <goal>run</goal>
- </goals>
- <phase>compile</phase>
- <configuration>
- <target>
- <move file="${project.build.outputDirectory}/META-INF/resources/tobago/scarborough/tobago-bootstrap/_version" tofile="${project.build.outputDirectory}/META-INF/resources/tobago/scarborough/tobago-bootstrap/${project.version}">
- </move>
- </target>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-apache-regexp</artifactId>
- <version>1.6.5</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
@@ -72,4 +43,5 @@
<version>${project.version}</version>
</dependency>
</dependencies>
+
</project>
diff --git a/tobago-theme/tobago-theme-scarborough/rebuild-theme.txt b/tobago-theme/tobago-theme-scarborough/rebuild-theme.txt
index d61cbec..d7b9b06 100644
--- a/tobago-theme/tobago-theme-scarborough/rebuild-theme.txt
+++ b/tobago-theme/tobago-theme-scarborough/rebuild-theme.txt
@@ -4,6 +4,9 @@
[INFO] Building Tobago Theme Scarborough 4.2.0-SNAPSHOT
[INFO] ------------------------------------------------------------------------
[INFO]
+[INFO] --- maven-clean-plugin:2.6.1:clean (default-clean) @ tobago-theme-scarborough ---
+[INFO] Deleting __CURRENT__/tobago-theme-scarborough/target
+[INFO]
[INFO] --- maven-enforcer-plugin:3.0.0-M1:enforce (enforce-maven-version) @ tobago-theme-scarborough ---
[INFO]
[INFO] --- maven-enforcer-plugin:3.0.0-M1:enforce (enforce) @ tobago-theme-scarborough ---
@@ -70,7 +73,7 @@
[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 59.255s
+[INFO] added 1405 packages in 58.606s
[INFO]
[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
@@ -94,9 +97,9 @@
[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 (1.58 s)
-[ERROR] ✔ Finished dist/css/bootstrap-grid.css (1.58 s)
-[ERROR] ✔ Finished dist/css/bootstrap.css (1.58 s)
+[ERROR] ✔ Finished dist/css/bootstrap-reboot.css (1.7 s)
+[ERROR] ✔ Finished dist/css/bootstrap-grid.css (1.71 s)
+[ERROR] ✔ Finished dist/css/bootstrap.css (1.71 s)
[INFO]
[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
@@ -124,21 +127,21 @@
[INFO] > npm-run-all --parallel js-compile-*
[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]
-[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]
[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]
+[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]
[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...
+[ERROR]
+[ERROR] __CURRENT__/tobago-theme-scarborough/target/bootstrap/js/src/index.js → dist/js/bootstrap.js...
[INFO] js/src/alert.js -> js/dist/alert.js
[INFO] js/src/button.js -> js/dist/button.js
[INFO] js/src/carousel.js -> js/dist/carousel.js
@@ -151,13 +154,17 @@
[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 6s
-[ERROR] created dist/js/bootstrap.bundle.js in 6.4s
+[ERROR] created dist/js/bootstrap.js in 6.3s
+[ERROR] created dist/js/bootstrap.bundle.js in 6.8s
[INFO]
[INFO] > bootstrap@4.0.0 js-minify __CURRENT__/tobago-theme-scarborough/target/bootstrap
[INFO] > npm-run-all --parallel js-minify-*
[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-standalone __CURRENT__/tobago-theme-scarborough/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]
@@ -165,33 +172,28 @@
[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]
-[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.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-scarborough ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 1 resource
-[INFO] Copying 6 resources
+[INFO] Copying 0 resource to META-INF/resources/tobago/scarborough
+[INFO] Copying 6 resources to META-INF/resources/tobago/scarborough/tobago-bootstrap/4.2.0-SNAPSHOT
[INFO] Copying 3 resources
[INFO] Copying 3 resources
[INFO]
-[INFO] --- maven-resources-plugin:2.7:copy-resources (step #12: copy-bootstrap-dist) @ tobago-theme-scarborough ---
+[INFO] --- maven-resources-plugin:2.7:copy-resources (step #12: copy-bootstrap-dist to src) @ tobago-theme-scarborough ---
+[INFO] Using 'UTF-8' encoding to copy filtered resources.
+[INFO] Copying 6 resources
+[INFO]
+[INFO] --- maven-resources-plugin:2.7:copy-resources (step #13: copy-bootstrap-dist to target) @ tobago-theme-scarborough ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 6 resources
[INFO]
[INFO] --- maven-compiler-plugin:3.6.2:compile (default-compile) @ tobago-theme-scarborough ---
[INFO] No sources to compile
[INFO]
-[INFO] --- maven-antrun-plugin:1.8:run (set-version) @ tobago-theme-scarborough ---
-[INFO] Executing tasks
-
-main:
-[INFO] Executed tasks
-[INFO]
[INFO] --- maven-resources-plugin:2.7:testResources (default-testResources) @ tobago-theme-scarborough ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory __CURRENT__/tobago-theme-scarborough/src/test/resources
@@ -215,7 +217,7 @@ main:
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
-[INFO] Total time: 02:04 min
-[INFO] Finished at: 2018-03-08T15:07:34+01:00
-[INFO] Final Memory: 26M/273M
+[INFO] Total time: 02:30 min
+[INFO] Finished at: 2018-03-09T12:40:41+01:00
+[INFO] Final Memory: 22M/176M
[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 7b313d6..53614f5 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
@@ -9604,10 +9604,6 @@ span.tobago-out:empty:before {
overflow-y: auto;
}
-.tobago-bar .tobago-panel {
- overflow-y: inherit;
-}
-
/* popup ------------------------------------------------------------- */
.modal-content > .card {
margin-bottom: 0;
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 df302e0..3cef1c4 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 19eb9fc..0a700c3 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 0f5fcf3..709ad0e 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/pom.xml b/tobago-theme/tobago-theme-speyside/pom.xml
index 8c6b506..b394256 100644
--- a/tobago-theme/tobago-theme-speyside/pom.xml
+++ b/tobago-theme/tobago-theme-speyside/pom.xml
@@ -17,6 +17,7 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-theme</artifactId>
@@ -30,36 +31,6 @@
<theme.name>speyside</theme.name>
</properties>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>set-version</id>
- <goals>
- <goal>run</goal>
- </goals>
- <phase>compile</phase>
- <configuration>
- <target>
- <move file="${project.build.outputDirectory}/META-INF/resources/tobago/speyside/tobago-bootstrap/_version" tofile="${project.build.outputDirectory}/META-INF/resources/tobago/speyside/tobago-bootstrap/${project.version}">
- </move>
- </target>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-apache-regexp</artifactId>
- <version>1.6.5</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
diff --git a/tobago-theme/tobago-theme-speyside/rebuild-theme.txt b/tobago-theme/tobago-theme-speyside/rebuild-theme.txt
index 17b3ef4..e6c3272 100644
--- a/tobago-theme/tobago-theme-speyside/rebuild-theme.txt
+++ b/tobago-theme/tobago-theme-speyside/rebuild-theme.txt
@@ -4,6 +4,9 @@
[INFO] Building Tobago Theme Speyside 4.2.0-SNAPSHOT
[INFO] ------------------------------------------------------------------------
[INFO]
+[INFO] --- maven-clean-plugin:2.6.1:clean (default-clean) @ tobago-theme-speyside ---
+[INFO] Deleting __CURRENT__/tobago-theme-speyside/target
+[INFO]
[INFO] --- maven-enforcer-plugin:3.0.0-M1:enforce (enforce-maven-version) @ tobago-theme-speyside ---
[INFO]
[INFO] --- maven-enforcer-plugin:3.0.0-M1:enforce (enforce) @ tobago-theme-speyside ---
@@ -70,7 +73,7 @@
[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 59.115s
+[INFO] added 1405 packages in 58.501s
[INFO]
[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
@@ -79,8 +82,8 @@
[INFO] > node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap.scss dist/css/bootstrap.css && node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap-grid.scss dist/css/bootstrap-grid.css && node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap-reboot.scss dist/css/bootstrap-reboot.css
[INFO]
[ERROR] Rendering Complete, saving .css file...
-[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-speyside/target/bootstrap/dist/css/bootstrap.css.map
[ERROR] Wrote CSS to __CURRENT__/tobago-theme-speyside/target/bootstrap/dist/css/bootstrap.css
+[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-speyside/target/bootstrap/dist/css/bootstrap.css.map
[ERROR] Rendering Complete, saving .css file...
[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-speyside/target/bootstrap/dist/css/bootstrap-grid.css.map
[ERROR] Wrote CSS to __CURRENT__/tobago-theme-speyside/target/bootstrap/dist/css/bootstrap-grid.css
@@ -94,9 +97,9 @@
[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-grid.css (1.63 s)
-[ERROR] ✔ Finished dist/css/bootstrap-reboot.css (1.64 s)
-[ERROR] ✔ Finished dist/css/bootstrap.css (1.64 s)
+[ERROR] ✔ Finished dist/css/bootstrap.css (1.77 s)
+[ERROR] ✔ Finished dist/css/bootstrap-grid.css (1.78 s)
+[ERROR] ✔ Finished dist/css/bootstrap-reboot.css (1.78 s)
[INFO]
[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
@@ -124,21 +127,21 @@
[INFO] > npm-run-all --parallel js-compile-*
[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] > 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] > 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,16 +155,12 @@
[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 6.1s
-[ERROR] created dist/js/bootstrap.bundle.js in 6.4s
+[ERROR] created dist/js/bootstrap.bundle.js in 6.6s
[INFO]
[INFO] > bootstrap@4.0.0 js-minify __CURRENT__/tobago-theme-speyside/target/bootstrap
[INFO] > npm-run-all --parallel js-minify-*
[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]
-[INFO]
[INFO] > bootstrap@4.0.0 js-minify-standalone __CURRENT__/tobago-theme-speyside/target/bootstrap
[INFO] > uglifyjs --compress typeofs=false --mangle --comments "/^!/" --source-map "content=dist/js/bootstrap.js.map,includeSources,url=bootstrap.min.js.map" --output dist/js/bootstrap.min.js dist/js/bootstrap.js
[INFO]
@@ -169,29 +168,32 @@
[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
+[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
+[ERROR] INFO: Using input source map: dist/js/bootstrap.bundle.js.map
[INFO]
[INFO] --- maven-resources-plugin:2.7:resources (default-resources) @ tobago-theme-speyside ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 1 resource
-[INFO] Copying 48 resources
+[INFO] Copying 42 resources to META-INF/resources/tobago/speyside
+[INFO] Copying 6 resources to META-INF/resources/tobago/speyside/tobago-bootstrap/4.2.0-SNAPSHOT
[INFO] Copying 3 resources
[INFO] Copying 3 resources
[INFO]
-[INFO] --- maven-resources-plugin:2.7:copy-resources (step #12: copy-bootstrap-dist) @ tobago-theme-speyside ---
+[INFO] --- maven-resources-plugin:2.7:copy-resources (step #12: copy-bootstrap-dist to src) @ tobago-theme-speyside ---
+[INFO] Using 'UTF-8' encoding to copy filtered resources.
+[INFO] Copying 6 resources
+[INFO]
+[INFO] --- maven-resources-plugin:2.7:copy-resources (step #13: copy-bootstrap-dist to target) @ tobago-theme-speyside ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 6 resources
[INFO]
[INFO] --- maven-compiler-plugin:3.6.2:compile (default-compile) @ tobago-theme-speyside ---
[INFO] No sources to compile
[INFO]
-[INFO] --- maven-antrun-plugin:1.8:run (set-version) @ tobago-theme-speyside ---
-[INFO] Executing tasks
-
-main:
-[INFO] Executed tasks
-[INFO]
[INFO] --- maven-resources-plugin:2.7:testResources (default-testResources) @ tobago-theme-speyside ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory __CURRENT__/tobago-theme-speyside/src/test/resources
@@ -215,7 +217,7 @@ main:
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
-[INFO] Total time: 02:04 min
-[INFO] Finished at: 2018-03-08T15:07:34+01:00
-[INFO] Final Memory: 27M/363M
+[INFO] Total time: 02:31 min
+[INFO] Finished at: 2018-03-09T12:40:41+01:00
+[INFO] Final Memory: 26M/237M
[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 479300a..6cb1472 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
@@ -9361,10 +9361,6 @@ span.tobago-out:empty:before {
overflow-y: auto;
}
-.tobago-bar .tobago-panel {
- overflow-y: inherit;
-}
-
/* popup ------------------------------------------------------------- */
.modal-content > .card {
margin-bottom: 0;
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 5b47065..68bc2fc 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 acc7cb8..96afb66 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 7446277..7e2e01d 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/pom.xml b/tobago-theme/tobago-theme-standard/pom.xml
index 8824ccc..c077fb9 100644
--- a/tobago-theme/tobago-theme-standard/pom.xml
+++ b/tobago-theme/tobago-theme-standard/pom.xml
@@ -17,6 +17,7 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-theme</artifactId>
@@ -44,7 +45,9 @@
<configuration>
<target>
<concat destfile="${project.build.directory}/javascript-min/tobago.min.js" force="no">
- <filelist dir="${basedir}/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/_version/js" files="tobago-jsf.js,tobago-deltaspike.js,tobago.js,tobago-dropdown.js,tobago-calendar.js,tobago-in.js,tobago-layout.js,tobago-overlay.js,tobago-popup.js,tobago-sheet.js,tobago-stars.js,tobago-suggest.js,tobago-tab.js,tobago-tree.js,tobago-utils.js" />
+ <filelist
+ dir="${basedir}/src/main/resources/META-INF/resources/tobago/${theme.name}/tobago-bootstrap/_version/js"
+ files="tobago-jsf.js,tobago-deltaspike.js,tobago.js,tobago-dropdown.js,tobago-calendar.js,tobago-in.js,tobago-layout.js,tobago-overlay.js,tobago-popup.js,tobago-sheet.js,tobago-stars.js,tobago-suggest.js,tobago-tab.js,tobago-tree.js,tobago-utils.js" />
</concat>
<replaceregexp match="^.*//.*@DEV_ONLY.*$" replace="" byline="true">
<fileset dir="${project.build.directory}/javascript-min">
@@ -54,19 +57,6 @@
</target>
</configuration>
</execution>
- <execution>
- <id>set-version</id>
- <goals>
- <goal>run</goal>
- </goals>
- <phase>compile</phase>
- <configuration>
- <target>
- <move file="${project.build.outputDirectory}/META-INF/resources/tobago/standard/tobago-bootstrap/_version" tofile="${project.build.outputDirectory}/META-INF/resources/tobago/standard/tobago-bootstrap/${project.version}">
- </move>
- </target>
- </configuration>
- </execution>
</executions>
<dependencies>
<dependency>
@@ -79,6 +69,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
+ <version>1.4.0</version>
<executions>
<execution>
<id>compress-standard</id>
@@ -94,39 +85,22 @@
<argument>--js</argument>
<argument>${project.build.directory}/javascript-min/tobago.min.js</argument>
<argument>--js_output_file</argument>
- <argument>target/classes/META-INF/resources/tobago/standard/tobago-bootstrap/${project.version}/js/tobago.min.js</argument>
+ <argument>target/classes/META-INF/resources/tobago/${theme.name}/tobago-bootstrap/${project.version}/js/tobago.min.js</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>net.alchim31.maven</groupId>
- <artifactId>yuicompressor-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>compress</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <suffix>.min</suffix>
- <excludes>
- <exclude>**/*.js</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>nl.geodienstencentrum.maven</groupId>
- <artifactId>sass-maven-plugin</artifactId>
- <version>2.14</version>
- </plugin>
</plugins>
</build>
<dependencies>
<dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-core</artifactId>
<version>${project.version}</version>
@@ -143,4 +117,5 @@
<scope>test</scope>
</dependency>
</dependencies>
+
</project>
diff --git a/tobago-theme/tobago-theme-standard/rebuild-theme.txt b/tobago-theme/tobago-theme-standard/rebuild-theme.txt
index 4260de8..89f2597 100644
--- a/tobago-theme/tobago-theme-standard/rebuild-theme.txt
+++ b/tobago-theme/tobago-theme-standard/rebuild-theme.txt
@@ -4,6 +4,9 @@
[INFO] Building Tobago Theme Standard 4.2.0-SNAPSHOT
[INFO] ------------------------------------------------------------------------
[INFO]
+[INFO] --- maven-clean-plugin:2.6.1:clean (default-clean) @ tobago-theme-standard ---
+[INFO] Deleting __CURRENT__/tobago-theme-standard/target
+[INFO]
[INFO] --- maven-enforcer-plugin:3.0.0-M1:enforce (enforce-maven-version) @ tobago-theme-standard ---
[INFO]
[INFO] --- maven-enforcer-plugin:3.0.0-M1:enforce (enforce) @ tobago-theme-standard ---
@@ -70,7 +73,7 @@
[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 59.377s
+[INFO] added 1405 packages in 58.543s
[INFO]
[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
@@ -79,14 +82,14 @@
[INFO] > node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap.scss dist/css/bootstrap.css && node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap-grid.scss dist/css/bootstrap-grid.css && node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap-reboot.scss dist/css/bootstrap-reboot.css
[INFO]
[ERROR] Rendering Complete, saving .css file...
-[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-standard/target/bootstrap/dist/css/bootstrap.css.map
[ERROR] Wrote CSS to __CURRENT__/tobago-theme-standard/target/bootstrap/dist/css/bootstrap.css
+[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-standard/target/bootstrap/dist/css/bootstrap.css.map
[ERROR] Rendering Complete, saving .css file...
-[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-standard/target/bootstrap/dist/css/bootstrap-grid.css.map
[ERROR] Wrote CSS to __CURRENT__/tobago-theme-standard/target/bootstrap/dist/css/bootstrap-grid.css
+[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-standard/target/bootstrap/dist/css/bootstrap-grid.css.map
[ERROR] Rendering Complete, saving .css file...
-[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
+[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-standard/target/bootstrap/dist/css/bootstrap-reboot.css.map
[INFO]
[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
@@ -94,9 +97,9 @@
[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.css (1.58 s)
-[ERROR] ✔ Finished dist/css/bootstrap-grid.css (1.58 s)
-[ERROR] ✔ Finished dist/css/bootstrap-reboot.css (1.58 s)
+[ERROR] ✔ Finished dist/css/bootstrap.css (1.74 s)
+[ERROR] ✔ Finished dist/css/bootstrap-reboot.css (1.74 s)
+[ERROR] ✔ Finished dist/css/bootstrap-grid.css (1.75 s)
[INFO]
[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
@@ -124,21 +127,21 @@
[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
@@ -151,8 +154,8 @@
[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 6.2s
-[ERROR] created dist/js/bootstrap.bundle.js in 6.5s
+[ERROR] created dist/js/bootstrap.js in 6.3s
+[ERROR] created dist/js/bootstrap.bundle.js in 6.7s
[INFO]
[INFO] > bootstrap@4.0.0 js-minify __CURRENT__/tobago-theme-standard/target/bootstrap
[INFO] > npm-run-all --parallel js-minify-*
@@ -162,58 +165,31 @@
[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-docs __CURRENT__/tobago-theme-standard/target/bootstrap
[INFO] > uglifyjs --mangle --comments "/^!/" --output assets/js/docs.min.js assets/js/vendor/anchor.min.js assets/js/vendor/clipboard.min.js assets/js/vendor/holder.min.js "assets/js/src/*.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-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]
[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-standard ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 1 resource
-[INFO] Copying 57 resources
+[INFO] Copying 35 resources to META-INF/resources/tobago/standard
+[INFO] Copying 22 resources to META-INF/resources/tobago/standard/tobago-bootstrap/4.2.0-SNAPSHOT
[INFO] Copying 3 resources
[INFO] Copying 3 resources
[INFO]
-[INFO] --- maven-resources-plugin:2.7:copy-resources (step #12: copy-bootstrap-dist) @ tobago-theme-standard ---
+[INFO] --- maven-resources-plugin:2.7:copy-resources (step #12: copy-bootstrap-dist to src) @ tobago-theme-standard ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 6 resources
[INFO]
-[INFO] --- yuicompressor-maven-plugin:1.5.1:compress (default) @ tobago-theme-standard ---
-[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
-[INFO] bootstrap-datetimepicker.min.css (7785b) -> bootstrap-datetimepicker.min.min.css (7733b)[99%]
-[INFO] tether-theme-basic.min.css (504b) -> tether-theme-basic.min.min.css (504b)[100%]
-[INFO] nothing to do, __CURRENT__/tobago-theme-standard/target/classes/META-INF/resources/tobago/standard/tether/1.1.1/css/tether.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.css is younger than original, use 'force' option or clean your target
-[INFO] tether-theme-arrows.min.css (4709b) -> tether-theme-arrows.min.min.css (4703b)[99%]
-[INFO] tether.min.css (237b) -> tether.min.min.css (237b)[100%]
-[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 (167660b) -> bootstrap.min.min.css (167398b)[99%]
-[INFO] bootstrap.css (214199b) -> bootstrap.min.css (167897b)[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
-[INFO] nothing to do, __CURRENT__/tobago-theme-standard/target/classes/META-INF/resources/tobago/standard/bootstrap-datetimepicker/4.17.45/css/bootstrap-datetimepicker.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-basic.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.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.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.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.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-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] 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 (430775b) -> output (384143b)[89%]
-[INFO] nb warnings: 0, nb errors: 0
+[INFO] --- maven-resources-plugin:2.7:copy-resources (step #13: copy-bootstrap-dist to target) @ tobago-theme-standard ---
+[INFO] Using 'UTF-8' encoding to copy filtered resources.
+[INFO] Copying 6 resources
[INFO]
[INFO] --- maven-compiler-plugin:3.6.2:compile (default-compile) @ tobago-theme-standard ---
[INFO] No sources to compile
@@ -224,12 +200,6 @@
main:
[INFO] Executed tasks
[INFO]
-[INFO] --- maven-antrun-plugin:1.8:run (set-version) @ tobago-theme-standard ---
-[INFO] Executing tasks
-
-main:
-[INFO] Executed tasks
-[INFO]
[INFO] --- exec-maven-plugin:1.4.0:exec (compress-standard) @ tobago-theme-standard ---
[INFO]
[INFO] --- maven-resources-plugin:2.7:testResources (default-testResources) @ tobago-theme-standard ---
@@ -247,7 +217,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.354 sec - in org.apache.myfaces.tobago.renderkit.css.BootstrapClassUnitTest
+Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.306 sec - in org.apache.myfaces.tobago.renderkit.css.BootstrapClassUnitTest
Results :
@@ -266,7 +236,7 @@ Tests run: 3, Failures: 0, Errors: 0, Skipped: 0
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
-[INFO] Total time: 02:09 min
-[INFO] Finished at: 2018-03-08T15:07:40+01:00
-[INFO] Final Memory: 37M/414M
+[INFO] Total time: 02:35 min
+[INFO] Finished at: 2018-03-09T12:40:46+01:00
+[INFO] Final Memory: 32M/143M
[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 9511f5c..90cb0de 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
@@ -9570,10 +9570,6 @@ span.tobago-out:empty:before {
overflow-y: auto;
}
-.tobago-bar .tobago-panel {
- overflow-y: inherit;
-}
-
/* popup ------------------------------------------------------------- */
.modal-content > .card {
margin-bottom: 0;
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 747d50f..6325c01 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 06a9ede..02b752a 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 9a7fa33..a96fbd5 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
lofwyr@apache.org.