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 2022/11/03 12:33:06 UTC
[myfaces-tobago] branch main updated (bbb36f0f06 -> 48e809a854)
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 bbb36f0f06 demo(search): fix missing context path
new 0af1fd4756 refactor(badge): Use text-bg-* classes
new 48e809a854 build(theme): rebuild after refactor badge
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/BadgeRenderer.java | 26 ++++-----
.../tobago/renderkit/css/BootstrapClass.java | 8 +++
.../buttons/badgeWarning-inside-buttons.html | 4 +-
tobago-theme/src/main/scss/_tobago.scss | 46 ++++++++++------
.../src/main/css/tobago.css | 63 +++++++---------------
.../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 | 63 +++++++---------------
.../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 | 63 +++++++---------------
.../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 | 63 +++++++---------------
.../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 | 63 +++++++---------------
.../src/main/css/tobago.css.map | 2 +-
.../src/main/css/tobago.min.css | 2 +-
.../src/main/css/tobago.min.css.map | 2 +-
24 files changed, 164 insertions(+), 265 deletions(-)
[myfaces-tobago] 02/02: build(theme): rebuild after refactor badge
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 48e809a854ca26d742d4c34f1211cbd4de479f32
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Thu Nov 3 09:42:42 2022 +0100
build(theme): rebuild after refactor badge
---
.../src/main/css/tobago.css | 63 +++++++---------------
.../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 | 63 +++++++---------------
.../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 | 63 +++++++---------------
.../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 | 63 +++++++---------------
.../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 | 63 +++++++---------------
.../src/main/css/tobago.css.map | 2 +-
.../src/main/css/tobago.min.css | 2 +-
.../src/main/css/tobago.min.css.map | 2 +-
20 files changed, 110 insertions(+), 235 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 b0ad2ba699..bf081c1e7c 100644
--- a/tobago-theme/tobago-theme-charlotteville/src/main/css/tobago.css
+++ b/tobago-theme/tobago-theme-charlotteville/src/main/css/tobago.css
@@ -10887,32 +10887,8 @@ textarea.form-control-lg {
tobago-badge {
background-color: #b2a76d;
}
-tobago-badge.badge.bg-primary, tobago-badge.badge.btn-primary {
- color: #000000;
-}
-tobago-badge.badge.bg-secondary, tobago-badge.badge.btn-secondary {
- color: #000000;
-}
-tobago-badge.badge.bg-success, tobago-badge.badge.btn-success {
- color: #000000;
-}
-tobago-badge.badge.bg-info, tobago-badge.badge.btn-info {
- color: #000000;
-}
-tobago-badge.badge.bg-warning, tobago-badge.badge.btn-warning {
- color: #000000;
-}
-tobago-badge.badge.bg-danger, tobago-badge.badge.btn-danger {
- color: #000000;
-}
-tobago-badge.badge.bg-light, tobago-badge.badge.btn-light {
- color: #000000;
-}
-tobago-badge.badge.bg-dark, tobago-badge.badge.btn-dark {
- color: #000000;
-}
tobago-badge.badge.btn {
- border: 0;
+ --bs-btn-border-width: 0;
}
tobago-badge.btn {
cursor: initial;
@@ -10963,7 +10939,6 @@ tobago-box > .card-body {
padding: 0;
}
-/* button, link ------------------------------------------------------- */
.tobago-button:disabled {
pointer-events: auto;
}
@@ -10976,32 +10951,32 @@ tobago-box > .card-body {
.tobago-button > i + span {
margin-left: 0.4em;
}
-.tobago-button.badge.bg-primary, .tobago-button.badge.btn-primary {
- color: #000000;
+.tobago-button.badge.btn {
+ --bs-btn-border-width: 0;
}
-.tobago-button.badge.bg-secondary, .tobago-button.badge.btn-secondary {
- color: #000000;
+.tobago-button.badge.btn-primary {
+ --bs-badge-color: #000000;
}
-.tobago-button.badge.bg-success, .tobago-button.badge.btn-success {
- color: #000000;
+.tobago-button.badge.btn-secondary {
+ --bs-badge-color: #000000;
}
-.tobago-button.badge.bg-info, .tobago-button.badge.btn-info {
- color: #000000;
+.tobago-button.badge.btn-success {
+ --bs-badge-color: #000000;
}
-.tobago-button.badge.bg-warning, .tobago-button.badge.btn-warning {
- color: #000000;
+.tobago-button.badge.btn-info {
+ --bs-badge-color: #000000;
}
-.tobago-button.badge.bg-danger, .tobago-button.badge.btn-danger {
- color: #000000;
+.tobago-button.badge.btn-warning {
+ --bs-badge-color: #000000;
}
-.tobago-button.badge.bg-light, .tobago-button.badge.btn-light {
- color: #000000;
+.tobago-button.badge.btn-danger {
+ --bs-badge-color: #000000;
}
-.tobago-button.badge.bg-dark, .tobago-button.badge.btn-dark {
- color: #000000;
+.tobago-button.badge.btn-light {
+ --bs-badge-color: #000000;
}
-.tobago-button.badge.btn {
- border: 0;
+.tobago-button.badge.btn-dark {
+ --bs-badge-color: #000000;
}
/* button -------------------------------------------------------------- */
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 dcdf0b9ffb..54be59527c 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/_reboot.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/mixins/_border-radius.scss","../../../../node_modules/bootstrap/scss/_type.s [...]
\ 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/_reboot.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/mixins/_border-radius.scss","../../../../node_modules/bootstrap/scss/_type.s [...]
\ 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 3c051d7fbe..e31a3a8f69 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{--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-gray-900:#212529;--bs [...]
+@charset "UTF-8";:root{--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-gray-900:#212529;--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 9b1280a3f0..83c79ce50c 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":"iBAuCA,MACE,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,CAAE,IAC9 [...]
\ No newline at end of file
+{"version":3,"sources":["tobago-theme-charlotteville/src/main/css/tobago.css"],"names":[],"mappings":"iBAuCA,MACE,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,CAAE,IAC9 [...]
\ 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 070e777e28..9477924afa 100644
--- a/tobago-theme/tobago-theme-roxborough/src/main/css/tobago.css
+++ b/tobago-theme/tobago-theme-roxborough/src/main/css/tobago.css
@@ -10914,32 +10914,8 @@ textarea.form-control-lg {
tobago-badge {
background-color: #6c00cb;
}
-tobago-badge.badge.bg-primary, tobago-badge.badge.btn-primary {
- color: #000000;
-}
-tobago-badge.badge.bg-secondary, tobago-badge.badge.btn-secondary {
- color: #fff;
-}
-tobago-badge.badge.bg-success, tobago-badge.badge.btn-success {
- color: #fff;
-}
-tobago-badge.badge.bg-info, tobago-badge.badge.btn-info {
- color: #fff;
-}
-tobago-badge.badge.bg-warning, tobago-badge.badge.btn-warning {
- color: #000000;
-}
-tobago-badge.badge.bg-danger, tobago-badge.badge.btn-danger {
- color: #000000;
-}
-tobago-badge.badge.bg-light, tobago-badge.badge.btn-light {
- color: #000000;
-}
-tobago-badge.badge.bg-dark, tobago-badge.badge.btn-dark {
- color: #fff;
-}
tobago-badge.badge.btn {
- border: 0;
+ --bs-btn-border-width: 0;
}
tobago-badge.btn {
cursor: initial;
@@ -10990,7 +10966,6 @@ tobago-box > .card-body {
padding: 0;
}
-/* button, link ------------------------------------------------------- */
.tobago-button:disabled {
pointer-events: auto;
}
@@ -11003,32 +10978,32 @@ tobago-box > .card-body {
.tobago-button > i + span {
margin-left: 0.4em;
}
-.tobago-button.badge.bg-primary, .tobago-button.badge.btn-primary {
- color: #000000;
+.tobago-button.badge.btn {
+ --bs-btn-border-width: 0;
}
-.tobago-button.badge.bg-secondary, .tobago-button.badge.btn-secondary {
- color: #fff;
+.tobago-button.badge.btn-primary {
+ --bs-badge-color: #000000;
}
-.tobago-button.badge.bg-success, .tobago-button.badge.btn-success {
- color: #fff;
+.tobago-button.badge.btn-secondary {
+ --bs-badge-color: #fff;
}
-.tobago-button.badge.bg-info, .tobago-button.badge.btn-info {
- color: #fff;
+.tobago-button.badge.btn-success {
+ --bs-badge-color: #fff;
}
-.tobago-button.badge.bg-warning, .tobago-button.badge.btn-warning {
- color: #000000;
+.tobago-button.badge.btn-info {
+ --bs-badge-color: #fff;
}
-.tobago-button.badge.bg-danger, .tobago-button.badge.btn-danger {
- color: #000000;
+.tobago-button.badge.btn-warning {
+ --bs-badge-color: #000000;
}
-.tobago-button.badge.bg-light, .tobago-button.badge.btn-light {
- color: #000000;
+.tobago-button.badge.btn-danger {
+ --bs-badge-color: #000000;
}
-.tobago-button.badge.bg-dark, .tobago-button.badge.btn-dark {
- color: #fff;
+.tobago-button.badge.btn-light {
+ --bs-badge-color: #000000;
}
-.tobago-button.badge.btn {
- border: 0;
+.tobago-button.badge.btn-dark {
+ --bs-badge-color: #fff;
}
/* button -------------------------------------------------------------- */
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 e996e88afe..830c88e8dc 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/_reboot.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/mixins/_border-radius.scss","../../../../node_modules/bootstrap/scss/_type.s [...]
\ 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/_reboot.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/mixins/_border-radius.scss","../../../../node_modules/bootstrap/scss/_type.s [...]
\ 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 57adb9eb2d..ddc717edb0 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 4b4a56cb0b..f061a5e58d 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,MAShC,MACE,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,eAAgB,QAC [...]
\ 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,MAShC,MACE,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,eAAgB,QAC [...]
\ 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 83671ed033..5a1bae75a8 100644
--- a/tobago-theme/tobago-theme-scarborough/src/main/css/tobago.css
+++ b/tobago-theme/tobago-theme-scarborough/src/main/css/tobago.css
@@ -10888,32 +10888,8 @@ textarea.form-control-lg {
tobago-badge {
background-color: #6c757d;
}
-tobago-badge.badge.bg-primary, tobago-badge.badge.btn-primary {
- color: #fff;
-}
-tobago-badge.badge.bg-secondary, tobago-badge.badge.btn-secondary {
- color: #fff;
-}
-tobago-badge.badge.bg-success, tobago-badge.badge.btn-success {
- color: #fff;
-}
-tobago-badge.badge.bg-info, tobago-badge.badge.btn-info {
- color: #000;
-}
-tobago-badge.badge.bg-warning, tobago-badge.badge.btn-warning {
- color: #000;
-}
-tobago-badge.badge.bg-danger, tobago-badge.badge.btn-danger {
- color: #fff;
-}
-tobago-badge.badge.bg-light, tobago-badge.badge.btn-light {
- color: #000;
-}
-tobago-badge.badge.bg-dark, tobago-badge.badge.btn-dark {
- color: #fff;
-}
tobago-badge.badge.btn {
- border: 0;
+ --bs-btn-border-width: 0;
}
tobago-badge.btn {
cursor: initial;
@@ -10964,7 +10940,6 @@ tobago-box > .card-body {
padding: 0;
}
-/* button, link ------------------------------------------------------- */
.tobago-button:disabled {
pointer-events: auto;
}
@@ -10977,32 +10952,32 @@ tobago-box > .card-body {
.tobago-button > i + span {
margin-left: 0.4em;
}
-.tobago-button.badge.bg-primary, .tobago-button.badge.btn-primary {
- color: #fff;
+.tobago-button.badge.btn {
+ --bs-btn-border-width: 0;
}
-.tobago-button.badge.bg-secondary, .tobago-button.badge.btn-secondary {
- color: #fff;
+.tobago-button.badge.btn-primary {
+ --bs-badge-color: #fff;
}
-.tobago-button.badge.bg-success, .tobago-button.badge.btn-success {
- color: #fff;
+.tobago-button.badge.btn-secondary {
+ --bs-badge-color: #fff;
}
-.tobago-button.badge.bg-info, .tobago-button.badge.btn-info {
- color: #000;
+.tobago-button.badge.btn-success {
+ --bs-badge-color: #fff;
}
-.tobago-button.badge.bg-warning, .tobago-button.badge.btn-warning {
- color: #000;
+.tobago-button.badge.btn-info {
+ --bs-badge-color: #000;
}
-.tobago-button.badge.bg-danger, .tobago-button.badge.btn-danger {
- color: #fff;
+.tobago-button.badge.btn-warning {
+ --bs-badge-color: #000;
}
-.tobago-button.badge.bg-light, .tobago-button.badge.btn-light {
- color: #000;
+.tobago-button.badge.btn-danger {
+ --bs-badge-color: #fff;
}
-.tobago-button.badge.bg-dark, .tobago-button.badge.btn-dark {
- color: #fff;
+.tobago-button.badge.btn-light {
+ --bs-badge-color: #000;
}
-.tobago-button.badge.btn {
- border: 0;
+.tobago-button.badge.btn-dark {
+ --bs-badge-color: #fff;
}
/* button -------------------------------------------------------------- */
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 6557146b88..68893200fd 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","../../../../node_modules/bootstrap/scss/mixins/_banner.scss","../../../../node_modules/bootstrap/scss/_root.scss","../../../../node_modules/bootstrap/scss/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/_reboot.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/mixins/_border-radius.scss","../../../../node_modules/bootstrap/scss/_type.scss","../../../../node_ [...]
\ 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/_reboot.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/mixins/_border-radius.scss","../../../../node_modules/bootstrap/scss/_type.scss","../../../../node_ [...]
\ 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 069db2efef..b323b034fd 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{--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-900:#212529;--bs-prima [...]
+@charset "UTF-8";:root{--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-900:#212529;--bs-prima [...]
/*# 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 46567ed66a..88cfcf4273 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":"iBAuBA,MACE,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,IAC9B,i [...]
\ No newline at end of file
+{"version":3,"sources":["tobago-theme-scarborough/src/main/css/tobago.css"],"names":[],"mappings":"iBAuBA,MACE,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,IAC9B,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 1c47d1d5c1..dda8208c19 100644
--- a/tobago-theme/tobago-theme-speyside/src/main/css/tobago.css
+++ b/tobago-theme/tobago-theme-speyside/src/main/css/tobago.css
@@ -10614,32 +10614,8 @@ textarea.form-control-lg {
tobago-badge {
background-color: #d7d7d7;
}
-tobago-badge.badge.bg-primary, tobago-badge.badge.btn-primary {
- color: #fff;
-}
-tobago-badge.badge.bg-secondary, tobago-badge.badge.btn-secondary {
- color: #000;
-}
-tobago-badge.badge.bg-success, tobago-badge.badge.btn-success {
- color: #000;
-}
-tobago-badge.badge.bg-info, tobago-badge.badge.btn-info {
- color: #000;
-}
-tobago-badge.badge.bg-warning, tobago-badge.badge.btn-warning {
- color: #000;
-}
-tobago-badge.badge.bg-danger, tobago-badge.badge.btn-danger {
- color: #fff;
-}
-tobago-badge.badge.bg-light, tobago-badge.badge.btn-light {
- color: #000;
-}
-tobago-badge.badge.bg-dark, tobago-badge.badge.btn-dark {
- color: #fff;
-}
tobago-badge.badge.btn {
- border: 0;
+ --bs-btn-border-width: 0;
}
tobago-badge.btn {
cursor: initial;
@@ -10690,7 +10666,6 @@ tobago-box > .card-body {
padding: 0;
}
-/* button, link ------------------------------------------------------- */
.tobago-button:disabled {
pointer-events: auto;
}
@@ -10703,32 +10678,32 @@ tobago-box > .card-body {
.tobago-button > i + span {
margin-left: 0.4em;
}
-.tobago-button.badge.bg-primary, .tobago-button.badge.btn-primary {
- color: #fff;
+.tobago-button.badge.btn {
+ --bs-btn-border-width: 0;
}
-.tobago-button.badge.bg-secondary, .tobago-button.badge.btn-secondary {
- color: #000;
+.tobago-button.badge.btn-primary {
+ --bs-badge-color: #fff;
}
-.tobago-button.badge.bg-success, .tobago-button.badge.btn-success {
- color: #000;
+.tobago-button.badge.btn-secondary {
+ --bs-badge-color: #000;
}
-.tobago-button.badge.bg-info, .tobago-button.badge.btn-info {
- color: #000;
+.tobago-button.badge.btn-success {
+ --bs-badge-color: #000;
}
-.tobago-button.badge.bg-warning, .tobago-button.badge.btn-warning {
- color: #000;
+.tobago-button.badge.btn-info {
+ --bs-badge-color: #000;
}
-.tobago-button.badge.bg-danger, .tobago-button.badge.btn-danger {
- color: #fff;
+.tobago-button.badge.btn-warning {
+ --bs-badge-color: #000;
}
-.tobago-button.badge.bg-light, .tobago-button.badge.btn-light {
- color: #000;
+.tobago-button.badge.btn-danger {
+ --bs-badge-color: #fff;
}
-.tobago-button.badge.bg-dark, .tobago-button.badge.btn-dark {
- color: #fff;
+.tobago-button.badge.btn-light {
+ --bs-badge-color: #000;
}
-.tobago-button.badge.btn {
- border: 0;
+.tobago-button.badge.btn-dark {
+ --bs-badge-color: #fff;
}
/* button -------------------------------------------------------------- */
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 9ae7c330e9..d4e8c1c4a6 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/_reboot.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,"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/_reboot.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-speyside/src/main/css/tobago.min.css b/tobago-theme/tobago-theme-speyside/src/main/css/tobago.min.css
index 05a5a9b62a..bea198d54d 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{--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-700:#55595c;--bs-gray [...]
+@charset "UTF-8";:root{--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-700:#55595c;--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 7220c1f67f..0723a4ef9e 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":"iBAuCA,MACE,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,CAAE,IA [...]
\ No newline at end of file
+{"version":3,"sources":["tobago-theme-speyside/src/main/css/tobago.css"],"names":[],"mappings":"iBAuCA,MACE,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,CAAE,IA [...]
\ 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 fd7f6b28c1..fbb92f3435 100644
--- a/tobago-theme/tobago-theme-standard/src/main/css/tobago.css
+++ b/tobago-theme/tobago-theme-standard/src/main/css/tobago.css
@@ -10871,32 +10871,8 @@ textarea.form-control-lg {
tobago-badge {
background-color: #6c757d;
}
-tobago-badge.badge.bg-primary, tobago-badge.badge.btn-primary {
- color: #fff;
-}
-tobago-badge.badge.bg-secondary, tobago-badge.badge.btn-secondary {
- color: #fff;
-}
-tobago-badge.badge.bg-success, tobago-badge.badge.btn-success {
- color: #fff;
-}
-tobago-badge.badge.bg-info, tobago-badge.badge.btn-info {
- color: #000;
-}
-tobago-badge.badge.bg-warning, tobago-badge.badge.btn-warning {
- color: #000;
-}
-tobago-badge.badge.bg-danger, tobago-badge.badge.btn-danger {
- color: #fff;
-}
-tobago-badge.badge.bg-light, tobago-badge.badge.btn-light {
- color: #000;
-}
-tobago-badge.badge.bg-dark, tobago-badge.badge.btn-dark {
- color: #fff;
-}
tobago-badge.badge.btn {
- border: 0;
+ --bs-btn-border-width: 0;
}
tobago-badge.btn {
cursor: initial;
@@ -10947,7 +10923,6 @@ tobago-box > .card-body {
padding: 0;
}
-/* button, link ------------------------------------------------------- */
.tobago-button:disabled {
pointer-events: auto;
}
@@ -10960,32 +10935,32 @@ tobago-box > .card-body {
.tobago-button > i + span {
margin-left: 0.4em;
}
-.tobago-button.badge.bg-primary, .tobago-button.badge.btn-primary {
- color: #fff;
+.tobago-button.badge.btn {
+ --bs-btn-border-width: 0;
}
-.tobago-button.badge.bg-secondary, .tobago-button.badge.btn-secondary {
- color: #fff;
+.tobago-button.badge.btn-primary {
+ --bs-badge-color: #fff;
}
-.tobago-button.badge.bg-success, .tobago-button.badge.btn-success {
- color: #fff;
+.tobago-button.badge.btn-secondary {
+ --bs-badge-color: #fff;
}
-.tobago-button.badge.bg-info, .tobago-button.badge.btn-info {
- color: #000;
+.tobago-button.badge.btn-success {
+ --bs-badge-color: #fff;
}
-.tobago-button.badge.bg-warning, .tobago-button.badge.btn-warning {
- color: #000;
+.tobago-button.badge.btn-info {
+ --bs-badge-color: #000;
}
-.tobago-button.badge.bg-danger, .tobago-button.badge.btn-danger {
- color: #fff;
+.tobago-button.badge.btn-warning {
+ --bs-badge-color: #000;
}
-.tobago-button.badge.bg-light, .tobago-button.badge.btn-light {
- color: #000;
+.tobago-button.badge.btn-danger {
+ --bs-badge-color: #fff;
}
-.tobago-button.badge.bg-dark, .tobago-button.badge.btn-dark {
- color: #fff;
+.tobago-button.badge.btn-light {
+ --bs-badge-color: #000;
}
-.tobago-button.badge.btn {
- border: 0;
+.tobago-button.badge.btn-dark {
+ --bs-badge-color: #fff;
}
/* button -------------------------------------------------------------- */
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 b2c3d4948d..394decffc4 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/_reboot.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/mixins/_border-radius.scss","../../../../node_modules/bootstrap/scss/_type.scss","../../../../node_ [...]
\ 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/_reboot.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/mixins/_border-radius.scss","../../../../node_modules/bootstrap/scss/_type.scss","../../../../node_ [...]
\ 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 0c3aa39df2..df87f9f9f8 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{--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-900:#212529;--bs-prima [...]
+@charset "UTF-8";:root{--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-900:#212529;--bs-prima [...]
/*# 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 eef79450d1..531b93e8a1 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":"iBAuBA,MACE,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,IAC9B,iBAA [...]
\ No newline at end of file
+{"version":3,"sources":["tobago-theme-standard/src/main/css/tobago.css"],"names":[],"mappings":"iBAuBA,MACE,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,IAC9B,iBAA [...]
\ No newline at end of file
[myfaces-tobago] 01/02: refactor(badge): Use text-bg-* classes
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 0af1fd4756a3d8edce291a7e91308403bc01ff07
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Thu Nov 3 13:13:32 2022 +0100
refactor(badge): Use text-bg-* classes
* use text-bg-*
* adjust test
* cleanup _tobago.scss
Issue: TOBAGO-2165
---
.../internal/renderkit/renderer/BadgeRenderer.java | 26 ++++++------
.../tobago/renderkit/css/BootstrapClass.java | 8 ++++
.../buttons/badgeWarning-inside-buttons.html | 4 +-
tobago-theme/src/main/scss/_tobago.scss | 46 +++++++++++++++-------
4 files changed, 54 insertions(+), 30 deletions(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BadgeRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BadgeRenderer.java
index 182bcc5f97..35147502fb 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BadgeRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BadgeRenderer.java
@@ -42,11 +42,11 @@ public class BadgeRenderer<T extends AbstractUIBadge> extends RendererBase<T> {
writer.startElement(HtmlElements.TOBAGO_BADGE);
writer.writeIdAttribute(component.getClientId(facesContext));
writer.writeClassAttribute(
- BootstrapClass.BADGE,
- getBadgeColor(markup),
- markup.contains(Markup.PILL) ? BootstrapClass.ROUNDED_PILL : null,
- isInside(facesContext, HtmlElements.TOBAGO_BUTTONS) ? BootstrapClass.BTN : null,
- component.getCustomClass());
+ BootstrapClass.BADGE,
+ getBadgeColor(markup),
+ markup.contains(Markup.PILL) ? BootstrapClass.ROUNDED_PILL : null,
+ isInside(facesContext, HtmlElements.TOBAGO_BUTTONS) ? BootstrapClass.BTN : null,
+ component.getCustomClass());
if (tip != null) {
writer.writeAttribute(HtmlAttributes.TITLE, tip, true);
@@ -66,21 +66,21 @@ public class BadgeRenderer<T extends AbstractUIBadge> extends RendererBase<T> {
if (markup.contains(Markup.NONE)) {
return null;
} else if (markup.contains(Markup.PRIMARY)) {
- return BootstrapClass.BG_PRIMARY;
+ return BootstrapClass.TEXT_BG_PRIMARY;
} else if (markup.contains(Markup.SECONDARY)) {
- return BootstrapClass.BG_SECONDARY;
+ return BootstrapClass.TEXT_BG_SECONDARY;
} else if (markup.contains(Markup.SUCCESS)) {
- return BootstrapClass.BG_SUCCESS;
+ return BootstrapClass.TEXT_BG_SUCCESS;
} else if (markup.contains(Markup.DANGER)) {
- return BootstrapClass.BG_DANGER;
+ return BootstrapClass.TEXT_BG_DANGER;
} else if (markup.contains(Markup.WARNING)) {
- return BootstrapClass.BG_WARNING;
+ return BootstrapClass.TEXT_BG_WARNING;
} else if (markup.contains(Markup.INFO)) {
- return BootstrapClass.BG_INFO;
+ return BootstrapClass.TEXT_BG_INFO;
} else if (markup.contains(Markup.LIGHT)) {
- return BootstrapClass.BG_LIGHT;
+ return BootstrapClass.TEXT_BG_LIGHT;
} else if (markup.contains(Markup.DARK)) {
- return BootstrapClass.BG_DARK;
+ return BootstrapClass.TEXT_BG_DARK;
} else {
return 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 b6b51b7c9c..a147f3c8c5 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
@@ -573,6 +573,14 @@ public enum BootstrapClass implements CssItem {
@Deprecated
SR_ONLY("sr-only"),
STICKY_TOP("sticky-top"),
+ TEXT_BG_DANGER("text-bg-danger"),
+ TEXT_BG_DARK("text-bg-dark"),
+ TEXT_BG_INFO("text-bg-info"),
+ TEXT_BG_LIGHT("text-bg-light"),
+ TEXT_BG_PRIMARY("text-bg-primary"),
+ TEXT_BG_SECONDARY("text-bg-secondary"),
+ TEXT_BG_SUCCESS("text-bg-success"),
+ TEXT_BG_WARNING("text-bg-warning"),
TEXT_DANGER("text-danger"),
TEXT_DARK("text-dark"),
TEXT_INFO("text-info"),
diff --git a/tobago-core/src/test/resources/renderer/buttons/badgeWarning-inside-buttons.html b/tobago-core/src/test/resources/renderer/buttons/badgeWarning-inside-buttons.html
index 4314dd0dbf..9ff17d9e8a 100644
--- a/tobago-core/src/test/resources/renderer/buttons/badgeWarning-inside-buttons.html
+++ b/tobago-core/src/test/resources/renderer/buttons/badgeWarning-inside-buttons.html
@@ -16,7 +16,7 @@
-->
<tobago-buttons id='list' class='btn-group tobago-auto-spacing' role='group'>
- <tobago-badge id='badge' class='badge bg-warning btn'>
+ <tobago-badge id='badge' class='badge text-bg-warning btn'>
</tobago-badge>
<button type='button' id='id' name='id' class='tobago-button btn btn-secondary'><tobago-behavior event='click' client-id='id'></tobago-behavior><span>button</span></button>
-</tobago-buttons>
\ No newline at end of file
+</tobago-buttons>
diff --git a/tobago-theme/src/main/scss/_tobago.scss b/tobago-theme/src/main/scss/_tobago.scss
index 8da84c2cd8..47e9fd1637 100644
--- a/tobago-theme/src/main/scss/_tobago.scss
+++ b/tobago-theme/src/main/scss/_tobago.scss
@@ -66,18 +66,9 @@ $tobago-flex-layout-spacing: 0.5rem;
}
}
-@mixin badge() {
- &.badge {
- @each $color, $value in $theme-colors {
- &.bg-#{$color}, &.btn-#{$color} {
- // set text color to make sure there is no white text on white background
- color: color-contrast($value);
- }
- }
-
- &.btn {
- border: 0; //badge have no border; a button with markup badge should also have no border
- }
+@mixin badgeBtn() {
+ &.badge.btn {
+ --#{$prefix}btn-border-width: 0; //badge have no border; a button with markup badge should also have no border
}
}
@@ -177,7 +168,7 @@ $tobago-flex-layout-spacing: 0.5rem;
}
tobago-badge {
- @include badge();
+ @include badgeBtn();
&.btn {
cursor: initial; //revert cursor attribute on .btn class
@@ -244,11 +235,18 @@ tobago-box {
}
}
-/* button, link ------------------------------------------------------- */
.tobago-button {
@include buttonLinkDisabledCursor();
@include buttonLinkImageTextSpacing();
- @include badge();
+ @include badgeBtn();
+
+ &.badge {
+ @each $color, $value in $theme-colors {
+ &.btn-#{$color} {
+ --#{$prefix}badge-color: #{color-contrast($value)};
+ }
+ }
+ }
}
/* button -------------------------------------------------------------- */
@@ -1355,30 +1353,39 @@ tobago-sheet {
content: $icon-sort-ascending;
opacity: 1;
}
+
&.tobago-circle-1::after {
content: $icon-sort-ascending + $icon-nbsp + $icon-sort-1;
}
+
&.tobago-circle-2::after {
content: $icon-sort-ascending + $icon-nbsp + $icon-sort-2;
}
+
&.tobago-circle-3::after {
content: $icon-sort-ascending + $icon-nbsp + $icon-sort-3;
}
+
&.tobago-circle-4::after {
content: $icon-sort-ascending + $icon-nbsp + $icon-sort-4;
}
+
&.tobago-circle-5::after {
content: $icon-sort-ascending + $icon-nbsp + $icon-sort-5;
}
+
&.tobago-circle-6::after {
content: $icon-sort-ascending + $icon-nbsp + $icon-sort-6;
}
+
&.tobago-circle-7::after {
content: $icon-sort-ascending + $icon-nbsp + $icon-sort-7;
}
+
&.tobago-circle-8::after {
content: $icon-sort-ascending + $icon-nbsp + $icon-sort-8;
}
+
&.tobago-circle-9::after {
content: $icon-sort-ascending + $icon-nbsp + $icon-sort-9;
}
@@ -1389,30 +1396,39 @@ tobago-sheet {
content: $icon-sort-descending;
opacity: 1;
}
+
&.tobago-circle-1::after {
content: $icon-sort-descending + $icon-nbsp + $icon-sort-1;
}
+
&.tobago-circle-2::after {
content: $icon-sort-descending + $icon-nbsp + $icon-sort-2;
}
+
&.tobago-circle-3::after {
content: $icon-sort-descending + $icon-nbsp + $icon-sort-3;
}
+
&.tobago-circle-4::after {
content: $icon-sort-descending + $icon-nbsp + $icon-sort-4;
}
+
&.tobago-circle-5::after {
content: $icon-sort-descending + $icon-nbsp + $icon-sort-5;
}
+
&.tobago-circle-6::after {
content: $icon-sort-descending + $icon-nbsp + $icon-sort-6;
}
+
&.tobago-circle-7::after {
content: $icon-sort-descending + $icon-nbsp + $icon-sort-7;
}
+
&.tobago-circle-8::after {
content: $icon-sort-descending + $icon-nbsp + $icon-sort-8;
}
+
&.tobago-circle-9::after {
content: $icon-sort-descending + $icon-nbsp + $icon-sort-9;
}