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 2024/02/01 15:54:28 UTC
(myfaces-tobago) branch main updated (4b3bf9b942 -> cb9af84e6e)
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
from 4b3bf9b942 feat: Support for PassThroughAttributes in Tobago issue: TOBAGO-2277
new f576d6eb4a fix(select[One/Many]List): proportions
new cb9af84e6e build(theme): rebuild after fixing select[One/Many]List
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:
.../renderkit/renderer/SelectManyListRenderer.java | 11 +++-
.../renderkit/renderer/SelectOneListRenderer.java | 13 ++--
.../proportions/Proportions.test.js | 73 ++++++++++++++++++++
.../proportions/Proportions.xhtml | 77 ++++++++++++++++++++++
tobago-theme/src/main/scss/_tobago.scss | 1 +
.../src/main/css/tobago.css | 2 +
.../src/main/css/tobago.css.map | 2 +-
.../src/main/css/tobago.min.css | 2 +-
.../src/main/css/tobago.min.css.map | 2 +-
.../src/main/css/tobago.css | 2 +
.../src/main/css/tobago.css.map | 2 +-
.../src/main/css/tobago.min.css | 2 +-
.../src/main/css/tobago.min.css.map | 2 +-
.../src/main/css/tobago.css | 2 +
.../src/main/css/tobago.css.map | 2 +-
.../src/main/css/tobago.min.css | 2 +-
.../src/main/css/tobago.min.css.map | 2 +-
.../tobago-theme-speyside/src/main/css/tobago.css | 2 +
.../src/main/css/tobago.css.map | 2 +-
.../src/main/css/tobago.min.css | 2 +-
.../src/main/css/tobago.min.css.map | 2 +-
.../tobago-theme-standard/src/main/css/tobago.css | 2 +
.../src/main/css/tobago.css.map | 2 +-
.../src/main/css/tobago.min.css | 2 +-
.../src/main/css/tobago.min.css.map | 2 +-
25 files changed, 193 insertions(+), 22 deletions(-)
create mode 100644 tobago-example/tobago-example-demo/src/main/webapp/content/900-test/2100-selectManyList/proportions/Proportions.test.js
create mode 100644 tobago-example/tobago-example-demo/src/main/webapp/content/900-test/2100-selectManyList/proportions/Proportions.xhtml
(myfaces-tobago) 02/02: build(theme): rebuild after fixing select[One/Many]List
Posted by hn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit cb9af84e6e12834955aa160e5f684e2a7d3b831a
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Thu Feb 1 16:43:26 2024 +0100
build(theme): rebuild after fixing select[One/Many]List
---
tobago-theme/tobago-theme-charlotteville/src/main/css/tobago.css | 2 ++
tobago-theme/tobago-theme-charlotteville/src/main/css/tobago.css.map | 2 +-
tobago-theme/tobago-theme-charlotteville/src/main/css/tobago.min.css | 2 +-
.../tobago-theme-charlotteville/src/main/css/tobago.min.css.map | 2 +-
tobago-theme/tobago-theme-roxborough/src/main/css/tobago.css | 2 ++
tobago-theme/tobago-theme-roxborough/src/main/css/tobago.css.map | 2 +-
tobago-theme/tobago-theme-roxborough/src/main/css/tobago.min.css | 2 +-
tobago-theme/tobago-theme-roxborough/src/main/css/tobago.min.css.map | 2 +-
tobago-theme/tobago-theme-scarborough/src/main/css/tobago.css | 2 ++
tobago-theme/tobago-theme-scarborough/src/main/css/tobago.css.map | 2 +-
tobago-theme/tobago-theme-scarborough/src/main/css/tobago.min.css | 2 +-
tobago-theme/tobago-theme-scarborough/src/main/css/tobago.min.css.map | 2 +-
tobago-theme/tobago-theme-speyside/src/main/css/tobago.css | 2 ++
tobago-theme/tobago-theme-speyside/src/main/css/tobago.css.map | 2 +-
tobago-theme/tobago-theme-speyside/src/main/css/tobago.min.css | 2 +-
tobago-theme/tobago-theme-speyside/src/main/css/tobago.min.css.map | 2 +-
tobago-theme/tobago-theme-standard/src/main/css/tobago.css | 2 ++
tobago-theme/tobago-theme-standard/src/main/css/tobago.css.map | 2 +-
tobago-theme/tobago-theme-standard/src/main/css/tobago.min.css | 2 +-
tobago-theme/tobago-theme-standard/src/main/css/tobago.min.css.map | 2 +-
20 files changed, 25 insertions(+), 15 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 22a1863162..cc83a6f117 100644
--- a/tobago-theme/tobago-theme-charlotteville/src/main/css/tobago.css
+++ b/tobago-theme/tobago-theme-charlotteville/src/main/css/tobago.css
@@ -13290,6 +13290,7 @@ tobago-select-one-list .tobago-select-field .tobago-filter {
flex: 1 0 0;
min-width: 1rem;
background-color: transparent;
+ min-height: 0;
}
tobago-select-one-list .tobago-select-field .tobago-filter:focus {
box-shadow: none;
@@ -13467,6 +13468,7 @@ tobago-select-many-list .tobago-select-field .tobago-filter {
flex: 1 0 0;
min-width: 1rem;
background-color: transparent;
+ min-height: 0;
}
tobago-select-many-list .tobago-select-field .tobago-filter:focus {
box-shadow: none;
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 640bd84533..6d1771bd19 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,"sources":["tobago.css","../scss/tobago-theme.scss","../scss/_custom.scss","../../../../node_modules/bootstrap/scss/mixins/_banner.scss","../../../../node_modules/bootstrap/scss/_root.scss","../../../../node_modules/bootstrap/scss/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/mixins/_color-mode.scss","../../../../node_modules/bootstrap/scss/_reboot.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/mixins/_bo [...]
\ No newline at end of file
+{"version":3,"sources":["tobago.css","../scss/tobago-theme.scss","../scss/_custom.scss","../../../../node_modules/bootstrap/scss/mixins/_banner.scss","../../../../node_modules/bootstrap/scss/_root.scss","../../../../node_modules/bootstrap/scss/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/mixins/_color-mode.scss","../../../../node_modules/bootstrap/scss/_reboot.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/mixins/_bo [...]
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-charlotteville/src/main/css/tobago.min.css b/tobago-theme/tobago-theme-charlotteville/src/main/css/tobago.min.css
index 71b3bf0ef4..413fb8d90a 100644
--- a/tobago-theme/tobago-theme-charlotteville/src/main/css/tobago.min.css
+++ b/tobago-theme/tobago-theme-charlotteville/src/main/css/tobago.min.css
@@ -1,2 +1,2 @@
-@charset "UTF-8";:root,[data-bs-theme=light]{--bs-blue:#0d6efd;--bs-indigo:#6610f2;--bs-purple:#6f42c1;--bs-pink:#ff00be;--bs-red:#dc3545;--bs-orange:#fd7e14;--bs-yellow:#ffc107;--bs-green:#198754;--bs-teal:#20c997;--bs-cyan:#0dcaf0;--bs-black:#000000;--bs-white:#ffffff;--bs-gray:#777777;--bs-gray-dark:#323232;--bs-gray-100:#f8f9fa;--bs-gray-200:#d0d0d0;--bs-gray-300:#dee2e6;--bs-gray-400:#a0a0a0;--bs-gray-500:#adb5bd;--bs-gray-600:#777777;--bs-gray-700:#495057;--bs-gray-800:#323232;--bs [...]
+@charset "UTF-8";:root,[data-bs-theme=light]{--bs-blue:#0d6efd;--bs-indigo:#6610f2;--bs-purple:#6f42c1;--bs-pink:#ff00be;--bs-red:#dc3545;--bs-orange:#fd7e14;--bs-yellow:#ffc107;--bs-green:#198754;--bs-teal:#20c997;--bs-cyan:#0dcaf0;--bs-black:#000000;--bs-white:#ffffff;--bs-gray:#777777;--bs-gray-dark:#323232;--bs-gray-100:#f8f9fa;--bs-gray-200:#d0d0d0;--bs-gray-300:#dee2e6;--bs-gray-400:#a0a0a0;--bs-gray-500:#adb5bd;--bs-gray-600:#777777;--bs-gray-700:#495057;--bs-gray-800:#323232;--bs [...]
/*# sourceMappingURL=tobago.min.css.map */
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-charlotteville/src/main/css/tobago.min.css.map b/tobago-theme/tobago-theme-charlotteville/src/main/css/tobago.min.css.map
index f8cfad8944..64dc44d10f 100644
--- a/tobago-theme/tobago-theme-charlotteville/src/main/css/tobago.min.css.map
+++ b/tobago-theme/tobago-theme-charlotteville/src/main/css/tobago.min.css.map
@@ -1 +1 @@
-{"version":3,"sources":["tobago-theme-charlotteville/src/main/css/tobago.css"],"names":[],"mappings":"iBAsCA,MACA,sBACE,UAAW,QACX,YAAa,QACb,YAAa,QACb,UAAW,QACX,SAAU,QACV,YAAa,QACb,YAAa,QACb,WAAY,QACZ,UAAW,QACX,UAAW,QACX,WAAY,QACZ,WAAY,QACZ,UAAW,QACX,eAAgB,QAChB,cAAe,QACf,cAAe,QACf,cAAe,QACf,cAAe,QACf,cAAe,QACf,cAAe,QACf,cAAe,QACf,cAAe,QACf,cAAe,QACf,aAAc,QACd,eAAgB,QAChB,aAAc,QACd,UAAW,QACX,aAAc,QACd,YAAa,QACb,WAAY,QACZ,UAAW,QACX,iBAAkB,EAAE,CAAE,GAAG,CAAE,IAC3B,mBAAoB,GAAG,CAAE,GAAG,CAA [...]
\ No newline at end of file
+{"version":3,"sources":["tobago-theme-charlotteville/src/main/css/tobago.css"],"names":[],"mappings":"iBAsCA,MACA,sBACE,UAAW,QACX,YAAa,QACb,YAAa,QACb,UAAW,QACX,SAAU,QACV,YAAa,QACb,YAAa,QACb,WAAY,QACZ,UAAW,QACX,UAAW,QACX,WAAY,QACZ,WAAY,QACZ,UAAW,QACX,eAAgB,QAChB,cAAe,QACf,cAAe,QACf,cAAe,QACf,cAAe,QACf,cAAe,QACf,cAAe,QACf,cAAe,QACf,cAAe,QACf,cAAe,QACf,aAAc,QACd,eAAgB,QAChB,aAAc,QACd,UAAW,QACX,aAAc,QACd,YAAa,QACb,WAAY,QACZ,UAAW,QACX,iBAAkB,EAAE,CAAE,GAAG,CAAE,IAC3B,mBAAoB,GAAG,CAAE,GAAG,CAA [...]
\ 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 6515e6704c..10f20ad68e 100644
--- a/tobago-theme/tobago-theme-roxborough/src/main/css/tobago.css
+++ b/tobago-theme/tobago-theme-roxborough/src/main/css/tobago.css
@@ -13317,6 +13317,7 @@ tobago-select-one-list .tobago-select-field .tobago-filter {
flex: 1 0 0;
min-width: 1rem;
background-color: transparent;
+ min-height: 0;
}
tobago-select-one-list .tobago-select-field .tobago-filter:focus {
box-shadow: none;
@@ -13494,6 +13495,7 @@ tobago-select-many-list .tobago-select-field .tobago-filter {
flex: 1 0 0;
min-width: 1rem;
background-color: transparent;
+ min-height: 0;
}
tobago-select-many-list .tobago-select-field .tobago-filter:focus {
box-shadow: none;
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 0f93c0590c..a890b221ea 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,"sources":["tobago.css","../scss/tobago-theme.scss","../scss/_custom.scss","../../../../node_modules/bootstrap/scss/mixins/_banner.scss","../../../../node_modules/bootstrap/scss/_root.scss","../../../../node_modules/bootstrap/scss/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/mixins/_color-mode.scss","../../../../node_modules/bootstrap/scss/_reboot.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/mixins/_bo [...]
\ No newline at end of file
+{"version":3,"sources":["tobago.css","../scss/tobago-theme.scss","../scss/_custom.scss","../../../../node_modules/bootstrap/scss/mixins/_banner.scss","../../../../node_modules/bootstrap/scss/_root.scss","../../../../node_modules/bootstrap/scss/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/mixins/_color-mode.scss","../../../../node_modules/bootstrap/scss/_reboot.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/mixins/_bo [...]
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-roxborough/src/main/css/tobago.min.css b/tobago-theme/tobago-theme-roxborough/src/main/css/tobago.min.css
index 27961a94e4..7c804bd381 100644
--- a/tobago-theme/tobago-theme-roxborough/src/main/css/tobago.min.css
+++ b/tobago-theme/tobago-theme-roxborough/src/main/css/tobago.min.css
@@ -1,2 +1,2 @@
-@charset "UTF-8";@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( [...]
+@charset "UTF-8";@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( [...]
/*# sourceMappingURL=tobago.min.css.map */
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-roxborough/src/main/css/tobago.min.css.map b/tobago-theme/tobago-theme-roxborough/src/main/css/tobago.min.css.map
index 17694539ff..dcc49fab3b 100644
--- a/tobago-theme/tobago-theme-roxborough/src/main/css/tobago.min.css.map
+++ b/tobago-theme/tobago-theme-roxborough/src/main/css/tobago.min.css.map
@@ -1 +1 @@
-{"version":3,"sources":["tobago-theme-roxborough/src/main/css/tobago.css"],"names":[],"mappings":"iBAiCA,WACE,YAAa,SACb,WAAY,OACZ,YAAa,IACb,IAAK,qCAAqC,mBAE5C,WACE,YAAa,SACb,WAAY,OACZ,YAAa,IACb,IAAK,kCAAkC,mBAEzC,WACE,YAAa,SACb,WAAY,OACZ,IAAK,oCAAoC,mBAE3C,WACE,YAAa,SACb,WAAY,OACZ,YAAa,IACb,IAAK,wCAAwC,mBAE/C,mBACE,YAAa,QAAQ,CAAE,KAAK,CAAE,MAQhC,MACA,sBACE,UAAW,QACX,YAAa,QACb,YAAa,QACb,UAAW,QACX,SAAU,QACV,YAAa,QACb,YAAa,QACb,WAAY,QACZ,UAAW,QACX,UAAW,QACX,WAAY,QACZ,WAAY,KACZ,UAAW,QACX,eAA [...]
\ No newline at end of file
+{"version":3,"sources":["tobago-theme-roxborough/src/main/css/tobago.css"],"names":[],"mappings":"iBAiCA,WACE,YAAa,SACb,WAAY,OACZ,YAAa,IACb,IAAK,qCAAqC,mBAE5C,WACE,YAAa,SACb,WAAY,OACZ,YAAa,IACb,IAAK,kCAAkC,mBAEzC,WACE,YAAa,SACb,WAAY,OACZ,IAAK,oCAAoC,mBAE3C,WACE,YAAa,SACb,WAAY,OACZ,YAAa,IACb,IAAK,wCAAwC,mBAE/C,mBACE,YAAa,QAAQ,CAAE,KAAK,CAAE,MAQhC,MACA,sBACE,UAAW,QACX,YAAa,QACb,YAAa,QACb,UAAW,QACX,SAAU,QACV,YAAa,QACb,YAAa,QACb,WAAY,QACZ,UAAW,QACX,UAAW,QACX,WAAY,QACZ,WAAY,KACZ,UAAW,QACX,eAA [...]
\ 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 d172b75cca..ae96d3cd79 100644
--- a/tobago-theme/tobago-theme-scarborough/src/main/css/tobago.css
+++ b/tobago-theme/tobago-theme-scarborough/src/main/css/tobago.css
@@ -13312,6 +13312,7 @@ tobago-select-one-list .tobago-select-field .tobago-filter {
flex: 1 0 0;
min-width: 1rem;
background-color: transparent;
+ min-height: 0;
}
tobago-select-one-list .tobago-select-field .tobago-filter:focus {
box-shadow: none;
@@ -13491,6 +13492,7 @@ tobago-select-many-list .tobago-select-field .tobago-filter {
flex: 1 0 0;
min-width: 1rem;
background-color: transparent;
+ min-height: 0;
}
tobago-select-many-list .tobago-select-field .tobago-filter:focus {
box-shadow: none;
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 4ace95dc4c..b9a8b1b863 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,"sources":["tobago.css","../scss/tobago-theme.scss","../scss/_custom.scss","../../../../node_modules/bootstrap/scss/mixins/_banner.scss","../../../../node_modules/bootstrap/scss/_root.scss","../../../../node_modules/bootstrap/scss/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/mixins/_color-mode.scss","../../../../node_modules/bootstrap/scss/_reboot.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/mixins/_bo [...]
\ No newline at end of file
+{"version":3,"sources":["tobago.css","../scss/tobago-theme.scss","../scss/_custom.scss","../../../../node_modules/bootstrap/scss/mixins/_banner.scss","../../../../node_modules/bootstrap/scss/_root.scss","../../../../node_modules/bootstrap/scss/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/mixins/_color-mode.scss","../../../../node_modules/bootstrap/scss/_reboot.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/mixins/_bo [...]
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-scarborough/src/main/css/tobago.min.css b/tobago-theme/tobago-theme-scarborough/src/main/css/tobago.min.css
index 232b899157..4ac714e8e7 100644
--- a/tobago-theme/tobago-theme-scarborough/src/main/css/tobago.min.css
+++ b/tobago-theme/tobago-theme-scarborough/src/main/css/tobago.min.css
@@ -1,2 +1,2 @@
-@charset "UTF-8";:root,[data-bs-theme=light]{--bs-blue:#0d6efd;--bs-indigo:#6610f2;--bs-purple:#6f42c1;--bs-pink:#d63384;--bs-red:#dc3545;--bs-orange:#fd7e14;--bs-yellow:#ffc107;--bs-green:#198754;--bs-teal:#20c997;--bs-cyan:#0dcaf0;--bs-black:#000;--bs-white:#fff;--bs-gray:#6c757d;--bs-gray-dark:#343a40;--bs-gray-100:#f8f9fa;--bs-gray-200:#e9ecef;--bs-gray-300:#dee2e6;--bs-gray-400:#ced4da;--bs-gray-500:#adb5bd;--bs-gray-600:#6c757d;--bs-gray-700:#495057;--bs-gray-800:#343a40;--bs-gray- [...]
+@charset "UTF-8";:root,[data-bs-theme=light]{--bs-blue:#0d6efd;--bs-indigo:#6610f2;--bs-purple:#6f42c1;--bs-pink:#d63384;--bs-red:#dc3545;--bs-orange:#fd7e14;--bs-yellow:#ffc107;--bs-green:#198754;--bs-teal:#20c997;--bs-cyan:#0dcaf0;--bs-black:#000;--bs-white:#fff;--bs-gray:#6c757d;--bs-gray-dark:#343a40;--bs-gray-100:#f8f9fa;--bs-gray-200:#e9ecef;--bs-gray-300:#dee2e6;--bs-gray-400:#ced4da;--bs-gray-500:#adb5bd;--bs-gray-600:#6c757d;--bs-gray-700:#495057;--bs-gray-800:#343a40;--bs-gray- [...]
/*# sourceMappingURL=tobago.min.css.map */
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-scarborough/src/main/css/tobago.min.css.map b/tobago-theme/tobago-theme-scarborough/src/main/css/tobago.min.css.map
index 688f8d8e08..86c47f4eb3 100644
--- a/tobago-theme/tobago-theme-scarborough/src/main/css/tobago.min.css.map
+++ b/tobago-theme/tobago-theme-scarborough/src/main/css/tobago.min.css.map
@@ -1 +1 @@
-{"version":3,"sources":["tobago-theme-scarborough/src/main/css/tobago.css"],"names":[],"mappings":"iBAwCA,MACA,sBACE,UAAW,QACX,YAAa,QACb,YAAa,QACb,UAAW,QACX,SAAU,QACV,YAAa,QACb,YAAa,QACb,WAAY,QACZ,UAAW,QACX,UAAW,QACX,WAAY,KACZ,WAAY,KACZ,UAAW,QACX,eAAgB,QAChB,cAAe,QACf,cAAe,QACf,cAAe,QACf,cAAe,QACf,cAAe,QACf,cAAe,QACf,cAAe,QACf,cAAe,QACf,cAAe,QACf,aAAc,QACd,eAAgB,QAChB,aAAc,QACd,UAAW,QACX,aAAc,QACd,YAAa,QACb,WAAY,QACZ,UAAW,QACX,iBAAkB,EAAE,CAAE,GAAG,CAAE,IAC3B,mBAAoB,GAAG,CAAE,GAAG,CAAE,I [...]
\ No newline at end of file
+{"version":3,"sources":["tobago-theme-scarborough/src/main/css/tobago.css"],"names":[],"mappings":"iBAwCA,MACA,sBACE,UAAW,QACX,YAAa,QACb,YAAa,QACb,UAAW,QACX,SAAU,QACV,YAAa,QACb,YAAa,QACb,WAAY,QACZ,UAAW,QACX,UAAW,QACX,WAAY,KACZ,WAAY,KACZ,UAAW,QACX,eAAgB,QAChB,cAAe,QACf,cAAe,QACf,cAAe,QACf,cAAe,QACf,cAAe,QACf,cAAe,QACf,cAAe,QACf,cAAe,QACf,cAAe,QACf,aAAc,QACd,eAAgB,QAChB,aAAc,QACd,UAAW,QACX,aAAc,QACd,YAAa,QACb,WAAY,QACZ,UAAW,QACX,iBAAkB,EAAE,CAAE,GAAG,CAAE,IAC3B,mBAAoB,GAAG,CAAE,GAAG,CAAE,I [...]
\ 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 db41e600dd..7987666098 100644
--- a/tobago-theme/tobago-theme-speyside/src/main/css/tobago.css
+++ b/tobago-theme/tobago-theme-speyside/src/main/css/tobago.css
@@ -13010,6 +13010,7 @@ tobago-select-one-list .tobago-select-field .tobago-filter {
flex: 1 0 0;
min-width: 1rem;
background-color: transparent;
+ min-height: 0;
}
tobago-select-one-list .tobago-select-field .tobago-filter:focus {
box-shadow: none;
@@ -13187,6 +13188,7 @@ tobago-select-many-list .tobago-select-field .tobago-filter {
flex: 1 0 0;
min-width: 1rem;
background-color: transparent;
+ min-height: 0;
}
tobago-select-many-list .tobago-select-field .tobago-filter:focus {
box-shadow: none;
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 db9c18988d..d91d105ef1 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,"sources":["tobago.css","../scss/tobago-theme.scss","../scss/_custom.scss","../../../../node_modules/bootstrap/scss/mixins/_banner.scss","../../../../node_modules/bootstrap/scss/_root.scss","../../../../node_modules/bootstrap/scss/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/mixins/_color-mode.scss","../../../../node_modules/bootstrap/scss/_reboot.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/_type.scss [...]
\ No newline at end of file
+{"version":3,"sources":["tobago.css","../scss/tobago-theme.scss","../scss/_custom.scss","../../../../node_modules/bootstrap/scss/mixins/_banner.scss","../../../../node_modules/bootstrap/scss/_root.scss","../../../../node_modules/bootstrap/scss/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/mixins/_color-mode.scss","../../../../node_modules/bootstrap/scss/_reboot.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/_type.scss [...]
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-speyside/src/main/css/tobago.min.css b/tobago-theme/tobago-theme-speyside/src/main/css/tobago.min.css
index 8e86806648..5502b0bc90 100644
--- a/tobago-theme/tobago-theme-speyside/src/main/css/tobago.min.css
+++ b/tobago-theme/tobago-theme-speyside/src/main/css/tobago.min.css
@@ -1,2 +1,2 @@
-@charset "UTF-8";:root,[data-bs-theme=light]{--bs-blue:#0d6efd;--bs-indigo:#6610f2;--bs-purple:rgb(58, 37, 100);--bs-pink:#d63384;--bs-red:rgb(211, 0, 64);--bs-orange:#d90;--bs-yellow:#ffc107;--bs-green:rgb(29, 163, 50);--bs-teal:#20c997;--bs-cyan:#0dcaf0;--bs-black:#000;--bs-white:#fff;--bs-gray:rgb(120, 140, 148);--bs-gray-dark:#323232;--bs-gray-100:#f7f7f7;--bs-gray-200:#e3e4e5;--bs-gray-300:#d7d7d7;--bs-gray-400:#ced4da;--bs-gray-500:#acacac;--bs-gray-600:rgb(120, 140, 148);--bs-gray [...]
+@charset "UTF-8";:root,[data-bs-theme=light]{--bs-blue:#0d6efd;--bs-indigo:#6610f2;--bs-purple:rgb(58, 37, 100);--bs-pink:#d63384;--bs-red:rgb(211, 0, 64);--bs-orange:#d90;--bs-yellow:#ffc107;--bs-green:rgb(29, 163, 50);--bs-teal:#20c997;--bs-cyan:#0dcaf0;--bs-black:#000;--bs-white:#fff;--bs-gray:rgb(120, 140, 148);--bs-gray-dark:#323232;--bs-gray-100:#f7f7f7;--bs-gray-200:#e3e4e5;--bs-gray-300:#d7d7d7;--bs-gray-400:#ced4da;--bs-gray-500:#acacac;--bs-gray-600:rgb(120, 140, 148);--bs-gray [...]
/*# sourceMappingURL=tobago.min.css.map */
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-speyside/src/main/css/tobago.min.css.map b/tobago-theme/tobago-theme-speyside/src/main/css/tobago.min.css.map
index 6d73d0e2c5..3d9722f381 100644
--- a/tobago-theme/tobago-theme-speyside/src/main/css/tobago.min.css.map
+++ b/tobago-theme/tobago-theme-speyside/src/main/css/tobago.min.css.map
@@ -1 +1 @@
-{"version":3,"sources":["tobago-theme-speyside/src/main/css/tobago.css"],"names":[],"mappings":"iBAsCA,MACA,sBACE,UAAW,QACX,YAAa,QACb,YAAa,iBACb,UAAW,QACX,SAAU,gBACV,YAAa,KACb,YAAa,QACb,WAAY,iBACZ,UAAW,QACX,UAAW,QACX,WAAY,KACZ,WAAY,KACZ,UAAW,mBACX,eAAgB,QAChB,cAAe,QACf,cAAe,QACf,cAAe,QACf,cAAe,QACf,cAAe,QACf,cAAe,mBACf,cAAe,QACf,cAAe,QACf,cAAe,QACf,aAAc,gBACd,eAAgB,QAChB,aAAc,iBACd,UAAW,QACX,aAAc,QACd,YAAa,gBACb,WAAY,QACZ,UAAW,QACX,iBAAkB,EAAE,CAAE,EAAE,CAAE,GAC1B,mBAAoB,GAAG,CAAE,GAAG,C [...]
\ No newline at end of file
+{"version":3,"sources":["tobago-theme-speyside/src/main/css/tobago.css"],"names":[],"mappings":"iBAsCA,MACA,sBACE,UAAW,QACX,YAAa,QACb,YAAa,iBACb,UAAW,QACX,SAAU,gBACV,YAAa,KACb,YAAa,QACb,WAAY,iBACZ,UAAW,QACX,UAAW,QACX,WAAY,KACZ,WAAY,KACZ,UAAW,mBACX,eAAgB,QAChB,cAAe,QACf,cAAe,QACf,cAAe,QACf,cAAe,QACf,cAAe,QACf,cAAe,mBACf,cAAe,QACf,cAAe,QACf,cAAe,QACf,aAAc,gBACd,eAAgB,QAChB,aAAc,iBACd,UAAW,QACX,aAAc,QACd,YAAa,gBACb,WAAY,QACZ,UAAW,QACX,iBAAkB,EAAE,CAAE,EAAE,CAAE,GAC1B,mBAAoB,GAAG,CAAE,GAAG,C [...]
\ 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 536d7d464b..f6460019f8 100644
--- a/tobago-theme/tobago-theme-standard/src/main/css/tobago.css
+++ b/tobago-theme/tobago-theme-standard/src/main/css/tobago.css
@@ -13274,6 +13274,7 @@ tobago-select-one-list .tobago-select-field .tobago-filter {
flex: 1 0 0;
min-width: 1rem;
background-color: transparent;
+ min-height: 0;
}
tobago-select-one-list .tobago-select-field .tobago-filter:focus {
box-shadow: none;
@@ -13451,6 +13452,7 @@ tobago-select-many-list .tobago-select-field .tobago-filter {
flex: 1 0 0;
min-width: 1rem;
background-color: transparent;
+ min-height: 0;
}
tobago-select-many-list .tobago-select-field .tobago-filter:focus {
box-shadow: none;
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 475da947cb..647c54b398 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,"sources":["tobago.css","../scss/tobago-theme.scss","../../../../node_modules/bootstrap/scss/mixins/_banner.scss","../../../../node_modules/bootstrap/scss/_root.scss","../../../../node_modules/bootstrap/scss/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/mixins/_color-mode.scss","../../../../node_modules/bootstrap/scss/_reboot.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/mixins/_border-radius.scss","../. [...]
\ No newline at end of file
+{"version":3,"sources":["tobago.css","../scss/tobago-theme.scss","../../../../node_modules/bootstrap/scss/mixins/_banner.scss","../../../../node_modules/bootstrap/scss/_root.scss","../../../../node_modules/bootstrap/scss/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/mixins/_color-mode.scss","../../../../node_modules/bootstrap/scss/_reboot.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/mixins/_border-radius.scss","../. [...]
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-standard/src/main/css/tobago.min.css b/tobago-theme/tobago-theme-standard/src/main/css/tobago.min.css
index 95a522cf5c..67fe511f4f 100644
--- a/tobago-theme/tobago-theme-standard/src/main/css/tobago.min.css
+++ b/tobago-theme/tobago-theme-standard/src/main/css/tobago.min.css
@@ -1,2 +1,2 @@
-@charset "UTF-8";:root,[data-bs-theme=light]{--bs-blue:#0d6efd;--bs-indigo:#6610f2;--bs-purple:#6f42c1;--bs-pink:#d63384;--bs-red:#dc3545;--bs-orange:#fd7e14;--bs-yellow:#ffc107;--bs-green:#198754;--bs-teal:#20c997;--bs-cyan:#0dcaf0;--bs-black:#000;--bs-white:#fff;--bs-gray:#6c757d;--bs-gray-dark:#343a40;--bs-gray-100:#f8f9fa;--bs-gray-200:#e9ecef;--bs-gray-300:#dee2e6;--bs-gray-400:#ced4da;--bs-gray-500:#adb5bd;--bs-gray-600:#6c757d;--bs-gray-700:#495057;--bs-gray-800:#343a40;--bs-gray- [...]
+@charset "UTF-8";:root,[data-bs-theme=light]{--bs-blue:#0d6efd;--bs-indigo:#6610f2;--bs-purple:#6f42c1;--bs-pink:#d63384;--bs-red:#dc3545;--bs-orange:#fd7e14;--bs-yellow:#ffc107;--bs-green:#198754;--bs-teal:#20c997;--bs-cyan:#0dcaf0;--bs-black:#000;--bs-white:#fff;--bs-gray:#6c757d;--bs-gray-dark:#343a40;--bs-gray-100:#f8f9fa;--bs-gray-200:#e9ecef;--bs-gray-300:#dee2e6;--bs-gray-400:#ced4da;--bs-gray-500:#adb5bd;--bs-gray-600:#6c757d;--bs-gray-700:#495057;--bs-gray-800:#343a40;--bs-gray- [...]
/*# sourceMappingURL=tobago.min.css.map */
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-standard/src/main/css/tobago.min.css.map b/tobago-theme/tobago-theme-standard/src/main/css/tobago.min.css.map
index 6277b896f5..b3263a4a36 100644
--- a/tobago-theme/tobago-theme-standard/src/main/css/tobago.min.css.map
+++ b/tobago-theme/tobago-theme-standard/src/main/css/tobago.min.css.map
@@ -1 +1 @@
-{"version":3,"sources":["tobago-theme-standard/src/main/css/tobago.css"],"names":[],"mappings":"iBAsBA,MACA,sBACE,UAAW,QACX,YAAa,QACb,YAAa,QACb,UAAW,QACX,SAAU,QACV,YAAa,QACb,YAAa,QACb,WAAY,QACZ,UAAW,QACX,UAAW,QACX,WAAY,KACZ,WAAY,KACZ,UAAW,QACX,eAAgB,QAChB,cAAe,QACf,cAAe,QACf,cAAe,QACf,cAAe,QACf,cAAe,QACf,cAAe,QACf,cAAe,QACf,cAAe,QACf,cAAe,QACf,aAAc,QACd,eAAgB,QAChB,aAAc,QACd,UAAW,QACX,aAAc,QACd,YAAa,QACb,WAAY,QACZ,UAAW,QACX,iBAAkB,EAAE,CAAE,GAAG,CAAE,IAC3B,mBAAoB,GAAG,CAAE,GAAG,CAAE,IAC9 [...]
\ No newline at end of file
+{"version":3,"sources":["tobago-theme-standard/src/main/css/tobago.css"],"names":[],"mappings":"iBAsBA,MACA,sBACE,UAAW,QACX,YAAa,QACb,YAAa,QACb,UAAW,QACX,SAAU,QACV,YAAa,QACb,YAAa,QACb,WAAY,QACZ,UAAW,QACX,UAAW,QACX,WAAY,KACZ,WAAY,KACZ,UAAW,QACX,eAAgB,QAChB,cAAe,QACf,cAAe,QACf,cAAe,QACf,cAAe,QACf,cAAe,QACf,cAAe,QACf,cAAe,QACf,cAAe,QACf,cAAe,QACf,aAAc,QACd,eAAgB,QAChB,aAAc,QACd,UAAW,QACX,aAAc,QACd,YAAa,QACb,WAAY,QACZ,UAAW,QACX,iBAAkB,EAAE,CAAE,GAAG,CAAE,IAC3B,mBAAoB,GAAG,CAAE,GAAG,CAAE,IAC9 [...]
\ No newline at end of file
(myfaces-tobago) 01/02: fix(select[One/Many]List): proportions
Posted by hn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit f576d6eb4a0fe3d4da17bf7ddcfc0ff438ef7c01
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Thu Feb 1 16:00:01 2024 +0100
fix(select[One/Many]List): proportions
* add a test
* add form-control-sm/lg CSS class for filter input field
Issue: TOBAGO-2281
---
.../renderkit/renderer/SelectManyListRenderer.java | 11 +++-
.../renderkit/renderer/SelectOneListRenderer.java | 13 ++--
.../proportions/Proportions.test.js | 73 ++++++++++++++++++++
.../proportions/Proportions.xhtml | 77 ++++++++++++++++++++++
tobago-theme/src/main/scss/_tobago.scss | 1 +
5 files changed, 168 insertions(+), 7 deletions(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyListRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyListRenderer.java
index e5362f5eed..bcc46aa339 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyListRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyListRenderer.java
@@ -149,7 +149,11 @@ public class SelectManyListRenderer<T extends AbstractUISelectManyList> extends
writer.startElement(HtmlElements.INPUT);
writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.SEARCH);
writer.writeIdAttribute(filterId);
- writer.writeClassAttribute(TobagoClass.FILTER, BootstrapClass.FORM_CONTROL);
+ writer.writeClassAttribute(
+ TobagoClass.FILTER,
+ BootstrapClass.FORM_CONTROL,
+ markup.contains(Markup.LARGE) ? BootstrapClass.FORM_CONTROL_LG : null,
+ markup.contains(Markup.SMALL) ? BootstrapClass.FORM_CONTROL_SM : null);
writer.writeAttribute(HtmlAttributes.AUTOCOMPLETE, "off", false);
writer.writeAttribute(HtmlAttributes.READONLY, filter == null || filter.isEmpty());
writer.writeAttribute(HtmlAttributes.DISABLED, disabled);
@@ -217,8 +221,9 @@ public class SelectManyListRenderer<T extends AbstractUISelectManyList> extends
writer.endElement(HtmlElements.DIV);
}
- private void encodeSelectItem(FacesContext facesContext, TobagoResponseWriter writer, T component, SelectItem item,
- Object[] values, String[] submittedValues, boolean disabled, boolean group) throws IOException {
+ private void encodeSelectItem(
+ FacesContext facesContext, TobagoResponseWriter writer, T component, SelectItem item,
+ Object[] values, String[] submittedValues, boolean disabled, boolean group) throws IOException {
Object itemValue = item.getValue();
// when using selectItem tag with a literal value: use the converted value
if (itemValue instanceof String && values != null && values.length > 0 && !(values[0] instanceof String)) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneListRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneListRenderer.java
index ecf831363a..e7703fddc0 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneListRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneListRenderer.java
@@ -121,7 +121,11 @@ public class SelectOneListRenderer<T extends AbstractUISelectOneList> extends Se
writer.startElement(HtmlElements.INPUT);
writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.SEARCH);
writer.writeIdAttribute(filterId);
- writer.writeClassAttribute(TobagoClass.FILTER, BootstrapClass.FORM_CONTROL);
+ writer.writeClassAttribute(
+ TobagoClass.FILTER,
+ BootstrapClass.FORM_CONTROL,
+ markup.contains(Markup.LARGE) ? BootstrapClass.FORM_CONTROL_LG : null,
+ markup.contains(Markup.SMALL) ? BootstrapClass.FORM_CONTROL_SM : null);
writer.writeAttribute(HtmlAttributes.AUTOCOMPLETE, "off", false);
writer.writeAttribute(HtmlAttributes.READONLY, filter == null || filter.isEmpty());
writer.writeAttribute(HtmlAttributes.DISABLED, disabled);
@@ -172,7 +176,7 @@ public class SelectOneListRenderer<T extends AbstractUISelectOneList> extends Se
disabled || item.isDisabled(), true);
}
} else {
- encodeSelectItem(facesContext, writer, component, item, value, submittedValue, disabled, false);
+ encodeSelectItem(facesContext, writer, component, item, value, submittedValue, disabled, false);
}
}
@@ -189,8 +193,9 @@ public class SelectOneListRenderer<T extends AbstractUISelectOneList> extends Se
writer.endElement(HtmlElements.DIV);
}
- private void encodeSelectItem(FacesContext facesContext, TobagoResponseWriter writer, T component, SelectItem item,
- Object value, Object submittedValue, boolean disabled, boolean group) throws IOException {
+ private void encodeSelectItem(
+ FacesContext facesContext, TobagoResponseWriter writer, T component, SelectItem item,
+ Object value, Object submittedValue, boolean disabled, boolean group) throws IOException {
Object itemValue = item.getValue();
// when using selectItem tag with a literal value: use the converted value
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/2100-selectManyList/proportions/Proportions.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/2100-selectManyList/proportions/Proportions.test.js
new file mode 100644
index 0000000000..f972cdecb1
--- /dev/null
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/2100-selectManyList/proportions/Proportions.test.js
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {JasmineTestTool} from "/tobago/test/tobago-test-tool.js";
+import {elementByIdFn} from "/script/tobago-test.js";
+
+it("Compare to height of tc:in", function (done) {
+ const inSmall = elementByIdFn("page:mainForm:inSmall");
+ const selectOneChoiceSmall = elementByIdFn("page:mainForm:selectOneChoiceSmall");
+ const selectOneListSmall = elementByIdFn("page:mainForm:selectOneListSmall");
+ const selectManyListSmall = elementByIdFn("page:mainForm:selectManyListSmall");
+ const inNormal = elementByIdFn("page:mainForm:inNormal");
+ const selectOneChoiceNormal = elementByIdFn("page:mainForm:selectOneChoiceNormal");
+ const selectOneListNormal = elementByIdFn("page:mainForm:selectOneListNormal");
+ const selectManyListNormal = elementByIdFn("page:mainForm:selectManyListNormal");
+ const inLarge = elementByIdFn("page:mainForm:inLarge");
+ const selectOneChoiceLarge = elementByIdFn("page:mainForm:selectOneChoiceLarge");
+ const selectOneListLarge = elementByIdFn("page:mainForm:selectOneListLarge");
+ const selectManyListLarge = elementByIdFn("page:mainForm:selectManyListLarge");
+
+ const test = new JasmineTestTool(done);
+ test.do(() => expect(getComputedStyle(selectOneChoiceSmall()).height).toBe(getComputedStyle(inSmall()).height));
+ test.do(() => expect(getComputedStyle(selectOneListSmall()).height).toBe(getComputedStyle(inSmall()).height));
+ test.do(() => expect(getComputedStyle(selectManyListSmall()).height).toBe(getComputedStyle(inSmall()).height));
+ test.do(() => expect(getComputedStyle(selectOneChoiceNormal()).height).toBe(getComputedStyle(inNormal()).height));
+ test.do(() => expect(getComputedStyle(selectOneListNormal()).height).toBe(getComputedStyle(inNormal()).height));
+ test.do(() => expect(getComputedStyle(selectManyListNormal()).height).toBe(getComputedStyle(inNormal()).height));
+ test.do(() => expect(getComputedStyle(selectOneChoiceLarge()).height).toBe(getComputedStyle(inLarge()).height));
+ test.do(() => expect(getComputedStyle(selectOneListLarge()).height).toBe(getComputedStyle(inLarge()).height));
+ test.do(() => expect(getComputedStyle(selectManyListLarge()).height).toBe(getComputedStyle(inLarge()).height));
+ test.start();
+});
+
+it("Compare to height of tc:selectOneChoice", function (done) {
+ const inSmall = elementByIdFn("page:mainForm:inSmall");
+ const selectOneChoiceSmall = elementByIdFn("page:mainForm:selectOneChoiceSmall");
+ const selectOneListSmall = elementByIdFn("page:mainForm:selectOneListSmall");
+ const selectManyListSmall = elementByIdFn("page:mainForm:selectManyListSmall");
+ const inNormal = elementByIdFn("page:mainForm:inNormal");
+ const selectOneChoiceNormal = elementByIdFn("page:mainForm:selectOneChoiceNormal");
+ const selectOneListNormal = elementByIdFn("page:mainForm:selectOneListNormal");
+ const selectManyListNormal = elementByIdFn("page:mainForm:selectManyListNormal");
+ const inLarge = elementByIdFn("page:mainForm:inLarge");
+ const selectOneChoiceLarge = elementByIdFn("page:mainForm:selectOneChoiceLarge");
+ const selectOneListLarge = elementByIdFn("page:mainForm:selectOneListLarge");
+ const selectManyListLarge = elementByIdFn("page:mainForm:selectManyListLarge");
+
+ const test = new JasmineTestTool(done);
+ test.do(() => expect(getComputedStyle(inSmall()).height).toBe(getComputedStyle(selectOneChoiceSmall()).height));
+ test.do(() => expect(getComputedStyle(selectOneListSmall()).height).toBe(getComputedStyle(selectOneChoiceSmall()).height));
+ test.do(() => expect(getComputedStyle(selectManyListSmall()).height).toBe(getComputedStyle(selectOneChoiceSmall()).height));
+ test.do(() => expect(getComputedStyle(inNormal()).height).toBe(getComputedStyle(selectOneChoiceNormal()).height));
+ test.do(() => expect(getComputedStyle(selectOneListNormal()).height).toBe(getComputedStyle(selectOneChoiceNormal()).height));
+ test.do(() => expect(getComputedStyle(selectManyListNormal()).height).toBe(getComputedStyle(selectOneChoiceNormal()).height));
+ test.do(() => expect(getComputedStyle(inLarge()).height).toBe(getComputedStyle(selectOneChoiceLarge()).height));
+ test.do(() => expect(getComputedStyle(selectOneListLarge()).height).toBe(getComputedStyle(selectOneChoiceLarge()).height));
+ test.do(() => expect(getComputedStyle(selectManyListLarge()).height).toBe(getComputedStyle(selectOneChoiceLarge()).height));
+ test.start();
+});
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/2100-selectManyList/proportions/Proportions.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/2100-selectManyList/proportions/Proportions.xhtml
new file mode 100644
index 0000000000..d51d021cd9
--- /dev/null
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/2100-selectManyList/proportions/Proportions.xhtml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+
+<ui:composition template="/main.xhtml"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:ui="jakarta.faces.facelets">
+
+ <tc:segmentLayout extraSmall="3seg">
+ <tc:in id="inSmall" markup="small"/>
+ <tc:selectOneChoice id="selectOneChoiceSmall" markup="small">
+ <tc:selectItem itemLabel="One" itemValue="one"/>
+ <tc:selectItem itemLabel="Two" itemValue="two"/>
+ </tc:selectOneChoice>
+ <tc:selectOneList id="selectOneListSmall" markup="small">
+ <tc:selectItem itemLabel="One" itemValue="one"/>
+ <tc:selectItem itemLabel="Two" itemValue="two"/>
+ </tc:selectOneList>
+ <tc:selectManyList id="selectManyListSmall" markup="small">
+ <tc:selectItem itemLabel="One" itemValue="one"/>
+ <tc:selectItem itemLabel="Two" itemValue="two"/>
+ <tc:selectItem itemLabel="Three" itemValue="three"/>
+ <tc:selectItem itemLabel="Four" itemValue="four"/>
+ <tc:selectItem itemLabel="Five" itemValue="five"/>
+ </tc:selectManyList>
+
+ <tc:in id="inNormal"/>
+ <tc:selectOneChoice id="selectOneChoiceNormal">
+ <tc:selectItem itemLabel="One" itemValue="one"/>
+ <tc:selectItem itemLabel="Two" itemValue="two"/>
+ </tc:selectOneChoice>
+ <tc:selectOneList id="selectOneListNormal">
+ <tc:selectItem itemLabel="One" itemValue="one"/>
+ <tc:selectItem itemLabel="Two" itemValue="two"/>
+ </tc:selectOneList>
+ <tc:selectManyList id="selectManyListNormal">
+ <tc:selectItem itemLabel="One" itemValue="one"/>
+ <tc:selectItem itemLabel="Two" itemValue="two"/>
+ <tc:selectItem itemLabel="Three" itemValue="three"/>
+ <tc:selectItem itemLabel="Four" itemValue="four"/>
+ <tc:selectItem itemLabel="Five" itemValue="five"/>
+ </tc:selectManyList>
+
+ <tc:in id="inLarge" markup="large"/>
+ <tc:selectOneChoice id="selectOneChoiceLarge" markup="large">
+ <tc:selectItem itemLabel="One" itemValue="one"/>
+ <tc:selectItem itemLabel="Two" itemValue="two"/>
+ </tc:selectOneChoice>
+ <tc:selectOneList id="selectOneListLarge" markup="large">
+ <tc:selectItem itemLabel="One" itemValue="one"/>
+ <tc:selectItem itemLabel="Two" itemValue="two"/>
+ </tc:selectOneList>
+ <tc:selectManyList id="selectManyListLarge" markup="large">
+ <tc:selectItem itemLabel="One" itemValue="one"/>
+ <tc:selectItem itemLabel="Two" itemValue="two"/>
+ <tc:selectItem itemLabel="Three" itemValue="three"/>
+ <tc:selectItem itemLabel="Four" itemValue="four"/>
+ <tc:selectItem itemLabel="Five" itemValue="five"/>
+ </tc:selectManyList>
+ </tc:segmentLayout>
+</ui:composition>
diff --git a/tobago-theme/src/main/scss/_tobago.scss b/tobago-theme/src/main/scss/_tobago.scss
index e4f2080cff..c553361645 100644
--- a/tobago-theme/src/main/scss/_tobago.scss
+++ b/tobago-theme/src/main/scss/_tobago.scss
@@ -271,6 +271,7 @@ $tobago-flex-layout-spacing: 0.5rem;
flex: 1 0 0;
min-width: 1rem;
background-color: transparent;
+ min-height: 0; //Overwrite min-height of form-control-sm/lg; TOBAGO-2281
&:focus {
box-shadow: none;