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 2017/11/02 15:05:29 UTC
[myfaces-tobago] branch master updated (828ea0e -> 87368de)
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git.
from 828ea0e TOBAGO-1818: Progress in the Measure class (cleanup and CSS support) # The LayoutToken and Measure classes are quite similar and should be consolidated. # As a result, we should add a MeasureList to manage a list of Measures. This list should be the type of the corresponding layout manager attributes. # The syntax should also cover the CSS wording like * "auto" * "3*" should be written as "3fr" (fraction) * SegmentLayout should be also use "3seg" instead of "3".
new 0724588 TOBAGO-1819: A dark theme for ambiant light situations: roxborough
new 47816b852 cleanup: less debug logging
new c463e5d TOBAGO-1819: A dark theme for ambiant light situations: roxborough
new 3826820 TOBAGO-1819: A dark theme for ambiant light situations: roxborough * adding mime type for fonts: opentype
new 87368de Demo: fix embedded maps * replacing Google Maps with openstreetmap OSM, because its free to use and no API Key is needed for tracking/analysis.
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
tobago-assembly/pom.xml | 4 +-
.../tobago/internal/util/MimeTypeUtils.java | 3 +
.../myfaces/tobago/layout/MeasureListEditor.java | 8 -
.../tobago/layout/SegmentMeasureListEditor.java | 7 -
tobago-example/pom.xml | 9 +-
.../src/main/webapp/WEB-INF/tobago-config.xml | 4 +-
.../20-component/020-output/60-object/object.js | 14 +-
.../20-component/020-output/60-object/object.xhtml | 12 +-
.../content/20-component/020-output/output.xhtml | 7 +-
.../richmond/standard/property/demo.properties.xml | 2 +-
tobago-theme/pom.xml | 2 +-
tobago-theme/rebuild-theme.sh | 2 +-
.../tobago-bootstrap/_version/css/bootstrap.css | 9175 --------------------
.../_version/css/bootstrap.css.map | 1 -
.../_version/css/bootstrap.min.css | 7 -
.../_version/css/bootstrap.min.css.map | 1 -
.../tobago-bootstrap/_version/js/bootstrap.min.js | 7 -
.../src/main/scss/_custom.scss | 39 -
.../pom.xml | 10 +-
.../rebuild-theme.log | 258 +-
.../src/main/appended-resources/META-INF/LICENSE | 48 +
.../src/main/appended-resources/META-INF/NOTICE | 2 +
.../patches/append-tobago-theme-to-bootstrap.patch | 0
.../tobago-bootstrap/_version/css/bootstrap.css | 781 +-
.../_version/css/bootstrap.css.map | 1 +
.../_version/css/bootstrap.min.css | 7 +
.../_version/css/bootstrap.min.css.map | 1 +
.../_version/fonts/Amaranth-Bold.otf | Bin 0 -> 48760 bytes
.../_version/fonts/Amaranth-BoldItalic.otf | Bin 0 -> 56700 bytes
.../_version/fonts/Amaranth-Italic.otf | Bin 0 -> 56056 bytes
.../_version/fonts/Amaranth-Regular.otf | Bin 0 -> 48732 bytes
.../tobago-bootstrap/_version/js/bootstrap.js | 0
.../tobago-bootstrap/_version/js/bootstrap.min.js | 7 +
.../src/main/resources/META-INF/tobago-config.xml | 14 +-
.../src/main/scss/_custom.scss | 98 +
.../src/main/scss/_tobago-theme.scss | 0
36 files changed, 744 insertions(+), 9787 deletions(-)
delete mode 100644 tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/resources/tobago/richmond/tobago-bootstrap/_version/css/bootstrap.css
delete mode 100644 tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/resources/tobago/richmond/tobago-bootstrap/_version/css/bootstrap.css.map
delete mode 100644 tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/resources/tobago/richmond/tobago-bootstrap/_version/css/bootstrap.min.css
delete mode 100644 tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/resources/tobago/richmond/tobago-bootstrap/_version/css/bootstrap.min.css.map
delete mode 100644 tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/resources/tobago/richmond/tobago-bootstrap/_version/js/bootstrap.min.js
delete mode 100644 tobago-theme/tobago-theme-richmond/src/main/scss/_custom.scss
rename tobago-theme/{tobago-theme-richmond => tobago-theme-roxborough}/pom.xml (90%)
rename tobago-theme/{tobago-theme-richmond => tobago-theme-roxborough}/rebuild-theme.log (87%)
create mode 100644 tobago-theme/tobago-theme-roxborough/src/main/appended-resources/META-INF/LICENSE
rename tobago-theme/{tobago-theme-richmond => tobago-theme-roxborough}/src/main/appended-resources/META-INF/NOTICE (51%)
rename tobago-theme/{tobago-theme-richmond => tobago-theme-roxborough}/src/main/patches/append-tobago-theme-to-bootstrap.patch (100%)
copy tobago-theme/{tobago-theme-scarborough/src/main/resources/META-INF/resources/tobago/scarborough => tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough}/tobago-bootstrap/_version/css/bootstrap.css (94%)
create mode 100644 tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/css/bootstrap.css.map
create mode 100644 tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/css/bootstrap.min.css
create mode 100644 tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/css/bootstrap.min.css.map
create mode 100755 tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/fonts/Amaranth-Bold.otf
create mode 100755 tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/fonts/Amaranth-BoldItalic.otf
create mode 100755 tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/fonts/Amaranth-Italic.otf
create mode 100755 tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/fonts/Amaranth-Regular.otf
rename tobago-theme/{tobago-theme-richmond/src/main/resources/META-INF/resources/tobago/richmond => tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough}/tobago-bootstrap/_version/js/bootstrap.js (100%)
create mode 100644 tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/js/bootstrap.min.js
rename tobago-theme/{tobago-theme-richmond => tobago-theme-roxborough}/src/main/resources/META-INF/tobago-config.xml (79%)
create mode 100644 tobago-theme/tobago-theme-roxborough/src/main/scss/_custom.scss
rename tobago-theme/{tobago-theme-richmond => tobago-theme-roxborough}/src/main/scss/_tobago-theme.scss (100%)
--
To stop receiving notification emails like this one, please contact
['"commits@myfaces.apache.org" <co...@myfaces.apache.org>'].
[myfaces-tobago] 03/05: TOBAGO-1819: A dark theme for ambiant light
situations: roxborough
Posted by lo...@apache.org.
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
commit c463e5d9d7d5208346b0df62251b548b923ee5b8
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Thu Nov 2 08:33:42 2017 +0100
TOBAGO-1819: A dark theme for ambiant light situations: roxborough
---
.../roxborough/tobago-bootstrap/_version/css/bootstrap.css | 10 +++++-----
.../roxborough/tobago-bootstrap/_version/css/bootstrap.css.map | 2 +-
.../roxborough/tobago-bootstrap/_version/css/bootstrap.min.css | 2 +-
.../tobago-bootstrap/_version/css/bootstrap.min.css.map | 2 +-
.../roxborough/tobago-bootstrap/_version/js/bootstrap.min.js | 2 +-
.../tobago-theme-roxborough/src/main/scss/_custom.scss | 6 +++++-
6 files changed, 14 insertions(+), 10 deletions(-)
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 22a7013..0265193 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
@@ -3838,9 +3838,9 @@ tbody.collapse.show {
flex-direction: column;
min-width: 0;
word-wrap: break-word;
- background-color: #fff;
+ background-color: #000000;
background-clip: border-box;
- border: 1px solid rgba(0, 0, 0, 0.125);
+ border: 2px solid #505050;
border-radius: 0.25rem;
}
@@ -3890,7 +3890,7 @@ tbody.collapse.show {
padding: 0.75rem 1.25rem;
margin-bottom: 0;
background-color: rgba(0, 0, 0, 0.03);
- border-bottom: 1px solid rgba(0, 0, 0, 0.125);
+ border-bottom: 2px solid #505050;
}
.card-header:first-child {
@@ -3904,7 +3904,7 @@ tbody.collapse.show {
.card-footer {
padding: 0.75rem 1.25rem;
background-color: rgba(0, 0, 0, 0.03);
- border-top: 1px solid rgba(0, 0, 0, 0.125);
+ border-top: 2px solid #505050;
}
.card-footer:last-child {
@@ -8264,7 +8264,7 @@ table.tobago-gridLayout > tbody > tr:first-child > td {
}
.tobago-link.nav-link:focus, .tobago-link.nav-link:hover {
- text-decoration: underline;
+ text-decoration: none;
}
a.tobago-link.dropdown-item img, a.tobago-link.dropdown-item span {
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 73ddbf7..a73b124 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/_print.scss","../../scss/_reboot.scss","../../scss/_variables.scss","../../scss/mixins/_hover.scss","../../scss/_type.scss","../../scss/mixins/_lists.scss","../../scss/_images.scss","../../scss/mixins/_image.scss","../../scss/mixins/_border-radius.scss","../../scss/mixins/_transition.scss","../../scss/_code.scss","../../scss/_grid.scss","../../scss/mixins/_gri [...]
\ No newline at end of file
+{"version":3,"sources":["bootstrap.css","../../scss/bootstrap.scss","../../scss/_custom.scss","../../scss/_root.scss","../../scss/_print.scss","../../scss/_reboot.scss","../../scss/_variables.scss","../../scss/mixins/_hover.scss","../../scss/_type.scss","../../scss/mixins/_lists.scss","../../scss/_images.scss","../../scss/mixins/_image.scss","../../scss/mixins/_border-radius.scss","../../scss/mixins/_transition.scss","../../scss/_code.scss","../../scss/_grid.scss","../../scss/mixins/_gri [...]
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-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 d5b4939..645b499 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-2017 The Bootstrap Authors
* Copyright 2011-2017 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- */:root{--blue:#007bff;--indigo:#6610f2;--purple:#6f42c1;--pink:#e83e8c;--red:#dc3545;--orange:#fd7e14;--yellow:#ffc107;--green:#28a745;--teal:#20c997;--cyan:#17a2b8;--white:#fff;--gray:#868e96;--gray-dark:#343a40;--primary:#4f4fa8;--success:#3c883c;--info:#007f7f;--warning:#a0ad2e;--danger:#8f59a9;--breakpoint-xs:0;--breakpoint-sm:576px;--breakpoint-md:768px;--breakpoint-lg:992px;--breakpoint-xl:1200px;--font-family-sans-serif:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helveti [...]
+ */:root{--blue:#007bff;--indigo:#6610f2;--purple:#6f42c1;--pink:#e83e8c;--red:#dc3545;--orange:#fd7e14;--yellow:#ffc107;--green:#28a745;--teal:#20c997;--cyan:#17a2b8;--white:#fff;--gray:#868e96;--gray-dark:#343a40;--primary:#4f4fa8;--success:#3c883c;--info:#007f7f;--warning:#a0ad2e;--danger:#8f59a9;--breakpoint-xs:0;--breakpoint-sm:576px;--breakpoint-md:768px;--breakpoint-lg:992px;--breakpoint-xl:1200px;--font-family-sans-serif:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helveti [...]
/*# 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 16fbae3..28c7f98 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/_root.scss","../../scss/_print.scss","dist/css/bootstrap.css","../../scss/_reboot.scss","bootstrap.css","../../scss/mixins/_hover.scss","../../scss/_type.scss","../../scss/mixins/_lists.scss","../../scss/_images.scss","../../scss/mixins/_image.scss","../../scss/mixins/_border-radius.scss","../../scss/mixins/_transition.scss","../../scss/_code.scss","../../scss/_grid.scss","../../scss/mixins/_grid.scss","../../scss/mixins/_br [...]
\ No newline at end of file
+{"version":3,"sources":["../../scss/bootstrap.scss","../../scss/_root.scss","../../scss/_print.scss","dist/css/bootstrap.css","../../scss/_reboot.scss","bootstrap.css","../../scss/mixins/_hover.scss","../../scss/_type.scss","../../scss/mixins/_lists.scss","../../scss/_images.scss","../../scss/mixins/_image.scss","../../scss/mixins/_border-radius.scss","../../scss/mixins/_transition.scss","../../scss/_code.scss","../../scss/_grid.scss","../../scss/mixins/_grid.scss","../../scss/mixins/_br [...]
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/js/bootstrap.min.js b/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/js/bootstrap.min.js
index 4031514..13fc091 100644
--- a/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/js/bootstrap.min.js
+++ b/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/js/bootstrap.min.js
@@ -3,5 +3,5 @@
* Copyright 2011-2017 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
-var bootstrap=function(t,e,n){"use strict";function i(t,e){for(var n=0;n<e.length;n++){var i=e[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(t,i.key,i)}}e=e&&e.hasOwnProperty("default")?e.default:e,n=n&&n.hasOwnProperty("default")?n.default:n;var s=function(){function t(t){return{}.toString.call(t).match(/\s([a-zA-Z]+)/)[1].toLowerCase()}function n(){return{bindType:r.end,delegateType:r.end,handle:function(t){if(e(t.target).is(this) [...]
+var bootstrap=function(t,e,n){"use strict";function i(t,e){for(var n=0;n<e.length;n++){var i=e[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(t,i.key,i)}}e=e&&e.hasOwnProperty("default")?e.default:e,n=n&&n.hasOwnProperty("default")?n.default:n;var s=function(){function t(t){return{}.toString.call(t).match(/\s([a-zA-Z]+)/)[1].toLowerCase()}function n(){return{bindType:r.end,delegateType:r.end,handle:function(t){if(e(t.target).is(this) [...]
//# sourceMappingURL=bootstrap.min.js.map
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-roxborough/src/main/scss/_custom.scss b/tobago-theme/tobago-theme-roxborough/src/main/scss/_custom.scss
index 3576982..50d0ed2 100644
--- a/tobago-theme/tobago-theme-roxborough/src/main/scss/_custom.scss
+++ b/tobago-theme/tobago-theme-roxborough/src/main/scss/_custom.scss
@@ -36,4 +36,8 @@ $input-bg: #505050;
$navbar-light-color: #606060;
$navbar-light-active-color: #707070;
$navbar-light-hover-color: #808080;
-$navbar-light-disabled-color: #505050;
\ No newline at end of file
+$navbar-light-disabled-color: #505050;
+
+$card-bg: #000000;
+$card-border-color: #505050;
+$card-border-width: 2px;
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.
[myfaces-tobago] 02/05: cleanup: less debug logging
Posted by lo...@apache.org.
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
commit 47816b8524158e04f0c122c443e4f7e71a7d7158
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Wed Nov 1 20:08:07 2017 +0100
cleanup: less debug logging
---
.../java/org/apache/myfaces/tobago/layout/MeasureListEditor.java | 8 --------
.../apache/myfaces/tobago/layout/SegmentMeasureListEditor.java | 7 -------
2 files changed, 15 deletions(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/MeasureListEditor.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/MeasureListEditor.java
index 08467c8..cc4530d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/MeasureListEditor.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/MeasureListEditor.java
@@ -19,9 +19,6 @@
package org.apache.myfaces.tobago.layout;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import java.beans.PropertyEditorSupport;
/**
@@ -29,13 +26,8 @@ import java.beans.PropertyEditorSupport;
*/
public class MeasureListEditor extends PropertyEditorSupport {
- private static final Logger LOG = LoggerFactory.getLogger(MeasureListEditor.class);
-
@Override
public void setAsText(final String text) throws IllegalArgumentException {
-
- LOG.info("XXX " + getSource());
-
setValue(MeasureList.parse(text));
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/SegmentMeasureListEditor.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/SegmentMeasureListEditor.java
index 8cdef03..e9d359d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/SegmentMeasureListEditor.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/SegmentMeasureListEditor.java
@@ -20,8 +20,6 @@
package org.apache.myfaces.tobago.layout;
import org.apache.myfaces.tobago.apt.annotation.Preliminary;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.beans.PropertyEditorSupport;
@@ -31,13 +29,8 @@ import java.beans.PropertyEditorSupport;
@Preliminary
public class SegmentMeasureListEditor extends PropertyEditorSupport {
- private static final Logger LOG = LoggerFactory.getLogger(SegmentMeasureListEditor.class);
-
@Override
public void setAsText(final String text) throws IllegalArgumentException {
-
- LOG.info("XXX " + getSource());
-
setValue(SegmentMeasureList.parse(text));
}
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.
[myfaces-tobago] 05/05: Demo: fix embedded maps * replacing Google
Maps with openstreetmap OSM,
because its free to use and no API Key is needed for tracking/analysis.
Posted by lo...@apache.org.
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
commit 87368de59fa9bb0e9389f7ddb588544e1bd91710
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Thu Nov 2 16:05:00 2017 +0100
Demo: fix embedded maps
* replacing Google Maps with openstreetmap OSM, because its free to use and no API Key is needed for tracking/analysis.
---
.../src/main/webapp/WEB-INF/tobago-config.xml | 2 +-
.../content/20-component/020-output/60-object/object.js | 14 ++++++++++----
.../content/20-component/020-output/60-object/object.xhtml | 12 +++++++-----
.../webapp/content/20-component/020-output/output.xhtml | 7 ++++---
4 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tobago-config.xml b/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tobago-config.xml
index e2f8dc4..fedf697 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tobago-config.xml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tobago-config.xml
@@ -50,7 +50,7 @@
XXX because of JSF-AJAX we need 'unsafe-eval' -->
<!--<directive name="script-src">'self' 'unsafe-eval'</directive>-->
<!-- needed for <tc:object> -->
- <directive name="child-src">https://maps.google.com</directive>
+ <directive name="child-src">https://www.openstreetmap.org</directive>
<directive name="child-src">https://*.apache.org</directive>
<!-- needed for the test suite -->
<directive name="child-src">'self'</directive>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/60-object/object.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/60-object/object.js
index cede006..57ae9f7 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/60-object/object.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/60-object/object.js
@@ -21,8 +21,11 @@
$.widget("demo.maps", {
options: {
- position: "11.249123,-60.687103", // tobago
- zoom: 2 // global
+ position: { // tobago
+ x: -60.687103,
+ y: 11.249123
+ },
+ zoom: 0.2
},
_create: function () {
@@ -37,8 +40,11 @@
zoom = this.options.zoom;
}
var target = this.element.data("maps-target");
- var url = 'https://maps.google.com/maps?'
- + 'ie=UTF8&ll=' + position + '&t=h&z=' + zoom + '&output=embed&f=q&cd=1';
+ var url = 'https://www.openstreetmap.org/export/embed.html?bbox='
+ + (position.x - zoom) + ','
+ + (position.y - zoom) + ','
+ + (position.x + zoom) + ','
+ + (position.y + zoom);
jQuery(Tobago.Utils.escapeClientId(target)).attr('src', url);
}
});
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/60-object/object.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/60-object/object.xhtml
index 565e77d..8e48135 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/60-object/object.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/60-object/object.xhtml
@@ -31,15 +31,15 @@
<tc:link label="Tag Library Documentation" image="#{request.contextPath}/image/feather-leaf.png"
link="#{demoBundle.tagDocUrl}/#{info.stableVersion}/tld/tc/object.html"/>
<tc:section label="Basics">
- <pre><code class="language-markup"><tc:object src="https://www.google.com/maps/..."/></code></pre>
+ <pre><code class="language-markup"><tc:object src="https://www.openstreetmap.org/..."/></code></pre>
<tc:object id="o1"
- src="https://www.google.com/maps/embed?pb=!1m10!1m8!1m3!1d137123.69440217633!2d-60.687103!3d11.249123!3m2!1i1024!2i768!4f13.1!5e1!3m2!1sde!2sus!4v1458208065829"/>
+ src="https://www.openstreetmap.org/export/embed.html?bbox=-60.75,11.15,-60.6,11.35"/>
</tc:section>
<tc:section label="Style">
<p>A <code class="language-markup"><tc:object/></code> tag can contain a style tag.
In this case it's <code class="language-markup"><tc:style width="100%"/></code>.</p>
<tc:object id="o2"
- src="https://www.google.com/maps/embed?pb=!1m13!1m11!1m3!1d99967845.2048925!2d-60.68710300000001!3d11.249123!2m2!1f0!2f0!3m2!1i1024!2i768!4f13.1!5e1!3m2!1sde!2sus!4v1458208366973">
+ src="https://www.openstreetmap.org/export/embed.html?bbox=-60.75,11.15,-60.6,11.35">
<tc:style width="100%"/>
</tc:object>
</tc:section>
@@ -70,11 +70,13 @@
</tc:box>
<tc:buttons id="t1">
<tc:button id="c1" label="Show Tobago" omit="true">
- <tc:dataAttribute name="maps-position" value="11.249123,-60.687103"/>
- <tc:dataAttribute name="maps-zoom" value="12"/>
+ <tc:dataAttribute name="maps-position" value='{"x":-60.687103,"y":11.249123}'/>
+ <tc:dataAttribute name="maps-zoom" value="0.1"/>
<tc:dataAttribute name="maps-target" value="page:mainForm:map"/>
</tc:button>
<tc:button id="c2" label="Show World" omit="true">
+ <tc:dataAttribute name="maps-position" value='{"x":0.0,"y":0.0}'/>
+ <tc:dataAttribute name="maps-zoom" value="70"/>
<tc:dataAttribute name="maps-target" value="page:mainForm:map"/>
</tc:button>
</tc:buttons>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/output.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/output.xhtml
index 50820fe..8fcdb3f 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/output.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/output.xhtml
@@ -54,8 +54,9 @@
</tc:section>
<tc:section label="#{demoBundle.object}">
- <pre><code class="language-markup"><tc:object src="https://www.google.com/maps/..."/></code></pre>
- <tc:object
- src="https://www.google.com/maps/embed?pb=!1m10!1m8!1m3!1d137123.69440217633!2d-60.687103!3d11.249123!3m2!1i1024!2i768!4f13.1!5e1!3m2!1sde!2sus!4v1458208065829"/>
+ <pre><code class="language-markup"><tc:object src="https://www.openstreetmap.org/..."/></code></pre>
+ <tc:object src="https://www.openstreetmap.org/export/embed.html?bbox=-60.75,11.15,-60.6,11.35">
+ <tc:style width="100%" height="50vmin"/>
+ </tc:object>
</tc:section>
</ui:composition>
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.
[myfaces-tobago] 01/05: TOBAGO-1819: A dark theme for ambiant light
situations: roxborough
Posted by lo...@apache.org.
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
commit 0724588e244a1792076257604ddbb960ca6bc795
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Wed Nov 1 19:25:51 2017 +0100
TOBAGO-1819: A dark theme for ambiant light situations: roxborough
---
tobago-assembly/pom.xml | 4 ++--
tobago-example/pom.xml | 9 +--------
.../src/main/webapp/WEB-INF/tobago-config.xml | 2 +-
.../html/richmond/standard/property/demo.properties.xml | 2 +-
tobago-theme/pom.xml | 2 +-
tobago-theme/rebuild-theme.sh | 2 +-
.../pom.xml | 10 +++++-----
.../src/main/appended-resources/META-INF/NOTICE | 0
.../main/patches/append-tobago-theme-to-bootstrap.patch | 0
.../tobago-bootstrap/_version/css/bootstrap.css | 0
.../tobago-bootstrap/_version/css/bootstrap.css.map | 0
.../tobago-bootstrap/_version/css/bootstrap.min.css | 0
.../tobago-bootstrap/_version/css/bootstrap.min.css.map | 0
.../roxborough}/tobago-bootstrap/_version/js/bootstrap.js | 0
.../tobago-bootstrap/_version/js/bootstrap.min.js | 0
.../src/main/resources/META-INF/tobago-config.xml | 14 +++++++-------
.../src/main/scss/_custom.scss | 0
.../src/main/scss/_tobago-theme.scss | 0
18 files changed, 19 insertions(+), 26 deletions(-)
diff --git a/tobago-assembly/pom.xml b/tobago-assembly/pom.xml
index 4365fc7..6419371 100644
--- a/tobago-assembly/pom.xml
+++ b/tobago-assembly/pom.xml
@@ -206,13 +206,13 @@ XXX TOBAGO-1654
<version>${project.version}</version>
<classifier>sources</classifier>
</artifactItem>
+-->
<artifactItem>
<groupId>${project.groupId}</groupId>
- <artifactId>tobago-theme-richmond</artifactId>
+ <artifactId>tobago-theme-roxborough</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</artifactItem>
--->
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>tobago-theme-speyside</artifactId>
diff --git a/tobago-example/pom.xml b/tobago-example/pom.xml
index 43e68cb..7933a31 100644
--- a/tobago-example/pom.xml
+++ b/tobago-example/pom.xml
@@ -131,13 +131,11 @@
<version>${project.version}</version>
</dependency>
-->
-<!--
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>tobago-theme-richmond</artifactId>
+ <artifactId>tobago-theme-roxborough</artifactId>
<version>${project.version}</version>
</dependency>
--->
<!--
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
@@ -187,11 +185,6 @@
<artifactId>tobago-theme-scarborough</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>tobago-theme-richmond</artifactId>
- <version>${project.version}</version>
- </dependency>
</dependencies>
</profile>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tobago-config.xml b/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tobago-config.xml
index 2c92235..e2f8dc4 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tobago-config.xml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tobago-config.xml
@@ -37,7 +37,7 @@
<supported-theme>speyside</supported-theme>
<!-- TODO: Can be removed after closing TOBAGO-1664 -->
<!--<supported-theme>scarborough</supported-theme>-->
- <!--<supported-theme>richmond</supported-theme>-->
+ <supported-theme>roxborough</supported-theme>
<!--<supported-theme>charlotteville</supported-theme>-->
</theme-config>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/richmond/standard/property/demo.properties.xml b/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/richmond/standard/property/demo.properties.xml
index 1b325bf..a5d9191 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/richmond/standard/property/demo.properties.xml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/richmond/standard/property/demo.properties.xml
@@ -19,5 +19,5 @@
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
<properties>
- <entry key="theme_photo">Flowers near Richmond</entry>
+ <entry key="theme_photo">Flowers near Roxborough</entry>
</properties>
diff --git a/tobago-theme/pom.xml b/tobago-theme/pom.xml
index 93acc7f..71f8700 100644
--- a/tobago-theme/pom.xml
+++ b/tobago-theme/pom.xml
@@ -68,6 +68,7 @@
<modules>
<module>tobago-theme-standard</module>
<module>tobago-theme-speyside</module>
+ <module>tobago-theme-roxborough</module>
</modules>
<dependencies>
@@ -84,7 +85,6 @@
<id>all-modules</id>
<modules>
<module>tobago-theme-scarborough</module>
- <module>tobago-theme-richmond</module>
<module>tobago-theme-charlotteville</module>
</modules>
</profile>
diff --git a/tobago-theme/rebuild-theme.sh b/tobago-theme/rebuild-theme.sh
index 7c4275d..8e64dcd 100755
--- a/tobago-theme/rebuild-theme.sh
+++ b/tobago-theme/rebuild-theme.sh
@@ -51,7 +51,7 @@ function rebuild_theme() {
mvn -Pall-modules clean
rebuild_theme charlotteville
-rebuild_theme richmond
+rebuild_theme roxborough
rebuild_theme scarborough
rebuild_theme speyside
rebuild_theme standard
diff --git a/tobago-theme/tobago-theme-richmond/pom.xml b/tobago-theme/tobago-theme-roxborough/pom.xml
similarity index 90%
rename from tobago-theme/tobago-theme-richmond/pom.xml
rename to tobago-theme/tobago-theme-roxborough/pom.xml
index 2ac254d..4ccbece 100644
--- a/tobago-theme/tobago-theme-richmond/pom.xml
+++ b/tobago-theme/tobago-theme-roxborough/pom.xml
@@ -23,12 +23,12 @@
<artifactId>tobago-theme</artifactId>
<version>4.0.0-SNAPSHOT</version>
</parent>
- <artifactId>tobago-theme-richmond</artifactId>
+ <artifactId>tobago-theme-roxborough</artifactId>
<packaging>jar</packaging>
- <name>Tobago Theme Richmond</name>
+ <name>Tobago Theme Roxborough</name>
<properties>
- <theme.name>richmond</theme.name>
+ <theme.name>roxborough</theme.name>
</properties>
<build>
@@ -44,8 +44,8 @@
<phase>compile</phase>
<configuration>
<target>
- <move file="${project.build.outputDirectory}/META-INF/resources/tobago/richmond/tobago-bootstrap/_version"
- tofile="${project.build.outputDirectory}/META-INF/resources/tobago/richmond/tobago-bootstrap/${project.version}">
+ <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>
diff --git a/tobago-theme/tobago-theme-richmond/src/main/appended-resources/META-INF/NOTICE b/tobago-theme/tobago-theme-roxborough/src/main/appended-resources/META-INF/NOTICE
similarity index 100%
rename from tobago-theme/tobago-theme-richmond/src/main/appended-resources/META-INF/NOTICE
rename to tobago-theme/tobago-theme-roxborough/src/main/appended-resources/META-INF/NOTICE
diff --git a/tobago-theme/tobago-theme-richmond/src/main/patches/append-tobago-theme-to-bootstrap.patch b/tobago-theme/tobago-theme-roxborough/src/main/patches/append-tobago-theme-to-bootstrap.patch
similarity index 100%
rename from tobago-theme/tobago-theme-richmond/src/main/patches/append-tobago-theme-to-bootstrap.patch
rename to tobago-theme/tobago-theme-roxborough/src/main/patches/append-tobago-theme-to-bootstrap.patch
diff --git a/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/resources/tobago/richmond/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
similarity index 100%
rename from tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/resources/tobago/richmond/tobago-bootstrap/_version/css/bootstrap.css
rename to tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/css/bootstrap.css
diff --git a/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/resources/tobago/richmond/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
similarity index 100%
rename from tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/resources/tobago/richmond/tobago-bootstrap/_version/css/bootstrap.css.map
rename to tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/css/bootstrap.css.map
diff --git a/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/resources/tobago/richmond/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
similarity index 100%
rename from tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/resources/tobago/richmond/tobago-bootstrap/_version/css/bootstrap.min.css
rename to tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/css/bootstrap.min.css
diff --git a/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/resources/tobago/richmond/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
similarity index 100%
rename from tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/resources/tobago/richmond/tobago-bootstrap/_version/css/bootstrap.min.css.map
rename to tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/css/bootstrap.min.css.map
diff --git a/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/resources/tobago/richmond/tobago-bootstrap/_version/js/bootstrap.js b/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/js/bootstrap.js
similarity index 100%
rename from tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/resources/tobago/richmond/tobago-bootstrap/_version/js/bootstrap.js
rename to tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/js/bootstrap.js
diff --git a/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/resources/tobago/richmond/tobago-bootstrap/_version/js/bootstrap.min.js b/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/js/bootstrap.min.js
similarity index 100%
rename from tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/resources/tobago/richmond/tobago-bootstrap/_version/js/bootstrap.min.js
rename to tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/js/bootstrap.min.js
diff --git a/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/tobago-config.xml b/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/tobago-config.xml
similarity index 79%
rename from tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/tobago-config.xml
rename to tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/tobago-config.xml
index 5c97bb6..10f3eb5 100644
--- a/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/tobago-config.xml
+++ b/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/tobago-config.xml
@@ -22,7 +22,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://myfaces.apache.org/tobago/tobago-config http://myfaces.apache.org/tobago/tobago-config-4.0.xsd"
version="4.0">
- <name>tobago-theme-richmond</name>
+ <name>tobago-theme-roxborough</name>
<ordering>
<after>
<name>tobago-theme-standard</name>
@@ -30,8 +30,8 @@
</ordering>
<theme-definitions>
<theme-definition>
- <name>richmond</name>
- <display-name>Richmond</display-name>
+ <name>roxborough</name>
+ <display-name>Roxborough</display-name>
<fallback>standard</fallback>
<versioned>true</versioned>
<resources production="true">
@@ -39,16 +39,16 @@
<script name="/tobago/standard/tobago-bootstrap/${project.version}/js/bootstrap.min.js"/>
<style name="/tobago/standard/tobago-bootstrap/${project.version}/css/bootstrap.min.css"/>
</excludes>
- <script name="/tobago/richmond/tobago-bootstrap/${project.version}/js/bootstrap.min.js"/>
- <style name="/tobago/richmond/tobago-bootstrap/${project.version}/css/bootstrap.min.css"/>
+ <script name="/tobago/roxborough/tobago-bootstrap/${project.version}/js/bootstrap.min.js"/>
+ <style name="/tobago/roxborough/tobago-bootstrap/${project.version}/css/bootstrap.min.css"/>
</resources>
<resources production="false">
<excludes>
<script name="/tobago/standard/tobago-bootstrap/${project.version}/js/bootstrap.js"/>
<style name="/tobago/standard/tobago-bootstrap/${project.version}/css/bootstrap.css"/>
</excludes>
- <script name="/tobago/richmond/tobago-bootstrap/${project.version}/js/bootstrap.js"/>
- <style name="/tobago/richmond/tobago-bootstrap/${project.version}/css/bootstrap.css"/>
+ <script name="/tobago/roxborough/tobago-bootstrap/${project.version}/js/bootstrap.js"/>
+ <style name="/tobago/roxborough/tobago-bootstrap/${project.version}/css/bootstrap.css"/>
</resources>
</theme-definition>
</theme-definitions>
diff --git a/tobago-theme/tobago-theme-richmond/src/main/scss/_custom.scss b/tobago-theme/tobago-theme-roxborough/src/main/scss/_custom.scss
similarity index 100%
rename from tobago-theme/tobago-theme-richmond/src/main/scss/_custom.scss
rename to tobago-theme/tobago-theme-roxborough/src/main/scss/_custom.scss
diff --git a/tobago-theme/tobago-theme-richmond/src/main/scss/_tobago-theme.scss b/tobago-theme/tobago-theme-roxborough/src/main/scss/_tobago-theme.scss
similarity index 100%
rename from tobago-theme/tobago-theme-richmond/src/main/scss/_tobago-theme.scss
rename to tobago-theme/tobago-theme-roxborough/src/main/scss/_tobago-theme.scss
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.
[myfaces-tobago] 04/05: TOBAGO-1819: A dark theme for ambiant light
situations: roxborough * adding mime type for fonts: opentype
Posted by lo...@apache.org.
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
commit 38268208289d2884f8ab639b9c72d19b7e020657
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Thu Nov 2 14:14:50 2017 +0100
TOBAGO-1819: A dark theme for ambiant light situations: roxborough
* adding mime type for fonts: opentype
---
.../tobago/internal/util/MimeTypeUtils.java | 3 +
.../rebuild-theme.log | 258 +++---
.../src/main/appended-resources/META-INF/LICENSE | 48 ++
.../src/main/appended-resources/META-INF/NOTICE | 2 +
.../tobago-bootstrap/_version/css/bootstrap.css | 917 ++++++++++++++++-----
.../_version/css/bootstrap.css.map | 2 +-
.../_version/css/bootstrap.min.css | 2 +-
.../_version/css/bootstrap.min.css.map | 2 +-
.../_version/fonts/Amaranth-Bold.otf | Bin 0 -> 48760 bytes
.../_version/fonts/Amaranth-BoldItalic.otf | Bin 0 -> 56700 bytes
.../_version/fonts/Amaranth-Italic.otf | Bin 0 -> 56056 bytes
.../_version/fonts/Amaranth-Regular.otf | Bin 0 -> 48732 bytes
.../src/main/scss/_custom.scss | 79 +-
13 files changed, 943 insertions(+), 370 deletions(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/MimeTypeUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/MimeTypeUtils.java
index 81423b5..3825604 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/MimeTypeUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/MimeTypeUtils.java
@@ -68,6 +68,9 @@ public final class MimeTypeUtils {
if (file.endsWith("eot")) {
return "application/vnd.ms-fontobject";
}
+ if (file.endsWith("otf")) {
+ return "application/x-font-opentype";
+ }
}
} else if (file.charAt(length - 3) == '.') {
if (file.endsWith("js")) {
diff --git a/tobago-theme/tobago-theme-richmond/rebuild-theme.log b/tobago-theme/tobago-theme-roxborough/rebuild-theme.log
similarity index 87%
rename from tobago-theme/tobago-theme-richmond/rebuild-theme.log
rename to tobago-theme/tobago-theme-roxborough/rebuild-theme.log
index 14e5e68..9f136fc 100644
--- a/tobago-theme/tobago-theme-richmond/rebuild-theme.log
+++ b/tobago-theme/tobago-theme-roxborough/rebuild-theme.log
@@ -1,88 +1,91 @@
-Build date: 2017-10-25 14:52:52
+Build date: 2017-11-02 13:45:14
[INFO] Scanning for projects...
[INFO]
[INFO] ------------------------------------------------------------------------
-[INFO] Building Tobago Theme Richmond 4.0.0-SNAPSHOT
+[INFO] Building Tobago Theme Roxborough 4.0.0-SNAPSHOT
[INFO] ------------------------------------------------------------------------
[INFO]
-[INFO] --- maven-enforcer-plugin:3.0.0-M1:enforce (enforce) @ tobago-theme-richmond ---
+[INFO] --- maven-enforcer-plugin:3.0.0-M1:enforce (enforce) @ tobago-theme-roxborough ---
[INFO]
-[INFO] --- maven-remote-resources-plugin:1.5:process (default) @ tobago-theme-richmond ---
+[INFO] --- maven-remote-resources-plugin:1.5:process (default) @ tobago-theme-roxborough ---
[INFO]
-[INFO] --- maven-scm-plugin:1.9.5:checkout (step #1: checkout-bootstrap) @ tobago-theme-richmond ---
-[INFO] Removing __CURRENT__/tobago-theme-richmond/target/checkout
-[INFO] Executing: /bin/sh -c cd __CURRENT__/tobago-theme-richmond/target && git clone --branch v4.0.0-beta.2 https://github.com/twbs/bootstrap __CURRENT__/tobago-theme-richmond/target/checkout
-[INFO] Working directory: __CURRENT__/tobago-theme-richmond/target
+[INFO] --- maven-scm-plugin:1.9.5:checkout (step #1: checkout-bootstrap) @ tobago-theme-roxborough ---
+[INFO] Removing __CURRENT__/tobago-theme-roxborough/target/checkout
+[INFO] Executing: /bin/sh -c cd __CURRENT__/tobago-theme-roxborough/target && git clone --branch v4.0.0-beta.2 https://github.com/twbs/bootstrap __CURRENT__/tobago-theme-roxborough/target/checkout
+[INFO] Working directory: __CURRENT__/tobago-theme-roxborough/target
[INFO] Executing: /bin/sh -c cd /var/folders/w0/pg4pxr7972l6bq85x08s5cl00000gn/T/ && git ls-remote https://github.com/twbs/bootstrap
[INFO] Working directory: /var/folders/w0/pg4pxr7972l6bq85x08s5cl00000gn/T
-[INFO] Executing: /bin/sh -c cd __CURRENT__/tobago-theme-richmond/target/checkout && git pull https://github.com/twbs/bootstrap v4.0.0-beta.2:v4.0.0-beta.2
-[INFO] Working directory: __CURRENT__/tobago-theme-richmond/target/checkout
-[INFO] Executing: /bin/sh -c cd __CURRENT__/tobago-theme-richmond/target/checkout && git checkout v4.0.0-beta.2
-[INFO] Working directory: __CURRENT__/tobago-theme-richmond/target/checkout
-[INFO] Executing: /bin/sh -c cd __CURRENT__/tobago-theme-richmond/target/checkout && git ls-files
-[INFO] Working directory: __CURRENT__/tobago-theme-richmond/target/checkout
-[INFO]
-[INFO] --- maven-resources-plugin:2.7:copy-resources (step #2: copy-bootstrap) @ tobago-theme-richmond ---
+[INFO] Executing: /bin/sh -c cd __CURRENT__/tobago-theme-roxborough/target/checkout && git pull https://github.com/twbs/bootstrap v4.0.0-beta.2:v4.0.0-beta.2
+[INFO] Working directory: __CURRENT__/tobago-theme-roxborough/target/checkout
+[INFO] Executing: /bin/sh -c cd __CURRENT__/tobago-theme-roxborough/target/checkout && git checkout v4.0.0-beta.2
+[INFO] Working directory: __CURRENT__/tobago-theme-roxborough/target/checkout
+[INFO] Executing: /bin/sh -c cd __CURRENT__/tobago-theme-roxborough/target/checkout && git ls-files
+[INFO] Working directory: __CURRENT__/tobago-theme-roxborough/target/checkout
+[INFO]
+[INFO] --- maven-resources-plugin:2.7:copy-resources (step #2: copy-bootstrap) @ tobago-theme-roxborough ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 425 resources
[INFO]
-[INFO] --- maven-resources-plugin:2.7:copy-resources (step #3: copy-custom) @ tobago-theme-richmond ---
+[INFO] --- maven-resources-plugin:2.7:copy-resources (step #3: copy-custom) @ tobago-theme-roxborough ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 2 resources
[INFO]
-[INFO] --- maven-patch-plugin:1.2:apply (step #4: append-tobago-theme-to-bootstrap) @ tobago-theme-richmond ---
+[INFO] --- maven-patch-plugin:1.2:apply (step #4: append-tobago-theme-to-bootstrap) @ tobago-theme-roxborough ---
[INFO] Applying patch: append-tobago-theme-to-bootstrap.patch
[INFO]
-[INFO] --- maven-dependency-plugin:3.0.2:unpack (step #5: unpack-custom) @ tobago-theme-richmond ---
+[INFO] --- maven-dependency-plugin:3.0.2:unpack (step #5: unpack-custom) @ tobago-theme-roxborough ---
[INFO] Configured Artifact: org.apache.myfaces.tobago:tobago-core:4.0.0-SNAPSHOT:jar
-[INFO] Unpacking __REPO__/org/apache/myfaces/tobago/tobago-core/4.0.0-SNAPSHOT/tobago-core-4.0.0-SNAPSHOT.jar to __CURRENT__/tobago-theme-richmond/target/bootstrap with includes "**/*.scss" and excludes ""
+[INFO] Unpacking __REPO__/org/apache/myfaces/tobago/tobago-core/4.0.0-SNAPSHOT/tobago-core-4.0.0-SNAPSHOT.jar to __CURRENT__/tobago-theme-roxborough/target/bootstrap with includes "**/*.scss" and excludes ""
[INFO]
-[INFO] --- frontend-maven-plugin:1.4:install-node-and-npm (step #6: install node and npm) @ tobago-theme-richmond ---
+[INFO] --- frontend-maven-plugin:1.4:install-node-and-npm (step #6: install node and npm) @ tobago-theme-roxborough ---
[INFO] Installing node version v7.10.1
-[INFO] Unpacking __REPO__/com/github/eirslett/node/7.10.1/node-7.10.1-darwin-x64.tar.gz into __CURRENT__/tobago-theme-richmond/target/frontend/node/tmp
-[INFO] Copying node binary from __CURRENT__/tobago-theme-richmond/target/frontend/node/tmp/node-v7.10.1-darwin-x64/bin/node to __CURRENT__/tobago-theme-richmond/target/frontend/node/node
+[INFO] Unpacking __REPO__/com/github/eirslett/node/7.10.1/node-7.10.1-darwin-x64.tar.gz into __CURRENT__/tobago-theme-roxborough/target/frontend/node/tmp
+[INFO] Copying node binary from __CURRENT__/tobago-theme-roxborough/target/frontend/node/tmp/node-v7.10.1-darwin-x64/bin/node to __CURRENT__/tobago-theme-roxborough/target/frontend/node/node
[INFO] Installed node locally.
[INFO] Installing npm version 4.2.0
-[INFO] Unpacking __REPO__/com/github/eirslett/npm/4.2.0/npm-4.2.0.tar.gz into __CURRENT__/tobago-theme-richmond/target/frontend/node/node_modules
+[INFO] Unpacking __REPO__/com/github/eirslett/npm/4.2.0/npm-4.2.0.tar.gz into __CURRENT__/tobago-theme-roxborough/target/frontend/node/node_modules
[INFO] Installed npm locally.
[INFO]
-[INFO] --- frontend-maven-plugin:1.4:npm (step #7: npm install) @ tobago-theme-richmond ---
-[INFO] Running 'npm install' in __CURRENT__/tobago-theme-richmond/target/bootstrap
+[INFO] --- frontend-maven-plugin:1.4:npm (step #7: npm install) @ tobago-theme-roxborough ---
+[INFO] Running 'npm install' in __CURRENT__/tobago-theme-roxborough/target/bootstrap
[WARNING] npm WARN prefer global node-gyp@3.6.2 should be installed with -g
[INFO]
-[INFO] > fsevents@1.1.2 install __CURRENT__/tobago-theme-richmond/target/bootstrap/node_modules/fsevents
+[INFO] > fsevents@1.1.2 install __CURRENT__/tobago-theme-roxborough/target/bootstrap/node_modules/fsevents
[INFO] > node install
[INFO]
-[INFO] [fsevents] Success: "__CURRENT__/tobago-theme-richmond/target/bootstrap/node_modules/fsevents/lib/binding/Release/node-v51-darwin-x64/fse.node" is installed via remote
+[INFO] [fsevents] Success: "__CURRENT__/tobago-theme-roxborough/target/bootstrap/node_modules/fsevents/lib/binding/Release/node-v51-darwin-x64/fse.node" is installed via remote
[INFO]
-[INFO] > node-sass@4.5.3 install __CURRENT__/tobago-theme-richmond/target/bootstrap/node_modules/node-sass
+[INFO] > node-sass@4.5.3 install __CURRENT__/tobago-theme-roxborough/target/bootstrap/node_modules/node-sass
[INFO] > node scripts/install.js
[INFO]
[INFO] Cached binary found at __HOME__/.npm/node-sass/4.5.3/darwin-x64-51_binding.node
[INFO]
-[INFO] > phantomjs-prebuilt@2.1.15 install __CURRENT__/tobago-theme-richmond/target/bootstrap/node_modules/phantomjs-prebuilt
+[INFO] > phantomjs-prebuilt@2.1.15 install __CURRENT__/tobago-theme-roxborough/target/bootstrap/node_modules/phantomjs-prebuilt
[INFO] > node install.js
[INFO]
[INFO] PhantomJS not found on PATH
-[INFO] Download already available at /var/folders/w0/pg4pxr7972l6bq85x08s5cl00000gn/T/phantomjs/phantomjs-2.1.1-macosx.zip
-[INFO] Verified checksum of previously downloaded file
+[INFO] Downloading https://github.com/Medium/phantomjs/releases/download/v2.1.1/phantomjs-2.1.1-macosx.zip
+[INFO] Saving to /var/folders/w0/pg4pxr7972l6bq85x08s5cl00000gn/T/phantomjs/phantomjs-2.1.1-macosx.zip
+[INFO] Receiving...
+[INFO]
+[INFO] Received 16746K total.
[INFO] Extracting zip contents
-[INFO] Removing __CURRENT__/tobago-theme-richmond/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom
-[INFO] Copying extracted folder /var/folders/w0/pg4pxr7972l6bq85x08s5cl00000gn/T/phantomjs/phantomjs-2.1.1-macosx.zip-extract-1508936116676/phantomjs-2.1.1-macosx -> __CURRENT__/tobago-theme-richmond/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom
+[INFO] Removing __CURRENT__/tobago-theme-roxborough/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom
+[INFO] Copying extracted folder /var/folders/w0/pg4pxr7972l6bq85x08s5cl00000gn/T/phantomjs/phantomjs-2.1.1-macosx.zip-extract-1509626869573/phantomjs-2.1.1-macosx -> __CURRENT__/tobago-theme-roxborough/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom
[INFO] Writing location.js file
-[INFO] Done. Phantomjs binary available at __CURRENT__/tobago-theme-richmond/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs
+[INFO] Done. Phantomjs binary available at __CURRENT__/tobago-theme-roxborough/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs
[INFO]
-[INFO] > node-sass@4.5.3 postinstall __CURRENT__/tobago-theme-richmond/target/bootstrap/node_modules/node-sass
+[INFO] > node-sass@4.5.3 postinstall __CURRENT__/tobago-theme-roxborough/target/bootstrap/node_modules/node-sass
[INFO] > node scripts/build.js
[INFO]
-[INFO] Binary found at __CURRENT__/tobago-theme-richmond/target/bootstrap/node_modules/node-sass/vendor/darwin-x64-51/binding.node
+[INFO] Binary found at __CURRENT__/tobago-theme-roxborough/target/bootstrap/node_modules/node-sass/vendor/darwin-x64-51/binding.node
[INFO] Testing binary
[INFO] Binary is fine
-[INFO] bootstrap@4.0.0-beta.2 __CURRENT__/tobago-theme-richmond/target/bootstrap
+[INFO] bootstrap@4.0.0-beta.2 __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO] ├─┬ autoprefixer@7.1.6
-[INFO] │ ├─┬ browserslist@2.5.1
+[INFO] │ ├─┬ browserslist@2.6.1
[INFO] │ │ └── electron-to-chromium@1.3.27
-[INFO] │ ├── caniuse-lite@1.0.30000750
+[INFO] │ ├── caniuse-lite@1.0.30000757
[INFO] │ ├── normalize-range@0.1.2
[INFO] │ ├── num2fraction@1.2.2
[INFO] │ ├─┬ postcss@6.0.13
@@ -123,7 +126,6 @@ Build date: 2017-10-25 14:52:52
[INFO] │ │ ├─┬ fsevents@1.1.2
[INFO] │ │ │ └─┬ node-pre-gyp@0.6.36
[INFO] │ │ │ ├─┬ mkdirp@0.5.1
-[WARNING] npm WARN bootstrap@4.0.0-beta.2 requires a peer of jquery@1.9.1 - 3 but none was installed.
[INFO] │ │ │ │ └── minimist@0.0.8
[INFO] │ │ │ ├─┬ nopt@4.0.1
[INFO] │ │ │ │ ├── abbrev@1.1.0
@@ -135,6 +137,7 @@ Build date: 2017-10-25 14:52:52
[INFO] │ │ │ │ │ └── delegates@1.0.0
[INFO] │ │ │ │ ├── console-control-strings@1.1.0
[INFO] │ │ │ │ ├─┬ gauge@2.7.4
+[WARNING] npm WARN bootstrap@4.0.0-beta.2 requires a peer of jquery@1.9.1 - 3 but none was installed.
[INFO] │ │ │ │ │ ├── aproba@1.1.1
[INFO] │ │ │ │ │ ├── has-unicode@2.0.1
[INFO] │ │ │ │ │ ├── object-assign@4.1.1
@@ -265,7 +268,7 @@ Build date: 2017-10-25 14:52:52
[INFO] │ │ │ ├── babel-helper-get-function-arity@7.0.0-beta.0
[INFO] │ │ │ └── babel-template@7.0.0-beta.0
[INFO] │ │ ├── babel-messages@7.0.0-beta.0
-[INFO] │ │ └── globals@10.1.0
+[INFO] │ │ └── globals@10.2.0
[INFO] │ ├─┬ babel-types@7.0.0-beta.0
[INFO] │ │ └── to-fast-properties@2.0.0
[INFO] │ └── babylon@7.0.0-beta.22
@@ -350,7 +353,7 @@ Build date: 2017-10-25 14:52:52
[INFO] │ ├─┬ axios@0.16.2
[INFO] │ │ ├─┬ follow-redirects@1.2.5
[INFO] │ │ │ └── debug@2.6.9
-[INFO] │ │ └── is-buffer@1.1.5
+[INFO] │ │ └── is-buffer@1.1.6
[INFO] │ ├── bytes@3.0.0
[INFO] │ ├── ci-env@1.4.0
[INFO] │ ├─┬ github-build@1.2.0
@@ -380,7 +383,7 @@ Build date: 2017-10-25 14:52:52
[INFO] ├─┬ clean-css-cli@4.1.10
[INFO] │ └─┬ clean-css@4.1.9
[INFO] │ └── source-map@0.5.7
-[INFO] ├─┬ cross-env@5.1.0
+[INFO] ├─┬ cross-env@5.1.1
[INFO] │ ├─┬ cross-spawn@5.1.0
[INFO] │ │ ├─┬ lru-cache@4.1.1
[INFO] │ │ │ ├── pseudomap@1.0.2
@@ -389,7 +392,7 @@ Build date: 2017-10-25 14:52:52
[INFO] │ │ │ └── shebang-regex@1.0.0
[INFO] │ │ └── which@1.3.0
[INFO] │ └── is-windows@1.0.1
-[INFO] ├─┬ eslint@4.9.0
+[INFO] ├─┬ eslint@4.10.0
[INFO] │ ├─┬ ajv@5.3.0
[INFO] │ │ ├── co@4.6.0
[INFO] │ │ ├── fast-deep-equal@1.0.0
@@ -416,7 +419,7 @@ Build date: 2017-10-25 14:52:52
[INFO] │ ├─┬ eslint-scope@3.7.1
[INFO] │ │ └── esrecurse@4.2.0
[INFO] │ ├─┬ espree@3.5.1
-[INFO] │ │ ├── acorn@5.1.2
+[INFO] │ │ ├── acorn@5.2.1
[INFO] │ │ └─┬ acorn-jsx@3.0.1
[INFO] │ │ └── acorn@3.3.0
[INFO] │ ├── esquery@1.0.0
@@ -436,7 +439,7 @@ Build date: 2017-10-25 14:52:52
[INFO] │ │ └── object-assign@4.1.1
[INFO] │ ├── functional-red-black-tree@1.0.1
[INFO] │ ├── globals@9.18.0
-[INFO] │ ├── ignore@3.3.6
+[INFO] │ ├── ignore@3.3.7
[INFO] │ ├── imurmurhash@0.1.4
[INFO] │ ├─┬ inquirer@3.0.6
[INFO] │ │ ├── ansi-escapes@1.4.0
@@ -449,7 +452,7 @@ Build date: 2017-10-25 14:52:52
[INFO] │ │ ├── cli-width@2.2.0
[INFO] │ │ ├─┬ external-editor@2.0.5
[INFO] │ │ │ ├── iconv-lite@0.4.19
-[INFO] │ │ │ ├── jschardet@1.5.1
+[INFO] │ │ │ ├── jschardet@1.6.0
[INFO] │ │ │ └── tmp@0.0.33
[INFO] │ │ ├── figures@2.0.0
[INFO] │ │ ├── mute-stream@0.0.7
@@ -491,12 +494,12 @@ Build date: 2017-10-25 14:52:52
[INFO] │ │ └── ansi-regex@3.0.0
[INFO] │ ├── strip-json-comments@2.0.1
[INFO] │ ├─┬ table@4.0.2
-[INFO] │ │ ├── ajv-keywords@2.1.0
+[INFO] │ │ ├── ajv-keywords@2.1.1
[INFO] │ │ └── slice-ansi@1.0.0
[INFO] │ └── text-table@0.2.0
[INFO] ├─┬ eslint-plugin-compat@2.0.1
[INFO] │ ├── babel-runtime@6.26.0
-[INFO] │ ├── caniuse-db@1.0.30000750
+[INFO] │ ├── caniuse-db@1.0.30000757
[INFO] │ └── requireindex@1.1.0
[INFO] ├─┬ htmllint-cli@0.0.6
[INFO] │ ├── bluebird@3.5.1
@@ -669,7 +672,7 @@ Build date: 2017-10-25 14:52:52
[INFO] │ │ │ ├─┬ cryptiles@3.1.2
[INFO] │ │ │ │ └── boom@5.2.0
[INFO] │ │ │ ├── hoek@4.2.0
-[INFO] │ │ │ └── sntp@2.0.2
+[INFO] │ │ │ └── sntp@2.1.0
[INFO] │ │ ├─┬ http-signature@1.2.0
[INFO] │ │ │ ├── assert-plus@1.0.0
[INFO] │ │ │ ├─┬ jsprim@1.4.1
@@ -816,9 +819,8 @@ Build date: 2017-10-25 14:52:52
[INFO] │ └── function-bind@1.1.1
[INFO] ├─┬ phantomjs-prebuilt@2.1.15
[INFO] │ ├── es6-promise@4.0.5
-[INFO] │ ├─┬ extract-zip@1.6.5
-[INFO] │ │ ├─┬ debug@2.2.0
-[INFO] │ │ │ └── ms@0.7.1
+[INFO] │ ├─┬ extract-zip@1.6.6
+[INFO] │ │ ├── debug@2.6.9
[INFO] │ │ ├── mkdirp@0.5.0
[INFO] │ │ └─┬ yauzl@2.4.1
[INFO] │ │ └─┬ fd-slicer@1.0.1
@@ -1018,9 +1020,9 @@ Build date: 2017-10-25 14:52:52
[INFO] │ └── stylelint-config-recommended@1.0.0
[INFO] ├── stylelint-config-standard@17.0.0
[INFO] ├─┬ stylelint-order@0.7.0
-[INFO] │ └── postcss-sorting@3.0.2
+[INFO] │ └── postcss-sorting@3.1.0
[INFO] ├── stylelint-scss@2.1.0
-[INFO] ├─┬ uglify-js@3.1.5
+[INFO] ├─┬ uglify-js@3.1.6
[INFO] │ └── source-map@0.6.1
[INFO] ├── vnu-jar@17.11.1
[INFO] └─┬ workbox-build@2.1.0
@@ -1035,76 +1037,76 @@ Build date: 2017-10-25 14:52:52
[INFO] └── workbox-sw@2.1.0
[INFO]
[INFO]
-[INFO] --- frontend-maven-plugin:1.4:npm (step #8: npm run css-compile) @ tobago-theme-richmond ---
-[INFO] Running 'npm run css-compile' in __CURRENT__/tobago-theme-richmond/target/bootstrap
+[INFO] --- frontend-maven-plugin:1.4:npm (step #8: npm run css-compile) @ tobago-theme-roxborough ---
+[INFO] Running 'npm run css-compile' in __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO]
-[INFO] > bootstrap@4.0.0-beta.2 css-compile __CURRENT__/tobago-theme-richmond/target/bootstrap
+[INFO] > bootstrap@4.0.0-beta.2 css-compile __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO] > node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap.scss dist/css/bootstrap.css && node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap-grid.scss dist/css/bootstrap-grid.css && node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap-reboot.scss dist/css/bootstrap-reboot.css
[INFO]
[ERROR] Rendering Complete, saving .css file...
-[ERROR] Wrote CSS to __CURRENT__/tobago-theme-richmond/target/bootstrap/dist/css/bootstrap.css
-[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-richmond/target/bootstrap/dist/css/bootstrap.css.map
+[ERROR] Wrote CSS to __CURRENT__/tobago-theme-roxborough/target/bootstrap/dist/css/bootstrap.css
+[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-roxborough/target/bootstrap/dist/css/bootstrap.css.map
[ERROR] Rendering Complete, saving .css file...
-[ERROR] Wrote CSS to __CURRENT__/tobago-theme-richmond/target/bootstrap/dist/css/bootstrap-grid.css
-[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-richmond/target/bootstrap/dist/css/bootstrap-grid.css.map
+[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-roxborough/target/bootstrap/dist/css/bootstrap-grid.css.map
+[ERROR] Wrote CSS to __CURRENT__/tobago-theme-roxborough/target/bootstrap/dist/css/bootstrap-grid.css
[ERROR] Rendering Complete, saving .css file...
-[ERROR] Wrote CSS to __CURRENT__/tobago-theme-richmond/target/bootstrap/dist/css/bootstrap-reboot.css
-[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-richmond/target/bootstrap/dist/css/bootstrap-reboot.css.map
+[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
[INFO]
-[INFO] --- frontend-maven-plugin:1.4:npm (step #9: npm run css-prefix) @ tobago-theme-richmond ---
-[INFO] Running 'npm run css-prefix' in __CURRENT__/tobago-theme-richmond/target/bootstrap
+[INFO] --- frontend-maven-plugin:1.4:npm (step #9: npm run css-prefix) @ tobago-theme-roxborough ---
+[INFO] Running 'npm run css-prefix' in __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO]
-[INFO] > bootstrap@4.0.0-beta.2 css-prefix __CURRENT__/tobago-theme-richmond/target/bootstrap
+[INFO] > bootstrap@4.0.0-beta.2 css-prefix __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO] > postcss --config build/postcss.config.js --replace "dist/css/*.css"
[INFO]
-[ERROR] ✔ Finished dist/css/bootstrap-grid.min.css (1.05 s)
-[ERROR] ✔ Finished dist/css/bootstrap-reboot.css (1.05 s)
-[ERROR] ✔ Finished dist/css/bootstrap-grid.css (1.05 s)
-[ERROR] ✔ Finished dist/css/bootstrap-reboot.min.css (1.05 s)
-[ERROR] ✔ Finished dist/css/bootstrap.min.css (1.05 s)
-[ERROR] ✔ Finished dist/css/bootstrap.css (1.05 s)
+[ERROR] ✔ Finished dist/css/bootstrap-reboot.css (1.23 s)
+[ERROR] ✔ Finished dist/css/bootstrap-grid.css (1.24 s)
+[ERROR] ✔ Finished dist/css/bootstrap-grid.min.css (1.24 s)
+[ERROR] ✔ Finished dist/css/bootstrap.min.css (1.24 s)
+[ERROR] ✔ Finished dist/css/bootstrap.css (1.24 s)
+[ERROR] ✔ Finished dist/css/bootstrap-reboot.min.css (1.24 s)
[INFO]
-[INFO] --- frontend-maven-plugin:1.4:npm (step #10: npm run css-minify) @ tobago-theme-richmond ---
-[INFO] Running 'npm run css-minify' in __CURRENT__/tobago-theme-richmond/target/bootstrap
+[INFO] --- frontend-maven-plugin:1.4:npm (step #10: npm run css-minify) @ tobago-theme-roxborough ---
+[INFO] Running 'npm run css-minify' in __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO]
-[INFO] > bootstrap@4.0.0-beta.2 css-minify __CURRENT__/tobago-theme-richmond/target/bootstrap
+[INFO] > bootstrap@4.0.0-beta.2 css-minify __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO] > cleancss --level 1 --source-map --source-map-inline-sources --output dist/css/bootstrap.min.css dist/css/bootstrap.css && cleancss --level 1 --source-map --source-map-inline-sources --output dist/css/bootstrap-grid.min.css dist/css/bootstrap-grid.css && cleancss --level 1 --source-map --source-map-inline-sources --output dist/css/bootstrap-reboot.min.css dist/css/bootstrap-reboot.css
[INFO]
[INFO]
-[INFO] --- frontend-maven-plugin:1.4:npm (step #11: npm run js) @ tobago-theme-richmond ---
-[INFO] Running 'npm run js' in __CURRENT__/tobago-theme-richmond/target/bootstrap
+[INFO] --- frontend-maven-plugin:1.4:npm (step #11: npm run js) @ tobago-theme-roxborough ---
+[INFO] Running 'npm run js' in __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO]
-[INFO] > bootstrap@4.0.0-beta.2 js __CURRENT__/tobago-theme-richmond/target/bootstrap
+[INFO] > bootstrap@4.0.0-beta.2 js __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO] > npm-run-all js-lint* js-compile* js-minify*
[INFO]
[INFO]
-[INFO] > bootstrap@4.0.0-beta.2 js-lint __CURRENT__/tobago-theme-richmond/target/bootstrap
+[INFO] > bootstrap@4.0.0-beta.2 js-lint __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO] > eslint js/ && eslint --config js/tests/.eslintrc.json --env node build/
[INFO]
[INFO]
-[INFO] > bootstrap@4.0.0-beta.2 js-lint-docs __CURRENT__/tobago-theme-richmond/target/bootstrap
+[INFO] > bootstrap@4.0.0-beta.2 js-lint-docs __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO] > eslint --config js/tests/.eslintrc.json assets/js/ docs/ sw.js
[INFO]
[INFO]
-[INFO] > bootstrap@4.0.0-beta.2 js-compile __CURRENT__/tobago-theme-richmond/target/bootstrap
+[INFO] > bootstrap@4.0.0-beta.2 js-compile __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO] > npm-run-all --parallel js-compile-*
[INFO]
[INFO]
-[INFO] > bootstrap@4.0.0-beta.2 js-compile-bundle __CURRENT__/tobago-theme-richmond/target/bootstrap
-[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:true --config build/rollup.config.js --sourcemap
+[INFO] > bootstrap@4.0.0-beta.2 js-compile-plugins __CURRENT__/tobago-theme-roxborough/target/bootstrap
+[INFO] > cross-env PLUGINS=true babel js/src/ --out-dir js/dist/ --source-maps
[INFO]
[INFO]
-[INFO] > bootstrap@4.0.0-beta.2 js-compile-standalone __CURRENT__/tobago-theme-richmond/target/bootstrap
+[INFO] > bootstrap@4.0.0-beta.2 js-compile-standalone __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:false --config build/rollup.config.js --sourcemap
[INFO]
[INFO]
-[INFO] > bootstrap@4.0.0-beta.2 js-compile-plugins __CURRENT__/tobago-theme-richmond/target/bootstrap
-[INFO] > cross-env PLUGINS=true babel js/src/ --out-dir js/dist/ --source-maps
+[INFO] > bootstrap@4.0.0-beta.2 js-compile-bundle __CURRENT__/tobago-theme-roxborough/target/bootstrap
+[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:true --config build/rollup.config.js --sourcemap
[INFO]
[ERROR]
-[ERROR] __CURRENT__/tobago-theme-richmond/target/bootstrap/js/src/index.js → dist/js/bootstrap.bundle.js...
+[ERROR] __CURRENT__/tobago-theme-roxborough/target/bootstrap/js/src/index.js → dist/js/bootstrap.js...
[ERROR]
-[ERROR] __CURRENT__/tobago-theme-richmond/target/bootstrap/js/src/index.js → dist/js/bootstrap.js...
+[ERROR] __CURRENT__/tobago-theme-roxborough/target/bootstrap/js/src/index.js → dist/js/bootstrap.bundle.js...
[INFO] js/src/alert.js -> js/dist/alert.js
[INFO] js/src/button.js -> js/dist/button.js
[INFO] js/src/carousel.js -> js/dist/carousel.js
@@ -1117,24 +1119,24 @@ Build date: 2017-10-25 14:52:52
[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.9s
+[ERROR] created dist/js/bootstrap.js in 1.8s
+[ERROR] created dist/js/bootstrap.bundle.js in 2s
[INFO]
-[INFO] > bootstrap@4.0.0-beta.2 js-compile-standalone __CURRENT__/tobago-theme-richmond/target/bootstrap
+[INFO] > bootstrap@4.0.0-beta.2 js-compile-standalone __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:false --config build/rollup.config.js --sourcemap
[INFO]
[ERROR]
-[ERROR] __CURRENT__/tobago-theme-richmond/target/bootstrap/js/src/index.js → dist/js/bootstrap.js...
+[ERROR] __CURRENT__/tobago-theme-roxborough/target/bootstrap/js/src/index.js → dist/js/bootstrap.js...
[ERROR] created dist/js/bootstrap.js in 1.5s
[INFO]
-[INFO] > bootstrap@4.0.0-beta.2 js-compile-bundle __CURRENT__/tobago-theme-richmond/target/bootstrap
+[INFO] > bootstrap@4.0.0-beta.2 js-compile-bundle __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:true --config build/rollup.config.js --sourcemap
[INFO]
[ERROR]
-[ERROR] __CURRENT__/tobago-theme-richmond/target/bootstrap/js/src/index.js → dist/js/bootstrap.bundle.js...
-[ERROR] created dist/js/bootstrap.bundle.js in 1.7s
+[ERROR] __CURRENT__/tobago-theme-roxborough/target/bootstrap/js/src/index.js → dist/js/bootstrap.bundle.js...
+[ERROR] created dist/js/bootstrap.bundle.js in 1.6s
[INFO]
-[INFO] > bootstrap@4.0.0-beta.2 js-compile-plugins __CURRENT__/tobago-theme-richmond/target/bootstrap
+[INFO] > bootstrap@4.0.0-beta.2 js-compile-plugins __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO] > cross-env PLUGINS=true babel js/src/ --out-dir js/dist/ --source-maps
[INFO]
[INFO] js/src/alert.js -> js/dist/alert.js
@@ -1150,80 +1152,80 @@ Build date: 2017-10-25 14:52:52
[INFO] js/src/tooltip.js -> js/dist/tooltip.js
[INFO] js/src/util.js -> js/dist/util.js
[INFO]
-[INFO] > bootstrap@4.0.0-beta.2 js-minify __CURRENT__/tobago-theme-richmond/target/bootstrap
+[INFO] > bootstrap@4.0.0-beta.2 js-minify __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO] > npm-run-all --parallel js-minify-*
[INFO]
[INFO]
-[INFO] > bootstrap@4.0.0-beta.2 js-minify-standalone __CURRENT__/tobago-theme-richmond/target/bootstrap
-[INFO] > uglifyjs --compress typeofs=false --mangle --comments "/^!/" --source-map "content=dist/js/bootstrap.js.map,includeSources,url=bootstrap.min.js.map" --output dist/js/bootstrap.min.js dist/js/bootstrap.js
+[INFO] > bootstrap@4.0.0-beta.2 js-minify-docs __CURRENT__/tobago-theme-roxborough/target/bootstrap
+[INFO] > uglifyjs --mangle --comments "/^!/" --output assets/js/docs.min.js assets/js/vendor/anchor.min.js assets/js/vendor/clipboard.min.js assets/js/vendor/holder.min.js assets/js/src/application.js assets/js/src/pwa.js
[INFO]
[INFO]
-[INFO] > bootstrap@4.0.0-beta.2 js-minify-bundle __CURRENT__/tobago-theme-richmond/target/bootstrap
-[INFO] > uglifyjs --compress typeofs=false --mangle --comments "/^!/" --source-map "content=dist/js/bootstrap.bundle.js.map,includeSources,url=bootstrap.bundle.min.js.map" --output dist/js/bootstrap.bundle.min.js dist/js/bootstrap.bundle.js
+[INFO] > bootstrap@4.0.0-beta.2 js-minify-standalone __CURRENT__/tobago-theme-roxborough/target/bootstrap
+[INFO] > uglifyjs --compress typeofs=false --mangle --comments "/^!/" --source-map "content=dist/js/bootstrap.js.map,includeSources,url=bootstrap.min.js.map" --output dist/js/bootstrap.min.js dist/js/bootstrap.js
[INFO]
[INFO]
-[INFO] > bootstrap@4.0.0-beta.2 js-minify-docs __CURRENT__/tobago-theme-richmond/target/bootstrap
-[INFO] > uglifyjs --mangle --comments "/^!/" --output assets/js/docs.min.js assets/js/vendor/anchor.min.js assets/js/vendor/clipboard.min.js assets/js/vendor/holder.min.js assets/js/src/application.js assets/js/src/pwa.js
+[INFO] > bootstrap@4.0.0-beta.2 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
+[ERROR] INFO: Using input source map: dist/js/bootstrap.bundle.js.mapINFO: Using input source map: dist/js/bootstrap.js.map
+[ERROR]
[INFO]
-[INFO] > bootstrap@4.0.0-beta.2 js-minify-standalone __CURRENT__/tobago-theme-richmond/target/bootstrap
+[INFO] > bootstrap@4.0.0-beta.2 js-minify-standalone __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO] > uglifyjs --compress typeofs=false --mangle --comments "/^!/" --source-map "content=dist/js/bootstrap.js.map,includeSources,url=bootstrap.min.js.map" --output dist/js/bootstrap.min.js dist/js/bootstrap.js
[INFO]
[ERROR] INFO: Using input source map: dist/js/bootstrap.js.map
[INFO]
-[INFO] > bootstrap@4.0.0-beta.2 js-minify-bundle __CURRENT__/tobago-theme-richmond/target/bootstrap
+[INFO] > bootstrap@4.0.0-beta.2 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.bundle.js.map
[INFO]
-[INFO] > bootstrap@4.0.0-beta.2 js-minify-docs __CURRENT__/tobago-theme-richmond/target/bootstrap
+[INFO] > bootstrap@4.0.0-beta.2 js-minify-docs __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO] > uglifyjs --mangle --comments "/^!/" --output assets/js/docs.min.js assets/js/vendor/anchor.min.js assets/js/vendor/clipboard.min.js assets/js/vendor/holder.min.js assets/js/src/application.js assets/js/src/pwa.js
[INFO]
[INFO]
-[INFO] --- maven-resources-plugin:2.7:resources (default-resources) @ tobago-theme-richmond ---
+[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 6 resources
+[INFO] Copying 10 resources
[INFO] Copying 3 resources
[INFO]
-[INFO] --- maven-resources-plugin:2.7:copy-resources (step #12: copy-bootstrap-dist) @ tobago-theme-richmond ---
+[INFO] --- maven-resources-plugin:2.7:copy-resources (step #12: copy-bootstrap-dist) @ 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-richmond ---
+[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-richmond ---
+[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-richmond ---
+[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-richmond/src/test/resources
+[INFO] skip non existing resourceDirectory __CURRENT__/tobago-theme-roxborough/src/test/resources
[INFO] Copying 3 resources
[INFO]
-[INFO] --- maven-compiler-plugin:3.6.2:testCompile (default-testCompile) @ tobago-theme-richmond ---
+[INFO] --- maven-compiler-plugin:3.6.2:testCompile (default-testCompile) @ tobago-theme-roxborough ---
[INFO] No sources to compile
[INFO]
-[INFO] --- maven-surefire-plugin:2.19.1:test (default-test) @ tobago-theme-richmond ---
+[INFO] --- maven-surefire-plugin:2.19.1:test (default-test) @ tobago-theme-roxborough ---
[INFO]
-[INFO] --- maven-jar-plugin:3.0.2:jar (default-jar) @ tobago-theme-richmond ---
-[INFO] Building jar: __CURRENT__/tobago-theme-richmond/target/tobago-theme-richmond-4.0.0-SNAPSHOT.jar
+[INFO] --- maven-jar-plugin:3.0.2:jar (default-jar) @ tobago-theme-roxborough ---
+[INFO] Building jar: __CURRENT__/tobago-theme-roxborough/target/tobago-theme-roxborough-4.0.0-SNAPSHOT.jar
[INFO]
-[INFO] --- maven-site-plugin:3.6:attach-descriptor (attach-descriptor) @ tobago-theme-richmond ---
+[INFO] --- maven-site-plugin:3.6:attach-descriptor (attach-descriptor) @ tobago-theme-roxborough ---
[INFO] Skipping because packaging 'jar' is not pom.
[INFO]
-[INFO] --- maven-install-plugin:2.5.2:install (default-install) @ tobago-theme-richmond ---
-[INFO] Installing __CURRENT__/tobago-theme-richmond/target/tobago-theme-richmond-4.0.0-SNAPSHOT.jar to __REPO__/org/apache/myfaces/tobago/tobago-theme-richmond/4.0.0-SNAPSHOT/tobago-theme-richmond-4.0.0-SNAPSHOT.jar
-[INFO] Installing __CURRENT__/tobago-theme-richmond/pom.xml to __REPO__/org/apache/myfaces/tobago/tobago-theme-richmond/4.0.0-SNAPSHOT/tobago-theme-richmond-4.0.0-SNAPSHOT.pom
+[INFO] --- maven-install-plugin:2.5.2:install (default-install) @ tobago-theme-roxborough ---
+[INFO] Installing __CURRENT__/tobago-theme-roxborough/target/tobago-theme-roxborough-4.0.0-SNAPSHOT.jar to __REPO__/org/apache/myfaces/tobago/tobago-theme-roxborough/4.0.0-SNAPSHOT/tobago-theme-roxborough-4.0.0-SNAPSHOT.jar
+[INFO] Installing __CURRENT__/tobago-theme-roxborough/pom.xml to __REPO__/org/apache/myfaces/tobago/tobago-theme-roxborough/4.0.0-SNAPSHOT/tobago-theme-roxborough-4.0.0-SNAPSHOT.pom
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
-[INFO] Total time: 02:56 min
-[INFO] Finished at: 2017-10-25T14:55:50+02:00
-[INFO] Final Memory: 29M/381M
+[INFO] Total time: 03:08 min
+[INFO] Finished at: 2017-11-02T13:48:23+01:00
+[INFO] Final Memory: 30M/388M
[INFO] ------------------------------------------------------------------------
diff --git a/tobago-theme/tobago-theme-roxborough/src/main/appended-resources/META-INF/LICENSE b/tobago-theme/tobago-theme-roxborough/src/main/appended-resources/META-INF/LICENSE
new file mode 100644
index 0000000..54e672a
--- /dev/null
+++ b/tobago-theme/tobago-theme-roxborough/src/main/appended-resources/META-INF/LICENSE
@@ -0,0 +1,48 @@
+------------------------------------------------------------------------------
+For Font Amaranth:
+------------------------------------------------------------------------------
+
+Copyright (c) 2011, Gesine Todt (hallo@gesine-todt.de),
+with Reserved Font Name Amaranth.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide development of collaborative font projects, to support the font creation efforts of academic and linguistic communities, and to provide a free and open framework in which fonts may be shared and improved in partnership with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The requirement for fonts to remain under this license does not apply to any document creat [...]
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright Holder(s) under this license and clearly marked as such. This may include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting, or substituting -- in part or in whole -- any of the components of the Original Version, by changing formats or by porting the Font Software to a new environment.
+
+"Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components, in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled, redistributed and/or sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font Name(s) unless explicit written permission is granted by the corresponding Copyright Holder. This restriction only applies to the primary font name as presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s) or with their explicit written permission.
+
+5) The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. The requirement for fonts to remain under this license does not apply to any document created using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM [...]
diff --git a/tobago-theme/tobago-theme-roxborough/src/main/appended-resources/META-INF/NOTICE b/tobago-theme/tobago-theme-roxborough/src/main/appended-resources/META-INF/NOTICE
index 80ca0ee..f5488b8 100644
--- a/tobago-theme/tobago-theme-roxborough/src/main/appended-resources/META-INF/NOTICE
+++ b/tobago-theme/tobago-theme-roxborough/src/main/appended-resources/META-INF/NOTICE
@@ -2,3 +2,5 @@ Based on source code originally developed by
Atanion GmbH (http://www.atanion.com/)
Copyright 2002-2005 Atanion GmbH.
+This product includes fonts developed by
+Gesine Todt (hallo@gesine-todt.de) with Reserved Font Name Amaranth.
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 0265193..ad5c8b1 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
@@ -21,6 +21,37 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+@font-face {
+ font-family: 'Amaranth';
+ font-style: normal;
+ font-weight: normal;
+ src: url("../fonts/Amaranth-Regular.otf") format("opentype");
+}
+
+@font-face {
+ font-family: 'Amaranth';
+ font-style: normal;
+ font-weight: bold;
+ 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: bold;
+ src: url("../fonts/Amaranth-BoldItalic.otf") format("opentype");
+}
+
+.tobago-section-header, .tobago-box-header {
+ font-family: Amaranth, Arial, serif;
+}
+
:root {
--blue: #007bff;
--indigo: #6610f2;
@@ -35,11 +66,14 @@
--white: #fff;
--gray: #868e96;
--gray-dark: #343a40;
- --primary: #4f4fa8;
- --success: #3c883c;
- --info: #007f7f;
- --warning: #a0ad2e;
- --danger: #8f59a9;
+ --primary: #B26812;
+ --secondary: #5400A8;
+ --success: #1C690A;
+ --info: #130E8F;
+ --warning: #A84711;
+ --danger: #E85400;
+ --light: #777777;
+ --dark: #323232;
--breakpoint-xs: 0;
--breakpoint-sm: 576px;
--breakpoint-md: 768px;
@@ -136,7 +170,7 @@ body {
font-size: 1rem;
font-weight: 400;
line-height: 1.5;
- color: #808080;
+ color: #777777;
text-align: left;
background-color: #000000;
}
@@ -1628,76 +1662,121 @@ pre code {
.table-primary,
.table-primary > th,
.table-primary > td {
- background-color: #cecee7;
+ background-color: #e9d5bd;
}
.table-hover .table-primary:hover {
- background-color: #bdbddf;
+ background-color: #e3c9aa;
}
.table-hover .table-primary:hover > td,
.table-hover .table-primary:hover > th {
- background-color: #bdbddf;
+ background-color: #e3c9aa;
+}
+
+.table-secondary,
+.table-secondary > th,
+.table-secondary > td {
+ background-color: #cfb8e7;
+}
+
+.table-hover .table-secondary:hover {
+ background-color: #c2a5e1;
+}
+
+.table-hover .table-secondary:hover > td,
+.table-hover .table-secondary:hover > th {
+ background-color: #c2a5e1;
}
.table-success,
.table-success > th,
.table-success > td {
- background-color: #c8dec8;
+ background-color: #bfd5ba;
}
.table-hover .table-success:hover {
- background-color: #b8d4b8;
+ background-color: #b0cbaa;
}
.table-hover .table-success:hover > td,
.table-hover .table-success:hover > th {
- background-color: #b8d4b8;
+ background-color: #b0cbaa;
}
.table-info,
.table-info > th,
.table-info > td {
- background-color: #b8dbdb;
+ background-color: #bdbce0;
}
.table-hover .table-info:hover {
- background-color: #a7d2d2;
+ background-color: #acabd8;
}
.table-hover .table-info:hover > td,
.table-hover .table-info:hover > th {
- background-color: #a7d2d2;
+ background-color: #acabd8;
}
.table-warning,
.table-warning > th,
.table-warning > td {
- background-color: #e4e8c4;
+ background-color: #e7cbbc;
}
.table-hover .table-warning:hover {
- background-color: #dce1b2;
+ background-color: #e0bca9;
}
.table-hover .table-warning:hover > td,
.table-hover .table-warning:hover > th {
- background-color: #dce1b2;
+ background-color: #e0bca9;
}
.table-danger,
.table-danger > th,
.table-danger > td {
- background-color: #e0d1e7;
+ background-color: #f9cfb8;
}
.table-hover .table-danger:hover {
- background-color: #d5c0de;
+ background-color: #f7bfa0;
}
.table-hover .table-danger:hover > td,
.table-hover .table-danger:hover > th {
- background-color: #d5c0de;
+ background-color: #f7bfa0;
+}
+
+.table-light,
+.table-light > th,
+.table-light > td {
+ background-color: #d9d9d9;
+}
+
+.table-hover .table-light:hover {
+ background-color: #cccccc;
+}
+
+.table-hover .table-light:hover > td,
+.table-hover .table-light:hover > th {
+ background-color: #cccccc;
+}
+
+.table-dark,
+.table-dark > th,
+.table-dark > td {
+ background-color: #c6c6c6;
+}
+
+.table-hover .table-dark:hover {
+ background-color: #b9b9b9;
+}
+
+.table-hover .table-dark:hover > td,
+.table-hover .table-dark:hover > th {
+ background-color: #b9b9b9;
}
.table-active,
@@ -1821,7 +1900,7 @@ pre code {
font-size: 1rem;
line-height: 1.5;
color: #495057;
- background-color: #505050;
+ background-color: #777777;
background-image: none;
background-clip: padding-box;
border: 1px solid #ced4da;
@@ -1873,7 +1952,7 @@ select.form-control:not([size]):not([multiple]) {
select.form-control:focus::-ms-value {
color: #495057;
- background-color: #505050;
+ background-color: #777777;
}
.form-control-file,
@@ -2277,297 +2356,474 @@ fieldset[disabled] a.btn {
.btn-primary {
color: #fff;
- background-color: #4f4fa8;
- border-color: #4f4fa8;
+ background-color: #B26812;
+ border-color: #B26812;
}
.btn-primary:hover {
color: #fff;
- background-color: #43438e;
- border-color: #3f3f85;
+ background-color: #8f540e;
+ border-color: #844d0d;
}
.btn-primary:focus, .btn-primary.focus {
- box-shadow: 0 0 0 0.2rem rgba(79, 79, 168, 0.5);
+ box-shadow: 0 0 0 0.2rem rgba(178, 104, 18, 0.5);
}
.btn-primary.disabled, .btn-primary:disabled {
- background-color: #4f4fa8;
- border-color: #4f4fa8;
+ background-color: #B26812;
+ border-color: #B26812;
}
.btn-primary:not([disabled]):not(.disabled):active, .btn-primary:not([disabled]):not(.disabled).active,
.show > .btn-primary.dropdown-toggle {
color: #fff;
- background-color: #3f3f85;
- border-color: #3b3b7d;
- box-shadow: 0 0 0 0.2rem rgba(79, 79, 168, 0.5);
+ background-color: #844d0d;
+ border-color: #78460c;
+ box-shadow: 0 0 0 0.2rem rgba(178, 104, 18, 0.5);
+}
+
+.btn-secondary {
+ color: #fff;
+ background-color: #5400A8;
+ border-color: #5400A8;
+}
+
+.btn-secondary:hover {
+ color: #fff;
+ background-color: #410082;
+ border-color: #3b0075;
+}
+
+.btn-secondary:focus, .btn-secondary.focus {
+ box-shadow: 0 0 0 0.2rem rgba(84, 0, 168, 0.5);
+}
+
+.btn-secondary.disabled, .btn-secondary:disabled {
+ background-color: #5400A8;
+ border-color: #5400A8;
+}
+
+.btn-secondary:not([disabled]):not(.disabled):active, .btn-secondary:not([disabled]):not(.disabled).active,
+.show > .btn-secondary.dropdown-toggle {
+ color: #fff;
+ background-color: #3b0075;
+ border-color: #340068;
+ box-shadow: 0 0 0 0.2rem rgba(84, 0, 168, 0.5);
}
.btn-success {
color: #fff;
- background-color: #3c883c;
- border-color: #3c883c;
+ background-color: #1C690A;
+ border-color: #1C690A;
}
.btn-success:hover {
color: #fff;
- background-color: #306d30;
- border-color: #2c652c;
+ background-color: #134607;
+ border-color: #103a06;
}
.btn-success:focus, .btn-success.focus {
- box-shadow: 0 0 0 0.2rem rgba(60, 136, 60, 0.5);
+ box-shadow: 0 0 0 0.2rem rgba(28, 105, 10, 0.5);
}
.btn-success.disabled, .btn-success:disabled {
- background-color: #3c883c;
- border-color: #3c883c;
+ background-color: #1C690A;
+ border-color: #1C690A;
}
.btn-success:not([disabled]):not(.disabled):active, .btn-success:not([disabled]):not(.disabled).active,
.show > .btn-success.dropdown-toggle {
color: #fff;
- background-color: #2c652c;
- border-color: #285c28;
- box-shadow: 0 0 0 0.2rem rgba(60, 136, 60, 0.5);
+ background-color: #103a06;
+ border-color: #0c2f04;
+ box-shadow: 0 0 0 0.2rem rgba(28, 105, 10, 0.5);
}
.btn-info {
color: #fff;
- background-color: #007f7f;
- border-color: #007f7f;
+ background-color: #130E8F;
+ border-color: #130E8F;
}
.btn-info:hover {
color: #fff;
- background-color: #005959;
- border-color: #004c4c;
+ background-color: #0e0b6c;
+ border-color: #0d0961;
}
.btn-info:focus, .btn-info.focus {
- box-shadow: 0 0 0 0.2rem rgba(0, 127, 127, 0.5);
+ box-shadow: 0 0 0 0.2rem rgba(19, 14, 143, 0.5);
}
.btn-info.disabled, .btn-info:disabled {
- background-color: #007f7f;
- border-color: #007f7f;
+ background-color: #130E8F;
+ border-color: #130E8F;
}
.btn-info:not([disabled]):not(.disabled):active, .btn-info:not([disabled]):not(.disabled).active,
.show > .btn-info.dropdown-toggle {
color: #fff;
- background-color: #004c4c;
- border-color: #003f3f;
- box-shadow: 0 0 0 0.2rem rgba(0, 127, 127, 0.5);
+ background-color: #0d0961;
+ border-color: #0b0855;
+ box-shadow: 0 0 0 0.2rem rgba(19, 14, 143, 0.5);
}
.btn-warning {
- color: #111;
- background-color: #a0ad2e;
- border-color: #a0ad2e;
+ color: #fff;
+ background-color: #A84711;
+ border-color: #A84711;
}
.btn-warning:hover {
color: #fff;
- background-color: #848f26;
- border-color: #7b8523;
+ background-color: #85380d;
+ border-color: #7a330c;
}
.btn-warning:focus, .btn-warning.focus {
- box-shadow: 0 0 0 0.2rem rgba(160, 173, 46, 0.5);
+ box-shadow: 0 0 0 0.2rem rgba(168, 71, 17, 0.5);
}
.btn-warning.disabled, .btn-warning:disabled {
- background-color: #a0ad2e;
- border-color: #a0ad2e;
+ background-color: #A84711;
+ border-color: #A84711;
}
.btn-warning:not([disabled]):not(.disabled):active, .btn-warning:not([disabled]):not(.disabled).active,
.show > .btn-warning.dropdown-toggle {
color: #fff;
- background-color: #7b8523;
- border-color: #717b21;
- box-shadow: 0 0 0 0.2rem rgba(160, 173, 46, 0.5);
+ background-color: #7a330c;
+ border-color: #6e2f0b;
+ box-shadow: 0 0 0 0.2rem rgba(168, 71, 17, 0.5);
}
.btn-danger {
color: #fff;
- background-color: #8f59a9;
- border-color: #8f59a9;
+ background-color: #E85400;
+ border-color: #E85400;
}
.btn-danger:hover {
color: #fff;
- background-color: #7a4b91;
- border-color: #734788;
+ background-color: #c24600;
+ border-color: #b54200;
}
.btn-danger:focus, .btn-danger.focus {
- box-shadow: 0 0 0 0.2rem rgba(143, 89, 169, 0.5);
+ box-shadow: 0 0 0 0.2rem rgba(232, 84, 0, 0.5);
}
.btn-danger.disabled, .btn-danger:disabled {
- background-color: #8f59a9;
- border-color: #8f59a9;
+ background-color: #E85400;
+ border-color: #E85400;
}
.btn-danger:not([disabled]):not(.disabled):active, .btn-danger:not([disabled]):not(.disabled).active,
.show > .btn-danger.dropdown-toggle {
color: #fff;
- background-color: #734788;
- border-color: #6c4280;
- box-shadow: 0 0 0 0.2rem rgba(143, 89, 169, 0.5);
+ background-color: #b54200;
+ border-color: #a83d00;
+ box-shadow: 0 0 0 0.2rem rgba(232, 84, 0, 0.5);
+}
+
+.btn-light {
+ color: #fff;
+ background-color: #777777;
+ border-color: #777777;
+}
+
+.btn-light:hover {
+ color: #fff;
+ background-color: #646464;
+ border-color: #5e5e5e;
+}
+
+.btn-light:focus, .btn-light.focus {
+ box-shadow: 0 0 0 0.2rem rgba(119, 119, 119, 0.5);
+}
+
+.btn-light.disabled, .btn-light:disabled {
+ background-color: #777777;
+ border-color: #777777;
+}
+
+.btn-light:not([disabled]):not(.disabled):active, .btn-light:not([disabled]):not(.disabled).active,
+.show > .btn-light.dropdown-toggle {
+ color: #fff;
+ background-color: #5e5e5e;
+ border-color: #575757;
+ box-shadow: 0 0 0 0.2rem rgba(119, 119, 119, 0.5);
+}
+
+.btn-dark {
+ color: #fff;
+ background-color: #323232;
+ border-color: #323232;
+}
+
+.btn-dark:hover {
+ color: #fff;
+ background-color: #1f1f1f;
+ border-color: #191919;
+}
+
+.btn-dark:focus, .btn-dark.focus {
+ box-shadow: 0 0 0 0.2rem rgba(50, 50, 50, 0.5);
+}
+
+.btn-dark.disabled, .btn-dark:disabled {
+ background-color: #323232;
+ border-color: #323232;
+}
+
+.btn-dark:not([disabled]):not(.disabled):active, .btn-dark:not([disabled]):not(.disabled).active,
+.show > .btn-dark.dropdown-toggle {
+ color: #fff;
+ background-color: #191919;
+ border-color: #121212;
+ box-shadow: 0 0 0 0.2rem rgba(50, 50, 50, 0.5);
}
.btn-outline-primary {
- color: #4f4fa8;
+ color: #B26812;
background-color: transparent;
background-image: none;
- border-color: #4f4fa8;
+ border-color: #B26812;
}
.btn-outline-primary:hover {
color: #fff;
- background-color: #4f4fa8;
- border-color: #4f4fa8;
+ background-color: #B26812;
+ border-color: #B26812;
}
.btn-outline-primary:focus, .btn-outline-primary.focus {
- box-shadow: 0 0 0 0.2rem rgba(79, 79, 168, 0.5);
+ box-shadow: 0 0 0 0.2rem rgba(178, 104, 18, 0.5);
}
.btn-outline-primary.disabled, .btn-outline-primary:disabled {
- color: #4f4fa8;
+ color: #B26812;
background-color: transparent;
}
.btn-outline-primary:not([disabled]):not(.disabled):active, .btn-outline-primary:not([disabled]):not(.disabled).active,
.show > .btn-outline-primary.dropdown-toggle {
color: #fff;
- background-color: #4f4fa8;
- border-color: #4f4fa8;
- box-shadow: 0 0 0 0.2rem rgba(79, 79, 168, 0.5);
+ background-color: #B26812;
+ border-color: #B26812;
+ box-shadow: 0 0 0 0.2rem rgba(178, 104, 18, 0.5);
+}
+
+.btn-outline-secondary {
+ color: #5400A8;
+ background-color: transparent;
+ background-image: none;
+ border-color: #5400A8;
+}
+
+.btn-outline-secondary:hover {
+ color: #fff;
+ background-color: #5400A8;
+ border-color: #5400A8;
+}
+
+.btn-outline-secondary:focus, .btn-outline-secondary.focus {
+ box-shadow: 0 0 0 0.2rem rgba(84, 0, 168, 0.5);
+}
+
+.btn-outline-secondary.disabled, .btn-outline-secondary:disabled {
+ color: #5400A8;
+ background-color: transparent;
+}
+
+.btn-outline-secondary:not([disabled]):not(.disabled):active, .btn-outline-secondary:not([disabled]):not(.disabled).active,
+.show > .btn-outline-secondary.dropdown-toggle {
+ color: #fff;
+ background-color: #5400A8;
+ border-color: #5400A8;
+ box-shadow: 0 0 0 0.2rem rgba(84, 0, 168, 0.5);
}
.btn-outline-success {
- color: #3c883c;
+ color: #1C690A;
background-color: transparent;
background-image: none;
- border-color: #3c883c;
+ border-color: #1C690A;
}
.btn-outline-success:hover {
color: #fff;
- background-color: #3c883c;
- border-color: #3c883c;
+ background-color: #1C690A;
+ border-color: #1C690A;
}
.btn-outline-success:focus, .btn-outline-success.focus {
- box-shadow: 0 0 0 0.2rem rgba(60, 136, 60, 0.5);
+ box-shadow: 0 0 0 0.2rem rgba(28, 105, 10, 0.5);
}
.btn-outline-success.disabled, .btn-outline-success:disabled {
- color: #3c883c;
+ color: #1C690A;
background-color: transparent;
}
.btn-outline-success:not([disabled]):not(.disabled):active, .btn-outline-success:not([disabled]):not(.disabled).active,
.show > .btn-outline-success.dropdown-toggle {
color: #fff;
- background-color: #3c883c;
- border-color: #3c883c;
- box-shadow: 0 0 0 0.2rem rgba(60, 136, 60, 0.5);
+ background-color: #1C690A;
+ border-color: #1C690A;
+ box-shadow: 0 0 0 0.2rem rgba(28, 105, 10, 0.5);
}
.btn-outline-info {
- color: #007f7f;
+ color: #130E8F;
background-color: transparent;
background-image: none;
- border-color: #007f7f;
+ border-color: #130E8F;
}
.btn-outline-info:hover {
color: #fff;
- background-color: #007f7f;
- border-color: #007f7f;
+ background-color: #130E8F;
+ border-color: #130E8F;
}
.btn-outline-info:focus, .btn-outline-info.focus {
- box-shadow: 0 0 0 0.2rem rgba(0, 127, 127, 0.5);
+ box-shadow: 0 0 0 0.2rem rgba(19, 14, 143, 0.5);
}
.btn-outline-info.disabled, .btn-outline-info:disabled {
- color: #007f7f;
+ color: #130E8F;
background-color: transparent;
}
.btn-outline-info:not([disabled]):not(.disabled):active, .btn-outline-info:not([disabled]):not(.disabled).active,
.show > .btn-outline-info.dropdown-toggle {
color: #fff;
- background-color: #007f7f;
- border-color: #007f7f;
- box-shadow: 0 0 0 0.2rem rgba(0, 127, 127, 0.5);
+ background-color: #130E8F;
+ border-color: #130E8F;
+ box-shadow: 0 0 0 0.2rem rgba(19, 14, 143, 0.5);
}
.btn-outline-warning {
- color: #a0ad2e;
+ color: #A84711;
background-color: transparent;
background-image: none;
- border-color: #a0ad2e;
+ border-color: #A84711;
}
.btn-outline-warning:hover {
color: #fff;
- background-color: #a0ad2e;
- border-color: #a0ad2e;
+ background-color: #A84711;
+ border-color: #A84711;
}
.btn-outline-warning:focus, .btn-outline-warning.focus {
- box-shadow: 0 0 0 0.2rem rgba(160, 173, 46, 0.5);
+ box-shadow: 0 0 0 0.2rem rgba(168, 71, 17, 0.5);
}
.btn-outline-warning.disabled, .btn-outline-warning:disabled {
- color: #a0ad2e;
+ color: #A84711;
background-color: transparent;
}
.btn-outline-warning:not([disabled]):not(.disabled):active, .btn-outline-warning:not([disabled]):not(.disabled).active,
.show > .btn-outline-warning.dropdown-toggle {
color: #fff;
- background-color: #a0ad2e;
- border-color: #a0ad2e;
- box-shadow: 0 0 0 0.2rem rgba(160, 173, 46, 0.5);
+ background-color: #A84711;
+ border-color: #A84711;
+ box-shadow: 0 0 0 0.2rem rgba(168, 71, 17, 0.5);
}
.btn-outline-danger {
- color: #8f59a9;
+ color: #E85400;
background-color: transparent;
background-image: none;
- border-color: #8f59a9;
+ border-color: #E85400;
}
.btn-outline-danger:hover {
color: #fff;
- background-color: #8f59a9;
- border-color: #8f59a9;
+ background-color: #E85400;
+ border-color: #E85400;
}
.btn-outline-danger:focus, .btn-outline-danger.focus {
- box-shadow: 0 0 0 0.2rem rgba(143, 89, 169, 0.5);
+ box-shadow: 0 0 0 0.2rem rgba(232, 84, 0, 0.5);
}
.btn-outline-danger.disabled, .btn-outline-danger:disabled {
- color: #8f59a9;
+ color: #E85400;
background-color: transparent;
}
.btn-outline-danger:not([disabled]):not(.disabled):active, .btn-outline-danger:not([disabled]):not(.disabled).active,
.show > .btn-outline-danger.dropdown-toggle {
color: #fff;
- background-color: #8f59a9;
- border-color: #8f59a9;
- box-shadow: 0 0 0 0.2rem rgba(143, 89, 169, 0.5);
+ background-color: #E85400;
+ border-color: #E85400;
+ box-shadow: 0 0 0 0.2rem rgba(232, 84, 0, 0.5);
+}
+
+.btn-outline-light {
+ color: #777777;
+ background-color: transparent;
+ background-image: none;
+ border-color: #777777;
+}
+
+.btn-outline-light:hover {
+ color: #212529;
+ background-color: #777777;
+ border-color: #777777;
+}
+
+.btn-outline-light:focus, .btn-outline-light.focus {
+ box-shadow: 0 0 0 0.2rem rgba(119, 119, 119, 0.5);
+}
+
+.btn-outline-light.disabled, .btn-outline-light:disabled {
+ color: #777777;
+ background-color: transparent;
+}
+
+.btn-outline-light:not([disabled]):not(.disabled):active, .btn-outline-light:not([disabled]):not(.disabled).active,
+.show > .btn-outline-light.dropdown-toggle {
+ color: #212529;
+ background-color: #777777;
+ border-color: #777777;
+ box-shadow: 0 0 0 0.2rem rgba(119, 119, 119, 0.5);
+}
+
+.btn-outline-dark {
+ color: #323232;
+ background-color: transparent;
+ background-image: none;
+ border-color: #323232;
+}
+
+.btn-outline-dark:hover {
+ color: #fff;
+ background-color: #323232;
+ border-color: #323232;
+}
+
+.btn-outline-dark:focus, .btn-outline-dark.focus {
+ box-shadow: 0 0 0 0.2rem rgba(50, 50, 50, 0.5);
+}
+
+.btn-outline-dark.disabled, .btn-outline-dark:disabled {
+ color: #323232;
+ background-color: transparent;
+}
+
+.btn-outline-dark:not([disabled]):not(.disabled):active, .btn-outline-dark:not([disabled]):not(.disabled).active,
+.show > .btn-outline-dark.dropdown-toggle {
+ color: #fff;
+ background-color: #323232;
+ border-color: #323232;
+ box-shadow: 0 0 0 0.2rem rgba(50, 50, 50, 0.5);
}
.btn-link {
@@ -2686,7 +2942,7 @@ tbody.collapse.show {
padding: 0.5rem 0;
margin: 0.125rem 0 0;
font-size: 1rem;
- color: #808080;
+ color: #777777;
text-align: left;
list-style: none;
background-color: #fff;
@@ -3203,7 +3459,7 @@ tbody.collapse.show {
.custom-select:focus::-ms-value {
color: #495057;
- background-color: #505050;
+ background-color: #777777;
}
.custom-select[multiple] {
@@ -3840,7 +4096,7 @@ tbody.collapse.show {
word-wrap: break-word;
background-color: #000000;
background-clip: border-box;
- border: 2px solid #505050;
+ border: 2px solid #777777;
border-radius: 0.25rem;
}
@@ -3889,8 +4145,8 @@ tbody.collapse.show {
.card-header {
padding: 0.75rem 1.25rem;
margin-bottom: 0;
- background-color: rgba(0, 0, 0, 0.03);
- border-bottom: 2px solid #505050;
+ background-color: #323232;
+ border-bottom: 2px solid #777777;
}
.card-header:first-child {
@@ -3903,8 +4159,8 @@ tbody.collapse.show {
.card-footer {
padding: 0.75rem 1.25rem;
- background-color: rgba(0, 0, 0, 0.03);
- border-top: 2px solid #505050;
+ background-color: #323232;
+ border-top: 2px solid #777777;
}
.card-footer:last-child {
@@ -4206,57 +4462,90 @@ tbody.collapse.show {
.badge-primary {
color: #fff;
- background-color: #4f4fa8;
+ background-color: #B26812;
}
.badge-primary[href]:focus, .badge-primary[href]:hover {
color: #fff;
text-decoration: none;
- background-color: #3f3f85;
+ background-color: #844d0d;
+}
+
+.badge-secondary {
+ color: #fff;
+ background-color: #5400A8;
+}
+
+.badge-secondary[href]:focus, .badge-secondary[href]:hover {
+ color: #fff;
+ text-decoration: none;
+ background-color: #3b0075;
}
.badge-success {
color: #fff;
- background-color: #3c883c;
+ background-color: #1C690A;
}
.badge-success[href]:focus, .badge-success[href]:hover {
color: #fff;
text-decoration: none;
- background-color: #2c652c;
+ background-color: #103a06;
}
.badge-info {
color: #fff;
- background-color: #007f7f;
+ background-color: #130E8F;
}
.badge-info[href]:focus, .badge-info[href]:hover {
color: #fff;
text-decoration: none;
- background-color: #004c4c;
+ background-color: #0d0961;
}
.badge-warning {
- color: #111;
- background-color: #a0ad2e;
+ color: #fff;
+ background-color: #A84711;
}
.badge-warning[href]:focus, .badge-warning[href]:hover {
- color: #111;
+ color: #fff;
text-decoration: none;
- background-color: #7b8523;
+ background-color: #7a330c;
}
.badge-danger {
color: #fff;
- background-color: #8f59a9;
+ background-color: #E85400;
}
.badge-danger[href]:focus, .badge-danger[href]:hover {
color: #fff;
text-decoration: none;
- background-color: #734788;
+ background-color: #b54200;
+}
+
+.badge-light {
+ color: #fff;
+ background-color: #777777;
+}
+
+.badge-light[href]:focus, .badge-light[href]:hover {
+ color: #fff;
+ text-decoration: none;
+ background-color: #5e5e5e;
+}
+
+.badge-dark {
+ color: #fff;
+ background-color: #323232;
+}
+
+.badge-dark[href]:focus, .badge-dark[href]:hover {
+ color: #fff;
+ text-decoration: none;
+ background-color: #191919;
}
.jumbotron {
@@ -4303,73 +4592,115 @@ tbody.collapse.show {
}
.alert-primary {
- color: #292957;
- background-color: #dcdcee;
- border-color: #cecee7;
+ color: #5d3609;
+ background-color: #f0e1d0;
+ border-color: #e9d5bd;
}
.alert-primary hr {
- border-top-color: #bdbddf;
+ border-top-color: #e3c9aa;
}
.alert-primary .alert-link {
- color: #191934;
+ color: #2f1b05;
+}
+
+.alert-secondary {
+ color: #2c0057;
+ background-color: #ddccee;
+ border-color: #cfb8e7;
+}
+
+.alert-secondary hr {
+ border-top-color: #c2a5e1;
+}
+
+.alert-secondary .alert-link {
+ color: #120024;
}
.alert-success {
- color: #1f471f;
- background-color: #d8e7d8;
- border-color: #c8dec8;
+ color: #0f3705;
+ background-color: #d2e1ce;
+ border-color: #bfd5ba;
}
.alert-success hr {
- border-top-color: #b8d4b8;
+ border-top-color: #b0cbaa;
}
.alert-success .alert-link {
- color: #102410;
+ color: #020801;
}
.alert-info {
- color: #004242;
- background-color: #cce5e5;
- border-color: #b8dbdb;
+ color: #0a074a;
+ background-color: #d0cfe9;
+ border-color: #bdbce0;
}
.alert-info hr {
- border-top-color: #a7d2d2;
+ border-top-color: #acabd8;
}
.alert-info .alert-link {
- color: #000f0f;
+ color: #04031b;
}
.alert-warning {
- color: #535a18;
- background-color: #ecefd5;
- border-color: #e4e8c4;
+ color: #572509;
+ background-color: #eedacf;
+ border-color: #e7cbbc;
}
.alert-warning hr {
- border-top-color: #dce1b2;
+ border-top-color: #e0bca9;
}
.alert-warning .alert-link {
- color: #2e320d;
+ color: #291104;
}
.alert-danger {
- color: #4a2e58;
- background-color: #e9deee;
- border-color: #e0d1e7;
+ color: #792c00;
+ background-color: #faddcc;
+ border-color: #f9cfb8;
}
.alert-danger hr {
- border-top-color: #d5c0de;
+ border-top-color: #f7bfa0;
}
.alert-danger .alert-link {
- color: #2e1c37;
+ color: #461900;
+}
+
+.alert-light {
+ color: #3e3e3e;
+ background-color: #e4e4e4;
+ border-color: #d9d9d9;
+}
+
+.alert-light hr {
+ border-top-color: #cccccc;
+}
+
+.alert-light .alert-link {
+ color: #252525;
+}
+
+.alert-dark {
+ color: #1a1a1a;
+ background-color: #d6d6d6;
+ border-color: #c6c6c6;
+}
+
+.alert-dark hr {
+ border-top-color: #b9b9b9;
+}
+
+.alert-dark .alert-link {
+ color: #010101;
}
@-webkit-keyframes progress-bar-stripes {
@@ -4510,123 +4841,195 @@ tbody.collapse.show {
}
.list-group-item-primary {
- color: #292957;
- background-color: #cecee7;
+ color: #5d3609;
+ background-color: #e9d5bd;
}
a.list-group-item-primary,
button.list-group-item-primary {
- color: #292957;
+ color: #5d3609;
}
a.list-group-item-primary:focus, a.list-group-item-primary:hover,
button.list-group-item-primary:focus,
button.list-group-item-primary:hover {
- color: #292957;
- background-color: #bdbddf;
+ color: #5d3609;
+ background-color: #e3c9aa;
}
a.list-group-item-primary.active,
button.list-group-item-primary.active {
color: #fff;
- background-color: #292957;
- border-color: #292957;
+ background-color: #5d3609;
+ border-color: #5d3609;
+}
+
+.list-group-item-secondary {
+ color: #2c0057;
+ background-color: #cfb8e7;
+}
+
+a.list-group-item-secondary,
+button.list-group-item-secondary {
+ color: #2c0057;
+}
+
+a.list-group-item-secondary:focus, a.list-group-item-secondary:hover,
+button.list-group-item-secondary:focus,
+button.list-group-item-secondary:hover {
+ color: #2c0057;
+ background-color: #c2a5e1;
+}
+
+a.list-group-item-secondary.active,
+button.list-group-item-secondary.active {
+ color: #fff;
+ background-color: #2c0057;
+ border-color: #2c0057;
}
.list-group-item-success {
- color: #1f471f;
- background-color: #c8dec8;
+ color: #0f3705;
+ background-color: #bfd5ba;
}
a.list-group-item-success,
button.list-group-item-success {
- color: #1f471f;
+ color: #0f3705;
}
a.list-group-item-success:focus, a.list-group-item-success:hover,
button.list-group-item-success:focus,
button.list-group-item-success:hover {
- color: #1f471f;
- background-color: #b8d4b8;
+ color: #0f3705;
+ background-color: #b0cbaa;
}
a.list-group-item-success.active,
button.list-group-item-success.active {
color: #fff;
- background-color: #1f471f;
- border-color: #1f471f;
+ background-color: #0f3705;
+ border-color: #0f3705;
}
.list-group-item-info {
- color: #004242;
- background-color: #b8dbdb;
+ color: #0a074a;
+ background-color: #bdbce0;
}
a.list-group-item-info,
button.list-group-item-info {
- color: #004242;
+ color: #0a074a;
}
a.list-group-item-info:focus, a.list-group-item-info:hover,
button.list-group-item-info:focus,
button.list-group-item-info:hover {
- color: #004242;
- background-color: #a7d2d2;
+ color: #0a074a;
+ background-color: #acabd8;
}
a.list-group-item-info.active,
button.list-group-item-info.active {
color: #fff;
- background-color: #004242;
- border-color: #004242;
+ background-color: #0a074a;
+ border-color: #0a074a;
}
.list-group-item-warning {
- color: #535a18;
- background-color: #e4e8c4;
+ color: #572509;
+ background-color: #e7cbbc;
}
a.list-group-item-warning,
button.list-group-item-warning {
- color: #535a18;
+ color: #572509;
}
a.list-group-item-warning:focus, a.list-group-item-warning:hover,
button.list-group-item-warning:focus,
button.list-group-item-warning:hover {
- color: #535a18;
- background-color: #dce1b2;
+ color: #572509;
+ background-color: #e0bca9;
}
a.list-group-item-warning.active,
button.list-group-item-warning.active {
color: #fff;
- background-color: #535a18;
- border-color: #535a18;
+ background-color: #572509;
+ border-color: #572509;
}
.list-group-item-danger {
- color: #4a2e58;
- background-color: #e0d1e7;
+ color: #792c00;
+ background-color: #f9cfb8;
}
a.list-group-item-danger,
button.list-group-item-danger {
- color: #4a2e58;
+ color: #792c00;
}
a.list-group-item-danger:focus, a.list-group-item-danger:hover,
button.list-group-item-danger:focus,
button.list-group-item-danger:hover {
- color: #4a2e58;
- background-color: #d5c0de;
+ color: #792c00;
+ background-color: #f7bfa0;
}
a.list-group-item-danger.active,
button.list-group-item-danger.active {
color: #fff;
- background-color: #4a2e58;
- border-color: #4a2e58;
+ background-color: #792c00;
+ border-color: #792c00;
+}
+
+.list-group-item-light {
+ color: #3e3e3e;
+ background-color: #d9d9d9;
+}
+
+a.list-group-item-light,
+button.list-group-item-light {
+ color: #3e3e3e;
+}
+
+a.list-group-item-light:focus, a.list-group-item-light:hover,
+button.list-group-item-light:focus,
+button.list-group-item-light:hover {
+ color: #3e3e3e;
+ background-color: #cccccc;
+}
+
+a.list-group-item-light.active,
+button.list-group-item-light.active {
+ color: #fff;
+ background-color: #3e3e3e;
+ border-color: #3e3e3e;
+}
+
+.list-group-item-dark {
+ color: #1a1a1a;
+ background-color: #c6c6c6;
+}
+
+a.list-group-item-dark,
+button.list-group-item-dark {
+ color: #1a1a1a;
+}
+
+a.list-group-item-dark:focus, a.list-group-item-dark:hover,
+button.list-group-item-dark:focus,
+button.list-group-item-dark:hover {
+ color: #1a1a1a;
+ background-color: #b9b9b9;
+}
+
+a.list-group-item-dark.active,
+button.list-group-item-dark.active {
+ color: #fff;
+ background-color: #1a1a1a;
+ border-color: #1a1a1a;
}
.close {
@@ -5310,43 +5713,67 @@ button.close {
}
.bg-primary {
- background-color: #4f4fa8 !important;
+ background-color: #B26812 !important;
}
a.bg-primary:focus, a.bg-primary:hover {
- background-color: #3f3f85 !important;
+ background-color: #844d0d !important;
+}
+
+.bg-secondary {
+ background-color: #5400A8 !important;
+}
+
+a.bg-secondary:focus, a.bg-secondary:hover {
+ background-color: #3b0075 !important;
}
.bg-success {
- background-color: #3c883c !important;
+ background-color: #1C690A !important;
}
a.bg-success:focus, a.bg-success:hover {
- background-color: #2c652c !important;
+ background-color: #103a06 !important;
}
.bg-info {
- background-color: #007f7f !important;
+ background-color: #130E8F !important;
}
a.bg-info:focus, a.bg-info:hover {
- background-color: #004c4c !important;
+ background-color: #0d0961 !important;
}
.bg-warning {
- background-color: #a0ad2e !important;
+ background-color: #A84711 !important;
}
a.bg-warning:focus, a.bg-warning:hover {
- background-color: #7b8523 !important;
+ background-color: #7a330c !important;
}
.bg-danger {
- background-color: #8f59a9 !important;
+ background-color: #E85400 !important;
}
a.bg-danger:focus, a.bg-danger:hover {
- background-color: #734788 !important;
+ background-color: #b54200 !important;
+}
+
+.bg-light {
+ background-color: #777777 !important;
+}
+
+a.bg-light:focus, a.bg-light:hover {
+ background-color: #5e5e5e !important;
+}
+
+.bg-dark {
+ background-color: #323232 !important;
+}
+
+a.bg-dark:focus, a.bg-dark:hover {
+ background-color: #191919 !important;
}
.bg-white {
@@ -5382,23 +5809,35 @@ a.bg-danger:focus, a.bg-danger:hover {
}
.border-primary {
- border-color: #4f4fa8 !important;
+ border-color: #B26812 !important;
+}
+
+.border-secondary {
+ border-color: #5400A8 !important;
}
.border-success {
- border-color: #3c883c !important;
+ border-color: #1C690A !important;
}
.border-info {
- border-color: #007f7f !important;
+ border-color: #130E8F !important;
}
.border-warning {
- border-color: #a0ad2e !important;
+ border-color: #A84711 !important;
}
.border-danger {
- border-color: #8f59a9 !important;
+ border-color: #E85400 !important;
+}
+
+.border-light {
+ border-color: #777777 !important;
+}
+
+.border-dark {
+ border-color: #323232 !important;
}
.border-white {
@@ -7898,43 +8337,67 @@ a.bg-danger:focus, a.bg-danger:hover {
}
.text-primary {
- color: #4f4fa8 !important;
+ color: #B26812 !important;
}
a.text-primary:focus, a.text-primary:hover {
- color: #3f3f85 !important;
+ color: #844d0d !important;
+}
+
+.text-secondary {
+ color: #5400A8 !important;
+}
+
+a.text-secondary:focus, a.text-secondary:hover {
+ color: #3b0075 !important;
}
.text-success {
- color: #3c883c !important;
+ color: #1C690A !important;
}
a.text-success:focus, a.text-success:hover {
- color: #2c652c !important;
+ color: #103a06 !important;
}
.text-info {
- color: #007f7f !important;
+ color: #130E8F !important;
}
a.text-info:focus, a.text-info:hover {
- color: #004c4c !important;
+ color: #0d0961 !important;
}
.text-warning {
- color: #a0ad2e !important;
+ color: #A84711 !important;
}
a.text-warning:focus, a.text-warning:hover {
- color: #7b8523 !important;
+ color: #7a330c !important;
}
.text-danger {
- color: #8f59a9 !important;
+ color: #E85400 !important;
}
a.text-danger:focus, a.text-danger:hover {
- color: #734788 !important;
+ color: #b54200 !important;
+}
+
+.text-light {
+ color: #777777 !important;
+}
+
+a.text-light:focus, a.text-light:hover {
+ color: #5e5e5e !important;
+}
+
+.text-dark {
+ color: #323232 !important;
+}
+
+a.text-dark:focus, a.text-dark:hover {
+ color: #191919 !important;
}
.text-muted {
@@ -8274,7 +8737,7 @@ a.tobago-link.dropdown-item img, a.tobago-link.dropdown-item span {
}
button.tobago-link, button.tobago-treeCommand {
- color: #007bff;
+ color: #130E8F;
border-width: 0;
padding: 0;
background-color: transparent;
@@ -9098,7 +9561,7 @@ th.tobago-sheet-headerCell-markup-filler > .tobago-sheet-header {
.tobago-selectOneListbox-markup-error.border-danger:focus,
.tobago-textarea-markup-fatal.border-danger:focus,
.tobago-textarea-markup-error.border-danger:focus {
- box-shadow: 0 0 0 0.2rem rgba(143, 89, 169, 0.25);
+ box-shadow: 0 0 0 0.2rem rgba(232, 84, 0, 0.25);
}
.tobago-date-markup-warn.border-warning:focus,
@@ -9107,7 +9570,7 @@ th.tobago-sheet-headerCell-markup-filler > .tobago-sheet-header {
.tobago-selectOneChoice-markup-warn.border-warning:focus,
.tobago-selectOneListbox-markup-warn.border-warning:focus,
.tobago-textarea-markup-warn.border-warning:focus {
- box-shadow: 0 0 0 0.2rem rgba(160, 173, 46, 0.25);
+ box-shadow: 0 0 0 0.2rem rgba(168, 71, 17, 0.25);
}
.tobago-date-markup-info.border-info:focus,
@@ -9116,7 +9579,7 @@ th.tobago-sheet-headerCell-markup-filler > .tobago-sheet-header {
.tobago-selectOneChoice-markup-info.border-info:focus,
.tobago-selectOneListbox-markup-info.border-info:focus,
.tobago-textarea-markup-info.border-info:focus {
- box-shadow: 0 0 0 0.2rem rgba(0, 127, 127, 0.25);
+ box-shadow: 0 0 0 0.2rem rgba(19, 14, 143, 0.25);
}
/* menuStore -------------------------------------------------------- */
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 a73b124..20eab4a 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/_print.scss","../../scss/_reboot.scss","../../scss/_variables.scss","../../scss/mixins/_hover.scss","../../scss/_type.scss","../../scss/mixins/_lists.scss","../../scss/_images.scss","../../scss/mixins/_image.scss","../../scss/mixins/_border-radius.scss","../../scss/mixins/_transition.scss","../../scss/_code.scss","../../scss/_grid.scss","../../scss/mixins/_gri [...]
\ No newline at end of file
+{"version":3,"sources":["bootstrap.css","../../scss/bootstrap.scss","../../scss/_custom.scss","../../scss/_root.scss","../../scss/_print.scss","../../scss/_reboot.scss","../../scss/_variables.scss","../../scss/mixins/_hover.scss","../../scss/_type.scss","../../scss/mixins/_lists.scss","../../scss/_images.scss","../../scss/mixins/_image.scss","../../scss/mixins/_border-radius.scss","../../scss/mixins/_transition.scss","../../scss/_code.scss","../../scss/_grid.scss","../../scss/mixins/_gri [...]
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-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 645b499..888bbd1 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-2017 The Bootstrap Authors
* Copyright 2011-2017 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- */:root{--blue:#007bff;--indigo:#6610f2;--purple:#6f42c1;--pink:#e83e8c;--red:#dc3545;--orange:#fd7e14;--yellow:#ffc107;--green:#28a745;--teal:#20c997;--cyan:#17a2b8;--white:#fff;--gray:#868e96;--gray-dark:#343a40;--primary:#4f4fa8;--success:#3c883c;--info:#007f7f;--warning:#a0ad2e;--danger:#8f59a9;--breakpoint-xs:0;--breakpoint-sm:576px;--breakpoint-md:768px;--breakpoint-lg:992px;--breakpoint-xl:1200px;--font-family-sans-serif:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helveti [...]
+ */@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 28c7f98..bf38ab8 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/_root.scss","../../scss/_print.scss","dist/css/bootstrap.css","../../scss/_reboot.scss","bootstrap.css","../../scss/mixins/_hover.scss","../../scss/_type.scss","../../scss/mixins/_lists.scss","../../scss/_images.scss","../../scss/mixins/_image.scss","../../scss/mixins/_border-radius.scss","../../scss/mixins/_transition.scss","../../scss/_code.scss","../../scss/_grid.scss","../../scss/mixins/_grid.scss","../../scss/mixins/_br [...]
\ No newline at end of file
+{"version":3,"sources":["../../scss/bootstrap.scss","../../scss/_custom.scss","../../scss/_root.scss","../../scss/_print.scss","dist/css/bootstrap.css","../../scss/_reboot.scss","bootstrap.css","../../scss/mixins/_hover.scss","../../scss/_type.scss","../../scss/mixins/_lists.scss","../../scss/_images.scss","../../scss/mixins/_image.scss","../../scss/mixins/_border-radius.scss","../../scss/mixins/_transition.scss","../../scss/_code.scss","../../scss/_grid.scss","../../scss/mixins/_grid.sc [...]
\ 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/fonts/Amaranth-Bold.otf b/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/fonts/Amaranth-Bold.otf
new file mode 100755
index 0000000..b8b09a8
Binary files /dev/null and b/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/fonts/Amaranth-Bold.otf differ
diff --git a/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/fonts/Amaranth-BoldItalic.otf b/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/fonts/Amaranth-BoldItalic.otf
new file mode 100755
index 0000000..610667d
Binary files /dev/null and b/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/fonts/Amaranth-BoldItalic.otf differ
diff --git a/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/fonts/Amaranth-Italic.otf b/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/fonts/Amaranth-Italic.otf
new file mode 100755
index 0000000..2dfaca7
Binary files /dev/null and b/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/fonts/Amaranth-Italic.otf differ
diff --git a/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/fonts/Amaranth-Regular.otf b/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/fonts/Amaranth-Regular.otf
new file mode 100755
index 0000000..22b38fd
Binary files /dev/null and b/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/fonts/Amaranth-Regular.otf differ
diff --git a/tobago-theme/tobago-theme-roxborough/src/main/scss/_custom.scss b/tobago-theme/tobago-theme-roxborough/src/main/scss/_custom.scss
index 50d0ed2..4d5763f 100644
--- a/tobago-theme/tobago-theme-roxborough/src/main/scss/_custom.scss
+++ b/tobago-theme/tobago-theme-roxborough/src/main/scss/_custom.scss
@@ -20,24 +20,79 @@
// Copy variables from `_variables.scss` to this file to override default values
// without modifying source files.
-$theme-colors: (
- primary: #4f4fa8,
- success: #3c883c,
- info: #007f7f,
- warning: #a0ad2e,
- danger: #8f59a9
-);
+$orange: #B26812;
+$green: #1C690A;
+$blue: #130E8F;
+$dark-orange: #A84711;
+$light-orange: #E85400;
+$purple: #5400A8;
+$gray-600: #777777;
+$gray-800: #323232;
+$black: #000000;
-$body-bg: #000000;
-$body-color: #808080;
+$primary: $orange;
+$secondary: $purple;
+$success: $green;
+$info: $blue;
+$warning: $dark-orange;
+$danger: $light-orange;
+$light: $gray-600;
+$dark: $gray-800;
-$input-bg: #505050;
+$theme-colors: ();
+$theme-colors: map-merge((
+ "primary": $primary,
+ "secondary": $secondary,
+ "success": $success,
+ "info": $info,
+ "warning": $warning,
+ "danger": $danger,
+ "light": $light,
+ "dark": $dark
+), $theme-colors);
+
+$body-bg: $black;
+$body-color: $gray-600;
+
+$input-bg: $gray-600;
$navbar-light-color: #606060;
$navbar-light-active-color: #707070;
$navbar-light-hover-color: #808080;
$navbar-light-disabled-color: #505050;
-$card-bg: #000000;
-$card-border-color: #505050;
+$card-bg: $black;
+$card-border-color: $gray-600;
$card-border-width: 2px;
+$card-cap-bg: $gray-800;
+
+@font-face {
+ font-family: 'Amaranth';
+ font-style: normal;
+ font-weight: normal;
+ src: url('../fonts/Amaranth-Regular.otf') format('opentype');
+}
+
+@font-face {
+ font-family: 'Amaranth';
+ font-style: normal;
+ font-weight: bold;
+ 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: bold;
+ src: url('../fonts/Amaranth-BoldItalic.otf') format('opentype');
+}
+
+.tobago-section-header, .tobago-box-header {
+ font-family: Amaranth, Arial, serif;
+}
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.