RiverLea: 1.2.2-5.81 - fixes four regressions, one visual change

ext/riverlea/CHANGELOG.md

@@ -1,3 +1,13 @@
+1.2.2-5.81beta
+ - FIXED - major regression introduced in 1.2.1-5.81beta around Select2 sub-results: https://lab.civicrm.org/extensions/riverlea/-/issues/11#note_174883
+ - FIXED - contact dashboard tags didn't wrap: https://lab.civicrm.org/extensions/riverlea/-/issues/97
+
+1.2.1-5.81beta
+ - FIXED - integrated this fix to rendered radio buttons: https://github.com/civicrm/civicrm-core/pull/31345
+ - FIXED - text colour on selected rows illegible: https://lab.civicrm.org/extensions/riverlea/-/issues/94#note_174585
+ - FIXED - accordions inside Select2 now work. Some small tidying of Select2 list borders/padding.
+ - CHANGED - reduced size of 'not found' alerts in SearchKit tables: https://github.com/civicrm/civicrm-core/pull/31605
+
 1.2.0-5.81.beta
  - CHANGED - version numbering (again!) ref
 https://lab.civicrm.org/extensions/riverlea/-/issues/44#note_174132

ext/riverlea/README.md

@@ -17,7 +17,8 @@ Overwriting CSS variables for the front is straightforward (they can be nested w
 
 ## [Changelog](CHANGELOG.md)
 
-- 1.80 (5.80) - Release for packaging with CiviCRM core, v5.80 (see note on numbering below)
+- 1.2.x-5.81 - Regression fixes against 5.81 RC  (see note on numbering below).
+- 1.1 (5.80) - Release for packaging with CiviCRM core, v5.80
 - 1.0 - **Release candidate**, with ongoing testing and fixes.
 - 0.10 - **Adds fourth stream**. Thames (Aah), as well as extensive fixes & adjustments.
 - 0.9 - **Overwrites civi core CSS**. 5.75 only - overwrites core css like SearchKit & FormBuilder with extensive work on both. D7 Garland support.
@@ -31,9 +32,11 @@ Overwriting CSS variables for the front is straightforward (they can be nested w
 - 0.1 - **Proof-of-concept**, basic variables.
 
 ### Version numbering
-RiverLea has its own version number and confusingly this has changed a few times while we figured out the best approach. It is also different in the core-extension info.xml which in core will always match the Civi version its shipped with, but as a standalone extension has its own numbering.
+RiverLea has its own version number and confusingly this has changed a few times while we figured out the best approach. It currently takes the form `[River Lea version]-[CiviCRM version built on]`.
 
-The pattern is `1.x.y` where x = the CiviCRM version it is developed against and y = the version number of of RiverLea for that Civi version. So `1.80.11` is the 11th version of RiverLea v1 built against CiviCRM `5.80.x`. Some previous versions tried to match the CiviCRM core version number and build on that (ie RiverLea 5.80.11), but this caused problems with upgrade prompts.
+This means there might be simultaneously versions `1.2.1-5.81.beta` and `1.3.0-5.82.alpha`.
+
+Please ignore previous numbering patterns.
 
 ## Installation
 
@@ -148,4 +151,4 @@ function ocean_civicrm_themes(&$themes) {
 
 ## Troubleshooting
 - Unless you really need it (e.g. applying an urgent fix, or running a test), delete the custom/ext version of RiverLea, once you are on CiviCRM 5.80 or later.
-- After removing the custom/ext RiverLea directory, the civicrm/ext version should load automatically. It may appear to be enabled, but normally you will need to disable and re-enable it before RiverLea streams appear in Display Settings.
+- After removing the custom/ext RiverLea directory, the civicrm/ext version should load automatically. It may appear to be enabled, but normally you will need to disable and re-enable it before RiverLea streams appear in Display Settings.

ext/riverlea/core/css/_core.css

@@ -4,5 +4,5 @@
    can be merged later. */
 
 @import url(components/_accordion.css); @import url(components/_alerts.css); @import url(components/_buttons.css); @import url(components/_form.css); @import url(components/_icons.css); @import url(components/_nav.css); @import url(components/_tabs.css); @import url(components/_dropdowns.css); @import url(components/_tables.css); @import url(components/_dialogs.css); @import url(components/_page.css); @import url(components/_components.css); @import url(components/_front.css); :root {
-  --crm-release: '1.2.0-5.81.beta';
+  --crm-release: '1.2.2-5.81.beta';
 }

ext/riverlea/core/css/components/_alerts.css

@@ -59,8 +59,13 @@
   color: var(--crm-alert-text-danger);
 }
 .crm-container .help a,
-.crm-container .messages a {
+.crm-container .messages a,
+.crm-container .alert a,
+.crm-container table tr.crm-row-selected a {
   color: inherit;
+}
+.crm-container .help a,
+.crm-container .messages a {
   text-decoration: underline;
 }
 .crm-container .help a:hover,
@@ -107,3 +112,11 @@
   right: -21px;
   color: inherit;
 }
+
+/* Alerts in tables (ref https://github.com/civicrm/civicrm-core/pull/31605) */
+
+#bootstrap-theme td > p.alert.ng-binding {
+  width: fit-content;
+  margin: 1rem auto;
+  padding: var(--crm-padding-small) var(--crm-padding-reg);
+}

ext/riverlea/core/css/components/_form.css

@@ -352,6 +352,10 @@ input.crm-form-checkbox + label,
   flex-wrap: wrap;
   gap: var(--gap);
 }
+/* Reset checkbox width when its rendered as text '(x)' in confirmation screens /dev/core/-/issues/5550 */
+.crm-container.crm-public .crm-profile-view .crm-option-label-pair {
+  --checkbox-width: auto;
+}
 /* Override more general styling */
 .crm-container .crm-multiple-checkbox-radio-options :where(input.crm-form-radio,
 input.crm-form-checkbox) + label {
@@ -567,10 +571,12 @@ input.crm-form-checkbox) + label {
 }
 .select2-drop.select2-drop-active.crm-container .select2-results li {
   color: var(--crm-c-text);
-  padding-block: var(--crm-s);
-  border-top: 1px solid var(--crm-c-background4);
+  padding: var(--crm-s) var(--crm-m);
   margin: 0;
 }
+.select2-drop.select2-drop-active.crm-container .select2-results li:has(.crm-select2-row-description) {
+  border-top: var(--crm-c-divider);
+}
 .select2-results .select2-ajax-error,
 .select2-results .select2-no-results,
 .select2-results .select2-searching,
@@ -589,11 +595,6 @@ input.crm-form-checkbox) + label {
   height: var(--crm-l);
   margin-top: var(--crm-s);
 }
-.select2-drop.select2-drop-active.crm-container .select2-results > li {
-  color: var(--crm-c-text);
-  padding: var(--crm-m);
-  border-top: 0;
-}
 .select2-drop .crm-entityref-links {
   border-top: 1px solid var(--crm-input-border-color);
   margin-top: var(--crm-m);
@@ -622,6 +623,36 @@ input.crm-form-checkbox) + label {
   padding: 0;
 }
 
+/* Select2 accordion (re-uses some of accordion.css) */
+
+.select2-drop.collapsible-optgroups-enabled .select2-result-with-children .select2-result-sub {
+  display: none;
+}
+.select2-drop.collapsible-optgroups-enabled .select2-result-with-children.optgroup-expanded .select2-result-sub {
+  display: block;
+}
+.select2-drop.collapsible-optgroups-enabled .select2-result-with-children.optgroup-expanded > .select2-result-label:before {
+  transform: var(--crm-expand-transform);
+  transition: var(--crm-expand-transition);
+}
+.select2-drop.collapsible-optgroups-enabled .select2-result-with-children > .select2-result-label:before {
+  font-size: var(--crm-font-size);
+  content: var(--crm-expand-icon);
+  color: var(--crm-expand-icon-color);
+  font-style: normal;
+  font-family: FontAwesome;
+  text-rendering: auto;
+  text-indent: inherit;
+  margin-right: 0.5rem;
+  display: inline-block;
+  transform-origin: center center;
+  transition: var(--crm-expand-transition);
+}
+.select2-drop.select2-drop-active.crm-container li.select2-result-with-children {
+  padding: 0;
+}
+
+
 /* Dates */
 
 .form-inline:has(.crm-form-date-wrapper) {

ext/riverlea/core/css/components/_tables.css

@@ -382,6 +382,7 @@ tbody .crm-row-child:not(:has(~ .crm-row-child)) td {
 .crm-container table tr.crm-row-ok,
 .crm-container table tr.crm-row-ok > td {
   background-color: var(--crm-alert-background-help);
+  color: var(--crm-alert-text-help);
 }
 .crm-container .table-hover > tbody > tr > td.success:hover,
 .crm-container .table-hover > tbody > tr > th.success:hover,
@@ -397,6 +398,7 @@ tbody .crm-row-child:not(:has(~ .crm-row-child)) td {
 .crm-container .table tr.warning > td,
 .crm-container .table tr.warning > th {
   background-color: var(--crm-alert-background-warning);
+  color: var(--crm-alert-text-warning);
 }
 .crm-container .table-hover > tbody > tr > td.warning:hover,
 .crm-container .table-hover > tbody > tr > th.warning:hover,
@@ -412,6 +414,7 @@ tbody .crm-row-child:not(:has(~ .crm-row-child)) td {
 .crm-container table tr.crm-row-error,
 .crm-container table tr.crm-row-error > td {
   background-color: var(--crm-alert-background-danger);
+  color: var(--crm-alert-text-danger);
 }
 .crm-container .table-hover > tbody > tr > td.danger:hover,
 .crm-container .table-hover > tbody > tr > th.danger:hover,
@@ -429,6 +432,7 @@ tbody .crm-row-child:not(:has(~ .crm-row-child)) td {
 .crm-container table tr.crm-row-selected,
 .crm-container table tr.crm-row-selected > td {
   background-color: var(--crm-alert-background-info);
+  color: var(--crm-alert-text-info);
 }
 .crm-container .table-hover > tbody > tr > td.info:hover,
 .crm-container .table-hover > tbody > tr > th.info:hover,

ext/riverlea/core/css/contactSummary.css

@@ -324,6 +324,7 @@ div.crm-inline-edit-form div.crm-clear {
 }
 .crm-contact-page #tags {
   display: flex;
+  flex-wrap: wrap;
   gap: var(--crm-s);
   align-items: center;
 }

ext/riverlea/info.xml

@@ -12,7 +12,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>[civicrm.releaseDate]</releaseDate>
-  <version>1.2-[civicrm.version]</version>
+  <version>1.2.2-[civicrm.version]</version>
   <develStage>stable</develStage>
   <compatibility>
     <ver>[civicrm.majorVersion]</ver>