diff --git a/ext/riverlea/CHANGELOG.md b/ext/riverlea/CHANGELOG.md index 4c8e34a2c9a1..a121439f3f55 100644 --- a/ext/riverlea/CHANGELOG.md +++ b/ext/riverlea/CHANGELOG.md @@ -1,3 +1,13 @@ +1.4.1-6.2alpha + - FIXED - start/end date appears inline (https://lab.civicrm.org/extensions/riverlea/-/issues/120) + - FIXED - float of prev/next on contact dashboard on WordPress in some contexts (https://lab.civicrm.org/extensions/riverlea/-/issues/118). + - ADDED - new multi-buttons wrapper `.crm-buttons` to provide uniform gap and wrap around multiple buttons, as no other class provides this - and instead it's handled on a case-by-case basis which is a waste of css. Not used anywhere currently, but referenced in discussion: https://github.com/civicrm/civicrm-core/pull/32344 & https://lab.civicrm.org/extensions/riverlea/-/issues/101. + +1.4.0-6.2alpha + - FIXED - right-align of event participant contact details removed (https://lab.civicrm.org/extensions/riverlea/-/issues/119). + - FIXED - FormBuilder left tabs squash and become illegible when too many items (https://lab.civicrm.org/extensions/riverlea/-/issues/116) + - CHANGED - only bottom align delete button when there are a limited number of custom activities (default list plus up to three more custom activities), otherwise keep inline (https://lab.civicrm.org/extensions/riverlea/-/issues/117) + 1.3.8-6.0alpha - FIXED - solves various issues around the naming of crm-text-light and crm-text-dark (https://github.com/civicrm/civicrm-core/pull/31994); - FIXED - Bootstrap Time input fields limit width, not 100%. diff --git a/ext/riverlea/README.md b/ext/riverlea/README.md index 973fe7ac7d7a..d109bf61eabb 100755 --- a/ext/riverlea/README.md +++ b/ext/riverlea/README.md @@ -17,6 +17,7 @@ Overwriting CSS variables for the front is straightforward (they can be nested w ## [Changelog](CHANGELOG.md) +- 1.4.x-6.2.alpha - ongoing fixes/changes against 6.2 - 1.3.x-6.0.alpha - Contrast ratios, responsive and Front-end changes, including new variables, plus fixes (see changelog) - 1.2.x-5.81 - Regression fixes against 5.81 RC - 1.1 (5.80) - Release for packaging with CiviCRM core, v5.80 diff --git a/ext/riverlea/core/css/_cms.css b/ext/riverlea/core/css/_cms.css index b3d14fb16850..0234d64fa587 100755 --- a/ext/riverlea/core/css/_cms.css +++ b/ext/riverlea/core/css/_cms.css @@ -157,7 +157,7 @@ body.wp-admin .crm-container input:not([type=checkbox]):not([type=radio]):not(.c } body.wp-admin .crm-container p, body.wp-admin .crm-container li { - margin: 0; /* resets WP li bottom margin */ + margin-bottom: 0; /* resets WP li bottom margin */ list-style: none; white-space: inherit; } diff --git a/ext/riverlea/core/css/_core.css b/ext/riverlea/core/css/_core.css index d337001f8e41..167997a66139 100755 --- a/ext/riverlea/core/css/_core.css +++ b/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.3.8-6.0alpha'; + --crm-release: '1.4.1-6.2alpha'; } diff --git a/ext/riverlea/core/css/_fixes.css b/ext/riverlea/core/css/_fixes.css index 0b363bc31da2..959d64c55a69 100755 --- a/ext/riverlea/core/css/_fixes.css +++ b/ext/riverlea/core/css/_fixes.css @@ -567,9 +567,6 @@ body[class*="page-civicrm-report-"] #report-tab-order-by-elements #optionFieldLi background: transparent; padding: 0; } -.crm-case-activity-form-block-followup_activity_type_id .crm-form-date-wrapper { - display: inline-block; -} .crm-case-activity-form-block table.form-layout-compressed { width: 100%; } diff --git a/ext/riverlea/core/css/components/_buttons.css b/ext/riverlea/core/css/components/_buttons.css index 1c8324512f5c..0d54dda9e36f 100644 --- a/ext/riverlea/core/css/components/_buttons.css +++ b/ext/riverlea/core/css/components/_buttons.css @@ -297,9 +297,11 @@ /* BS3 Button groups and dropdowns */ -#bootstrap-theme td.text-right:has(.btn + .btn) { +#bootstrap-theme td.text-right:has(.btn + .btn), +.crm-container .crm-buttons { display: flex; gap: var(--crm-s); + flex-wrap: wrap; } #bootstrap-theme td.text-right:has(.btn + .btn) { justify-content: end; diff --git a/ext/riverlea/core/css/components/_form.css b/ext/riverlea/core/css/components/_form.css index 04cc4b13799e..392654cfbc8e 100644 --- a/ext/riverlea/core/css/components/_form.css +++ b/ext/riverlea/core/css/components/_form.css @@ -682,7 +682,7 @@ input.crm-form-checkbox) + label { gap: var(--crm-xs); } .crm-form-date-wrapper { - display: flex; + display: inline-flex; align-items: center; flex-flow: wrap; gap: var(--crm-flex-gap); diff --git a/ext/riverlea/core/css/components/_tables.css b/ext/riverlea/core/css/components/_tables.css index db77a8f9c9e8..4b30e4353d1e 100644 --- a/ext/riverlea/core/css/components/_tables.css +++ b/ext/riverlea/core/css/components/_tables.css @@ -95,7 +95,7 @@ table.dataTable.order-column.stripe tbody tr.extension-installed.even > .sorting border-right: var(--crm-table-column-border); } .crm-container table td:has(.btn-slide), -.crm-container table td:not(.crm-case-date):has(.action-item) { +.crm-container table:not(.crm-info-panel) td:not(.crm-case-date):has(.action-item) { text-align: right; } .crm-container table.crm-mailing-ab-table td:has(.action-item) { diff --git a/ext/riverlea/core/css/contactSummary.css b/ext/riverlea/core/css/contactSummary.css index b46a0fd88fe5..ac61ee362fc8 100644 --- a/ext/riverlea/core/css/contactSummary.css +++ b/ext/riverlea/core/css/contactSummary.css @@ -285,7 +285,7 @@ div.crm-inline-edit-form div.crm-clear { #crm-contact-actions-list ul a { display: block; } -.crm-contact-crm-contact-delete { +.crm-contact-actions-list-inner:not(:has(.crm-activity-type_6)) .crm-contact-crm-contact-delete { margin-top: auto; } #crm-contact-actions-list .crm-contact_activities-list select { diff --git a/ext/riverlea/core/org.civicrm.afform_admin-ang/afGuiEditor.css b/ext/riverlea/core/org.civicrm.afform_admin-ang/afGuiEditor.css index 7178de5b20df..1daa0a2721f3 100644 --- a/ext/riverlea/core/org.civicrm.afform_admin-ang/afGuiEditor.css +++ b/ext/riverlea/core/org.civicrm.afform_admin-ang/afGuiEditor.css @@ -93,6 +93,7 @@ #afGuiEditor .panel-heading ul.nav-tabs li.fluid-width-tab { white-space: nowrap; overflow: hidden; + max-width: unset !important; /* vs inline max-width set by Form Builder UI */ } #afGuiEditor .panel-heading .form-inline.pull-right button { max-height: 32px; diff --git a/ext/riverlea/info.xml b/ext/riverlea/info.xml index c510d686cee5..f0a75b0b1e3b 100755 --- a/ext/riverlea/info.xml +++ b/ext/riverlea/info.xml @@ -12,7 +12,7 @@ http://www.gnu.org/licenses/agpl-3.0.html [civicrm.releaseDate] - 1.3.8-[civicrm.version] + 1.4.1-[civicrm.version] stable [civicrm.majorVersion]