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 2021/07/02 11:27:04 UTC
[myfaces-tobago] branch master updated (a0973f9 -> 87454d6)
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git.
from a0973f9 build(deps-dev): bump rollup from 2.52.4 to 2.52.6
new 99b077e fix: flowLayout
new 87454d6 build(theme): rebuild after fix flowLayout
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../internal/renderkit/renderer/LabelLayoutRendererBase.java | 11 +++++++++++
.../org/apache/myfaces/tobago/renderkit/css/TobagoClass.java | 1 +
.../src/test/resources/renderer/in/label-flowLeft.html | 2 +-
.../src/test/resources/renderer/in/label-flowRight.html | 2 +-
tobago-theme/src/main/scss/_tobago.scss | 5 +++++
.../tobago-theme-charlotteville/src/main/css/tobago.css | 5 +++++
.../tobago-theme-charlotteville/src/main/css/tobago.css.map | 2 +-
tobago-theme/tobago-theme-roxborough/src/main/css/tobago.css | 5 +++++
.../tobago-theme-roxborough/src/main/css/tobago.css.map | 2 +-
tobago-theme/tobago-theme-scarborough/src/main/css/tobago.css | 5 +++++
.../tobago-theme-scarborough/src/main/css/tobago.css.map | 2 +-
tobago-theme/tobago-theme-speyside/src/main/css/tobago.css | 5 +++++
.../tobago-theme-speyside/src/main/css/tobago.css.map | 2 +-
tobago-theme/tobago-theme-standard/src/main/css/tobago.css | 5 +++++
.../tobago-theme-standard/src/main/css/tobago.css.map | 2 +-
15 files changed, 49 insertions(+), 7 deletions(-)
[myfaces-tobago] 02/02: build(theme): rebuild after fix flowLayout
Posted by hn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 87454d64214796b4405f753cca95dce42042cdcf
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Fri Jul 2 13:12:00 2021 +0200
build(theme): rebuild after fix flowLayout
---
tobago-theme/tobago-theme-charlotteville/src/main/css/tobago.css | 5 +++++
tobago-theme/tobago-theme-charlotteville/src/main/css/tobago.css.map | 2 +-
tobago-theme/tobago-theme-roxborough/src/main/css/tobago.css | 5 +++++
tobago-theme/tobago-theme-roxborough/src/main/css/tobago.css.map | 2 +-
tobago-theme/tobago-theme-scarborough/src/main/css/tobago.css | 5 +++++
tobago-theme/tobago-theme-scarborough/src/main/css/tobago.css.map | 2 +-
tobago-theme/tobago-theme-speyside/src/main/css/tobago.css | 5 +++++
tobago-theme/tobago-theme-speyside/src/main/css/tobago.css.map | 2 +-
tobago-theme/tobago-theme-standard/src/main/css/tobago.css | 5 +++++
tobago-theme/tobago-theme-standard/src/main/css/tobago.css.map | 2 +-
10 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/tobago-theme/tobago-theme-charlotteville/src/main/css/tobago.css b/tobago-theme/tobago-theme-charlotteville/src/main/css/tobago.css
index f387a63..f6333eb 100644
--- a/tobago-theme/tobago-theme-charlotteville/src/main/css/tobago.css
+++ b/tobago-theme/tobago-theme-charlotteville/src/main/css/tobago.css
@@ -11051,6 +11051,11 @@ textarea.form-control-lg {
*/
/* used bootstrap icons ---------------------------------------------------- */
/* non-bootstrap variables --------------------------------------- */
+/* utilities ----------------------------------------------------- */
+.tobago-display-inline-block {
+ display: inline-block;
+}
+
/* main ---------------------------------------------------------- */
.tobago-auto-spacing {
/* Since bootstrap 5.0.0-alpha1 class "form-group" is removed. In the Bootstrap demo "form-group" is replaced with
diff --git a/tobago-theme/tobago-theme-charlotteville/src/main/css/tobago.css.map b/tobago-theme/tobago-theme-charlotteville/src/main/css/tobago.css.map
index 69efada..6291791 100644
--- a/tobago-theme/tobago-theme-charlotteville/src/main/css/tobago.css.map
+++ b/tobago-theme/tobago-theme-charlotteville/src/main/css/tobago.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../scss/tobago-theme.scss","../scss/_custom.scss","../../../../node_modules/bootstrap/scss/bootstrap.scss","../../../../node_modules/bootstrap/scss/_root.scss","../../../../node_modules/bootstrap/scss/_reboot.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/mixins/_border-radius.scss","../../../../node_modules/bootstrap/scss/_type.scs [...]
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["../scss/tobago-theme.scss","../scss/_custom.scss","../../../../node_modules/bootstrap/scss/bootstrap.scss","../../../../node_modules/bootstrap/scss/_root.scss","../../../../node_modules/bootstrap/scss/_reboot.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/mixins/_border-radius.scss","../../../../node_modules/bootstrap/scss/_type.scs [...]
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-roxborough/src/main/css/tobago.css b/tobago-theme/tobago-theme-roxborough/src/main/css/tobago.css
index e03c1c8..fa4e530 100644
--- a/tobago-theme/tobago-theme-roxborough/src/main/css/tobago.css
+++ b/tobago-theme/tobago-theme-roxborough/src/main/css/tobago.css
@@ -11074,6 +11074,11 @@ textarea.form-control-lg {
*/
/* used bootstrap icons ---------------------------------------------------- */
/* non-bootstrap variables --------------------------------------- */
+/* utilities ----------------------------------------------------- */
+.tobago-display-inline-block {
+ display: inline-block;
+}
+
/* main ---------------------------------------------------------- */
.tobago-auto-spacing {
/* Since bootstrap 5.0.0-alpha1 class "form-group" is removed. In the Bootstrap demo "form-group" is replaced with
diff --git a/tobago-theme/tobago-theme-roxborough/src/main/css/tobago.css.map b/tobago-theme/tobago-theme-roxborough/src/main/css/tobago.css.map
index 437ed1b..46ab366 100644
--- a/tobago-theme/tobago-theme-roxborough/src/main/css/tobago.css.map
+++ b/tobago-theme/tobago-theme-roxborough/src/main/css/tobago.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../scss/tobago-theme.scss","../scss/_custom.scss","../../../../node_modules/bootstrap/scss/bootstrap.scss","../../../../node_modules/bootstrap/scss/_root.scss","../../../../node_modules/bootstrap/scss/_reboot.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/mixins/_border-radius.scss","../../../../node_modules/bootstrap/scss/_type.scs [...]
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["../scss/tobago-theme.scss","../scss/_custom.scss","../../../../node_modules/bootstrap/scss/bootstrap.scss","../../../../node_modules/bootstrap/scss/_root.scss","../../../../node_modules/bootstrap/scss/_reboot.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/mixins/_border-radius.scss","../../../../node_modules/bootstrap/scss/_type.scs [...]
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-scarborough/src/main/css/tobago.css b/tobago-theme/tobago-theme-scarborough/src/main/css/tobago.css
index 6eff3b3..e9fa83b 100644
--- a/tobago-theme/tobago-theme-scarborough/src/main/css/tobago.css
+++ b/tobago-theme/tobago-theme-scarborough/src/main/css/tobago.css
@@ -11061,6 +11061,11 @@ textarea.form-control-lg {
*/
/* used bootstrap icons ---------------------------------------------------- */
/* non-bootstrap variables --------------------------------------- */
+/* utilities ----------------------------------------------------- */
+.tobago-display-inline-block {
+ display: inline-block;
+}
+
/* main ---------------------------------------------------------- */
.tobago-auto-spacing {
/* Since bootstrap 5.0.0-alpha1 class "form-group" is removed. In the Bootstrap demo "form-group" is replaced with
diff --git a/tobago-theme/tobago-theme-scarborough/src/main/css/tobago.css.map b/tobago-theme/tobago-theme-scarborough/src/main/css/tobago.css.map
index fdd51b6..6cb9720 100644
--- a/tobago-theme/tobago-theme-scarborough/src/main/css/tobago.css.map
+++ b/tobago-theme/tobago-theme-scarborough/src/main/css/tobago.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../scss/tobago-theme.scss","../../../../node_modules/bootstrap/scss/bootstrap.scss","../../../../node_modules/bootstrap/scss/_root.scss","../../../../node_modules/bootstrap/scss/_reboot.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/mixins/_border-radius.scss","../../../../node_modules/bootstrap/scss/_type.scss","../../../../node_mo [...]
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["../scss/tobago-theme.scss","../../../../node_modules/bootstrap/scss/bootstrap.scss","../../../../node_modules/bootstrap/scss/_root.scss","../../../../node_modules/bootstrap/scss/_reboot.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/mixins/_border-radius.scss","../../../../node_modules/bootstrap/scss/_type.scss","../../../../node_mo [...]
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-speyside/src/main/css/tobago.css b/tobago-theme/tobago-theme-speyside/src/main/css/tobago.css
index 22e7a97..f3317ca 100644
--- a/tobago-theme/tobago-theme-speyside/src/main/css/tobago.css
+++ b/tobago-theme/tobago-theme-speyside/src/main/css/tobago.css
@@ -10762,6 +10762,11 @@ textarea.form-control-lg {
*/
/* used bootstrap icons ---------------------------------------------------- */
/* non-bootstrap variables --------------------------------------- */
+/* utilities ----------------------------------------------------- */
+.tobago-display-inline-block {
+ display: inline-block;
+}
+
/* main ---------------------------------------------------------- */
.tobago-auto-spacing {
/* Since bootstrap 5.0.0-alpha1 class "form-group" is removed. In the Bootstrap demo "form-group" is replaced with
diff --git a/tobago-theme/tobago-theme-speyside/src/main/css/tobago.css.map b/tobago-theme/tobago-theme-speyside/src/main/css/tobago.css.map
index 30548aa..76edb2d 100644
--- a/tobago-theme/tobago-theme-speyside/src/main/css/tobago.css.map
+++ b/tobago-theme/tobago-theme-speyside/src/main/css/tobago.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../scss/tobago-theme.scss","../scss/_custom.scss","../../../../node_modules/bootstrap/scss/bootstrap.scss","../../../../node_modules/bootstrap/scss/_root.scss","../../../../node_modules/bootstrap/scss/_reboot.scss","../../../../node_modules/bootstrap/scss/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/_type.scss","../../../../node_modules/bootstrap/scss/mixins/_lists.scss","../. [...]
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["../scss/tobago-theme.scss","../scss/_custom.scss","../../../../node_modules/bootstrap/scss/bootstrap.scss","../../../../node_modules/bootstrap/scss/_root.scss","../../../../node_modules/bootstrap/scss/_reboot.scss","../../../../node_modules/bootstrap/scss/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/_type.scss","../../../../node_modules/bootstrap/scss/mixins/_lists.scss","../. [...]
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-standard/src/main/css/tobago.css b/tobago-theme/tobago-theme-standard/src/main/css/tobago.css
index 835c35a..1b1ca77 100644
--- a/tobago-theme/tobago-theme-standard/src/main/css/tobago.css
+++ b/tobago-theme/tobago-theme-standard/src/main/css/tobago.css
@@ -11031,6 +11031,11 @@ textarea.form-control-lg {
*/
/* used bootstrap icons ---------------------------------------------------- */
/* non-bootstrap variables --------------------------------------- */
+/* utilities ----------------------------------------------------- */
+.tobago-display-inline-block {
+ display: inline-block;
+}
+
/* main ---------------------------------------------------------- */
.tobago-auto-spacing {
/* Since bootstrap 5.0.0-alpha1 class "form-group" is removed. In the Bootstrap demo "form-group" is replaced with
diff --git a/tobago-theme/tobago-theme-standard/src/main/css/tobago.css.map b/tobago-theme/tobago-theme-standard/src/main/css/tobago.css.map
index 93ad416..1f2e795 100644
--- a/tobago-theme/tobago-theme-standard/src/main/css/tobago.css.map
+++ b/tobago-theme/tobago-theme-standard/src/main/css/tobago.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../scss/tobago-theme.scss","../../../../node_modules/bootstrap/scss/bootstrap.scss","../../../../node_modules/bootstrap/scss/_root.scss","../../../../node_modules/bootstrap/scss/_reboot.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/mixins/_border-radius.scss","../../../../node_modules/bootstrap/scss/_type.scss","../../../../node_mo [...]
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["../scss/tobago-theme.scss","../../../../node_modules/bootstrap/scss/bootstrap.scss","../../../../node_modules/bootstrap/scss/_root.scss","../../../../node_modules/bootstrap/scss/_reboot.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/mixins/_border-radius.scss","../../../../node_modules/bootstrap/scss/_type.scss","../../../../node_mo [...]
\ No newline at end of file
[myfaces-tobago] 01/02: fix: flowLayout
Posted by hn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 99b077e4db707f4d7cf3fbf8a8f9aefe60e43b1a
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Fri Jul 2 13:10:12 2021 +0200
fix: flowLayout
* labellayout = flowLeft/flowRight fixed
* adjust tests
---
.../internal/renderkit/renderer/LabelLayoutRendererBase.java | 11 +++++++++++
.../org/apache/myfaces/tobago/renderkit/css/TobagoClass.java | 1 +
.../src/test/resources/renderer/in/label-flowLeft.html | 2 +-
.../src/test/resources/renderer/in/label-flowRight.html | 2 +-
tobago-theme/src/main/scss/_tobago.scss | 5 +++++
5 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelLayoutRendererBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelLayoutRendererBase.java
index e593f57..7992b8d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelLayoutRendererBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelLayoutRendererBase.java
@@ -120,6 +120,7 @@ public abstract class LabelLayoutRendererBase<T extends UIComponent & SupportsLa
final LabelLayout labelLayout = component.getLabelLayout();
final boolean nextToRenderIsLabel = component.isNextToRenderIsLabel();
final boolean flex;
+ final boolean flow;
switch (labelLayout) {
case flexLeft:
@@ -148,6 +149,15 @@ public abstract class LabelLayoutRendererBase<T extends UIComponent & SupportsLa
flex = false;
}
+ switch (labelLayout) {
+ case flowLeft:
+ case flowRight:
+ flow = true;
+ break;
+ default:
+ flow = false;
+ }
+
// if (labelLayout == LabelLayout.gridLeft || labelLayout == LabelLayout.gridRight
// || labelLayout == LabelLayout.gridTop || labelLayout == LabelLayout.gridBottom) {
// writer.startElement(HtmlElements.LABEL);
@@ -163,6 +173,7 @@ public abstract class LabelLayoutRendererBase<T extends UIComponent & SupportsLa
getComponentCss(facesContext, component),
autoSpacing ? TobagoClass.AUTO__SPACING : null,
ComponentUtils.getBooleanAttribute(component, Attributes.required) ? TobagoClass.REQUIRED : null,
+ flow ? TobagoClass.DISPLAY__INLINE__BLOCK : null,
markup != null && markup.contains(Markup.SPREAD) ? TobagoClass.SPREAD : null);
writeAdditionalAttributes(facesContext, writer, component);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/TobagoClass.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/TobagoClass.java
index 96d83fb..98c16c0 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/TobagoClass.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/TobagoClass.java
@@ -125,6 +125,7 @@ public enum TobagoClass implements CssItem {
COLLAPSED("tobago-collapsed"),
DATE("tobago-date"),
DATE__PICKER("tobago-date-picker"),
+ DISPLAY__INLINE__BLOCK("tobago-display-inline-block"),
/**
* @deprecated since 5.0.0
*/
diff --git a/tobago-core/src/test/resources/renderer/in/label-flowLeft.html b/tobago-core/src/test/resources/renderer/in/label-flowLeft.html
index 527b120..0468859 100644
--- a/tobago-core/src/test/resources/renderer/in/label-flowLeft.html
+++ b/tobago-core/src/test/resources/renderer/in/label-flowLeft.html
@@ -16,6 +16,6 @@
-->
<label for='id::field' class='col-form-label'>label</label>
-<tobago-in id='id' class='tobago-auto-spacing'>
+<tobago-in id='id' class='tobago-auto-spacing tobago-display-inline-block'>
<input type='text' name='id' id='id::field' class='tobago-in form-control'>
</tobago-in>
\ No newline at end of file
diff --git a/tobago-core/src/test/resources/renderer/in/label-flowRight.html b/tobago-core/src/test/resources/renderer/in/label-flowRight.html
index d50403e..1c3b322 100644
--- a/tobago-core/src/test/resources/renderer/in/label-flowRight.html
+++ b/tobago-core/src/test/resources/renderer/in/label-flowRight.html
@@ -15,7 +15,7 @@
* limitations under the License.
-->
-<tobago-in id='id' class='tobago-auto-spacing'>
+<tobago-in id='id' class='tobago-auto-spacing tobago-display-inline-block'>
<input type='text' name='id' id='id::field' class='tobago-in form-control'>
</tobago-in>
<label for='id::field' class='col-form-label'>label</label>
diff --git a/tobago-theme/src/main/scss/_tobago.scss b/tobago-theme/src/main/scss/_tobago.scss
index ff68f0a..b62d695 100644
--- a/tobago-theme/src/main/scss/_tobago.scss
+++ b/tobago-theme/src/main/scss/_tobago.scss
@@ -37,6 +37,11 @@ $form-disabled-alpha: 0.5;
$page-padding-top: 1rem;
$flex-layout-spacing: 0.5rem;
+/* utilities ----------------------------------------------------- */
+.tobago-display-inline-block {
+ display: inline-block;
+}
+
/* main ---------------------------------------------------------- */
@mixin adjustCustomControlLabel() {
.form-check-label {