You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by hn...@apache.org on 2017/10/20 11:53:39 UTC
[myfaces-tobago] 01/02: TOBAGO-1759 Update Bootstrap to 4.0.0 beta
2 (from alpha 6) * update from beta1 to beta2 * tc:sheet use table-dark
instead of table-inverse
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 3014214db443b3288fe3c0f2c9663ab644059fab
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Fri Oct 20 13:52:39 2017 +0200
TOBAGO-1759 Update Bootstrap to 4.0.0 beta 2 (from alpha 6)
* update from beta1 to beta2
* tc:sheet use table-dark instead of table-inverse
---
.../myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java | 2 ++
.../org/apache/myfaces/tobago/renderkit/css/BootstrapClass.java | 7 ++++++-
tobago-theme/pom.xml | 6 +++---
.../src/main/patches/append-tobago-theme-to-bootstrap.patch | 4 ++--
.../src/main/patches/append-tobago-theme-to-bootstrap.patch | 4 ++--
.../src/main/patches/append-tobago-theme-to-bootstrap.patch | 4 ++--
.../src/main/patches/append-tobago-theme-to-bootstrap.patch | 4 ++--
.../src/main/patches/append-tobago-theme-to-bootstrap.patch | 4 ++--
.../src/main/resources/META-INF/tobago-config.xml | 2 +-
9 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java
index e8e5ee9..3d9de58 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java
@@ -480,6 +480,7 @@ public class SheetRenderer extends RendererBase {
BootstrapClass.TABLE,
TobagoClass.SHEET__HEADER_TABLE,
sheetMarkup.contains(Markup.INVERSE) ? BootstrapClass.TABLE_INVERSE : null,
+ sheetMarkup.contains(Markup.DARK) ? BootstrapClass.TABLE_DARK : null,
sheetMarkup.contains(Markup.BORDERED) ? BootstrapClass.TABLE_BORDERED : null,
sheetMarkup.contains(Markup.SMALL) ? BootstrapClass.TABLE_SM : null,
!autoLayout ? TobagoClass.TABLE_LAYOUT__FIXED : null);
@@ -505,6 +506,7 @@ public class SheetRenderer extends RendererBase {
BootstrapClass.TABLE,
TobagoClass.SHEET__BODY_TABLE,
sheetMarkup.contains(Markup.INVERSE) ? BootstrapClass.TABLE_INVERSE : null,
+ sheetMarkup.contains(Markup.DARK) ? BootstrapClass.TABLE_DARK : null,
sheetMarkup.contains(Markup.STRIPED) ? BootstrapClass.TABLE_STRIPED : null,
sheetMarkup.contains(Markup.BORDERED) ? BootstrapClass.TABLE_BORDERED : null,
sheetMarkup.contains(Markup.HOVER) ? BootstrapClass.TABLE_HOVER : null,
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClass.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClass.java
index ada9be2..71a35c1 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClass.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClass.java
@@ -394,9 +394,14 @@ public enum BootstrapClass implements CssItem {
TAB_PANE("tab-pane"),
TABLE("table"),
TABLE_BORDERED("table-bordered"),
+ TABLE_DARK("table-dark"),
TABLE_HOVER("table-hover"),
TABLE_INFO("table-info"),
- TABLE_INVERSE("table-inverse"),
+ /**
+ * @deprecated since 4.0.0, please use {@link #TABLE_DARK}
+ */
+ @Deprecated
+ TABLE_INVERSE("table-dark"),
TABLE_SM("table-sm"),
TABLE_STRIPED("table-striped");
diff --git a/tobago-theme/pom.xml b/tobago-theme/pom.xml
index b23a335..93acc7f 100644
--- a/tobago-theme/pom.xml
+++ b/tobago-theme/pom.xml
@@ -27,7 +27,7 @@
<artifactId>tobago-theme</artifactId>
<properties>
- <bootstrap.version>4.0.0-beta</bootstrap.version>
+ <bootstrap.version>4.0.0-beta.2</bootstrap.version>
</properties>
<build>
@@ -237,8 +237,8 @@
<!-- optional -->
<configuration>
- <nodeVersion>v6.10.2</nodeVersion>
- <npmVersion>3.10.10</npmVersion>
+ <nodeVersion>v7.10.1</nodeVersion>
+ <npmVersion>4.2.0</npmVersion>
<!-- optional: Where to download Node.js binary from. Defaults to http://nodejs.org/dist/ -->
<!--<nodeDownloadRoot>https://nodejs.org/dist/</nodeDownloadRoot>-->
diff --git a/tobago-theme/tobago-theme-charlotteville/src/main/patches/append-tobago-theme-to-bootstrap.patch b/tobago-theme/tobago-theme-charlotteville/src/main/patches/append-tobago-theme-to-bootstrap.patch
index 9f69d77..ff3c6af 100644
--- a/tobago-theme/tobago-theme-charlotteville/src/main/patches/append-tobago-theme-to-bootstrap.patch
+++ b/tobago-theme/tobago-theme-charlotteville/src/main/patches/append-tobago-theme-to-bootstrap.patch
@@ -11,10 +11,10 @@ Info: This patch is valid for Bootstrap 4 beta
+
+@import "custom";
+
+ @import "root";
@import "print";
@import "reboot";
- @import "type";
-@@ -39,3 +42,6 @@
+@@ -40,3 +43,6 @@
@import "popover";
@import "carousel";
@import "utilities";
diff --git a/tobago-theme/tobago-theme-richmond/src/main/patches/append-tobago-theme-to-bootstrap.patch b/tobago-theme/tobago-theme-richmond/src/main/patches/append-tobago-theme-to-bootstrap.patch
index 9f69d77..ff3c6af 100644
--- a/tobago-theme/tobago-theme-richmond/src/main/patches/append-tobago-theme-to-bootstrap.patch
+++ b/tobago-theme/tobago-theme-richmond/src/main/patches/append-tobago-theme-to-bootstrap.patch
@@ -11,10 +11,10 @@ Info: This patch is valid for Bootstrap 4 beta
+
+@import "custom";
+
+ @import "root";
@import "print";
@import "reboot";
- @import "type";
-@@ -39,3 +42,6 @@
+@@ -40,3 +43,6 @@
@import "popover";
@import "carousel";
@import "utilities";
diff --git a/tobago-theme/tobago-theme-scarborough/src/main/patches/append-tobago-theme-to-bootstrap.patch b/tobago-theme/tobago-theme-scarborough/src/main/patches/append-tobago-theme-to-bootstrap.patch
index 9f69d77..ff3c6af 100644
--- a/tobago-theme/tobago-theme-scarborough/src/main/patches/append-tobago-theme-to-bootstrap.patch
+++ b/tobago-theme/tobago-theme-scarborough/src/main/patches/append-tobago-theme-to-bootstrap.patch
@@ -11,10 +11,10 @@ Info: This patch is valid for Bootstrap 4 beta
+
+@import "custom";
+
+ @import "root";
@import "print";
@import "reboot";
- @import "type";
-@@ -39,3 +42,6 @@
+@@ -40,3 +43,6 @@
@import "popover";
@import "carousel";
@import "utilities";
diff --git a/tobago-theme/tobago-theme-speyside/src/main/patches/append-tobago-theme-to-bootstrap.patch b/tobago-theme/tobago-theme-speyside/src/main/patches/append-tobago-theme-to-bootstrap.patch
index 9f69d77..ff3c6af 100644
--- a/tobago-theme/tobago-theme-speyside/src/main/patches/append-tobago-theme-to-bootstrap.patch
+++ b/tobago-theme/tobago-theme-speyside/src/main/patches/append-tobago-theme-to-bootstrap.patch
@@ -11,10 +11,10 @@ Info: This patch is valid for Bootstrap 4 beta
+
+@import "custom";
+
+ @import "root";
@import "print";
@import "reboot";
- @import "type";
-@@ -39,3 +42,6 @@
+@@ -40,3 +43,6 @@
@import "popover";
@import "carousel";
@import "utilities";
diff --git a/tobago-theme/tobago-theme-standard/src/main/patches/append-tobago-theme-to-bootstrap.patch b/tobago-theme/tobago-theme-standard/src/main/patches/append-tobago-theme-to-bootstrap.patch
index 9f69d77..ff3c6af 100644
--- a/tobago-theme/tobago-theme-standard/src/main/patches/append-tobago-theme-to-bootstrap.patch
+++ b/tobago-theme/tobago-theme-standard/src/main/patches/append-tobago-theme-to-bootstrap.patch
@@ -11,10 +11,10 @@ Info: This patch is valid for Bootstrap 4 beta
+
+@import "custom";
+
+ @import "root";
@import "print";
@import "reboot";
- @import "type";
-@@ -39,3 +42,6 @@
+@@ -40,3 +43,6 @@
@import "popover";
@import "carousel";
@import "utilities";
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml b/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
index e382e75..8afd2be 100644
--- a/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
@@ -280,9 +280,9 @@
<markup>left</markup>
<markup>center</markup>
<markup>right</markup>
- <markup>inverse</markup>
<markup>striped</markup>
<markup>bordered</markup>
+ <markup>dark</markup>
<markup>hover</markup>
<markup>small</markup>
</supported-markup>
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.