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 2020/07/30 08:02:26 UTC

[myfaces-tobago] branch master updated: Demo web page * update bootstrap * update release version 4.5.0

This is an automated email from the ASF dual-hosted git repository.

lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git


The following commit(s) were added to refs/heads/master by this push:
     new 984bb15  Demo web page * update bootstrap * update release version 4.5.0
984bb15 is described below

commit 984bb15e2c45c205e92bec2ebb96b38e2ce93388
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Thu Jul 30 10:02:04 2020 +0200

    Demo web page
    * update bootstrap
    * update release version 4.5.0
---
 .../src/main/tobago-vm/docker/apache-proxy/bootstrap-4.4.1.min.css | 7 -------
 .../main/tobago-vm/docker/apache-proxy/bootstrap-4.4.1.min.css.map | 7 -------
 .../src/main/tobago-vm/docker/apache-proxy/bootstrap.min.css       | 7 +++++++
 .../src/main/tobago-vm/docker/apache-proxy/bootstrap.min.css.map   | 1 +
 .../src/main/tobago-vm/docker/apache-proxy/index.html              | 6 +++---
 .../src/main/tobago-vm/docker/docker-compose.yml                   | 2 +-
 6 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/bootstrap-4.4.1.min.css b/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/bootstrap-4.4.1.min.css
deleted file mode 100644
index 86b6845..0000000
--- a/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/bootstrap-4.4.1.min.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/*!
- * Bootstrap v4.4.1 (https://getbootstrap.com/)
- * Copyright 2011-2019 The Bootstrap Authors
- * Copyright 2011-2019 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- */:root{--blue:#007bff;--indigo:#6610f2;--purple:#6f42c1;--pink:#e83e8c;--red:#dc3545;--orange:#fd7e14;--yellow:#ffc107;--green:#28a745;--teal:#20c997;--cyan:#17a2b8;--white:#fff;--gray:#6c757d;--gray-dark:#343a40;--primary:#007bff;--secondary:#6c757d;--success:#28a745;--info:#17a2b8;--warning:#ffc107;--danger:#dc3545;--light:#f8f9fa;--dark:#343a40;--breakpoint-xs:0;--breakpoint-sm:576px;--breakpoint-md:768px;--breakpoint-lg:992px;--breakpoint-xl:1200px;--font-family-sans-serif:-apple-s [...]
-/*# sourceMappingURL=bootstrap.min.css.map */
\ No newline at end of file
diff --git a/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/bootstrap-4.4.1.min.css.map b/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/bootstrap-4.4.1.min.css.map
deleted file mode 100644
index 86b6845..0000000
--- a/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/bootstrap-4.4.1.min.css.map
+++ /dev/null
@@ -1,7 +0,0 @@
-/*!
- * Bootstrap v4.4.1 (https://getbootstrap.com/)
- * Copyright 2011-2019 The Bootstrap Authors
- * Copyright 2011-2019 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- */:root{--blue:#007bff;--indigo:#6610f2;--purple:#6f42c1;--pink:#e83e8c;--red:#dc3545;--orange:#fd7e14;--yellow:#ffc107;--green:#28a745;--teal:#20c997;--cyan:#17a2b8;--white:#fff;--gray:#6c757d;--gray-dark:#343a40;--primary:#007bff;--secondary:#6c757d;--success:#28a745;--info:#17a2b8;--warning:#ffc107;--danger:#dc3545;--light:#f8f9fa;--dark:#343a40;--breakpoint-xs:0;--breakpoint-sm:576px;--breakpoint-md:768px;--breakpoint-lg:992px;--breakpoint-xl:1200px;--font-family-sans-serif:-apple-s [...]
-/*# sourceMappingURL=bootstrap.min.css.map */
\ No newline at end of file
diff --git a/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/bootstrap.min.css b/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/bootstrap.min.css
new file mode 100644
index 0000000..d2ed5ee
--- /dev/null
+++ b/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/bootstrap.min.css
@@ -0,0 +1,7 @@
+/*!
+ * Bootstrap v5.0.0-alpha1 (https://getbootstrap.com/)
+ * Copyright 2011-2020 The Bootstrap Authors
+ * Copyright 2011-2020 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
+ */:root{--bs-blue:#0d6efd;--bs-indigo:#6610f2;--bs-purple:#6f42c1;--bs-pink:#d63384;--bs-red:#dc3545;--bs-orange:#fd7e14;--bs-yellow:#ffc107;--bs-green:#28a745;--bs-teal:#20c997;--bs-cyan:#17a2b8;--bs-white:#fff;--bs-gray:#6c757d;--bs-gray-dark:#343a40;--bs-primary:#0d6efd;--bs-secondary:#6c757d;--bs-success:#28a745;--bs-info:#17a2b8;--bs-warning:#ffc107;--bs-danger:#dc3545;--bs-light:#f8f9fa;--bs-dark:#343a40;--bs-font-sans-serif:system-ui,-apple-system,"Segoe UI",Roboto,"Helvetica Neu [...]
+/*# sourceMappingURL=bootstrap.min.css.map */
\ No newline at end of file
diff --git a/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/bootstrap.min.css.map b/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/bootstrap.min.css.map
new file mode 100644
index 0000000..42fb6e7
--- /dev/null
+++ b/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/bootstrap.min.css.map
@@ -0,0 +1 @@
+{"version":3,"sources":["../../scss/bootstrap.scss","../../scss/_root.scss","../../scss/_reboot.scss","dist/css/bootstrap.css","../../scss/vendor/_rfs.scss","bootstrap.css","../../scss/mixins/_border-radius.scss","../../scss/_type.scss","../../scss/mixins/_lists.scss","../../scss/_images.scss","../../scss/mixins/_image.scss","../../scss/_containers.scss","../../scss/mixins/_container.scss","../../scss/mixins/_breakpoints.scss","../../scss/_grid.scss","../../scss/mixins/_grid.scss","../.. [...]
\ No newline at end of file
diff --git a/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/index.html b/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/index.html
index 13f5a52..4c98b3a 100644
--- a/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/index.html
+++ b/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/index.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
   <title>Tobago Demo</title>
-  <link href="bootstrap-4.4.1.min.css" rel="stylesheet">
+  <link href="bootstrap.min.css" rel="stylesheet">
   <style>
     div.disabled {
       opacity: 0.3;
@@ -34,8 +34,8 @@
         },
         {
           major: "4",
-          release: "4.4.1",
-          staging: "4.5.0",
+          release: "4.5.0",
+          staging: "",
           snapshot: "4.5.1-SNAPSHOT",
           link: "4",
           archived: false
diff --git a/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/docker-compose.yml b/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/docker-compose.yml
index c4e1e06..6167978 100644
--- a/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/docker-compose.yml
+++ b/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/docker-compose.yml
@@ -89,7 +89,7 @@ services:
   demo-4-release:
     build: tomcat
     environment:
-      - TOBAGO_VERSION=4.4.1
+      - TOBAGO_VERSION=4.5.0
       - CONTEXT_PATH=demo-4-release
     volumes:
       - /opt/docker/artifacts:/opt/docker/artifacts