From 307aedf001f94219bfd11a7bc8a1dfb28accde9c Mon Sep 17 00:00:00 2001 From: Nicol Date: Thu, 13 Feb 2025 11:05:40 +0000 Subject: [PATCH 1/3] 1.3.6 - Fixes #108, #109, HackneyBrook DarkMode Notification colour & responsive dashboard --- ext/riverlea/CHANGELOG.md | 7 +++++++ ext/riverlea/core/css/_base.css | 7 ------- ext/riverlea/core/css/_core.css | 2 +- ext/riverlea/core/css/components/_form.css | 5 ++++- ext/riverlea/core/css/contactSummary.css | 14 +++++++++++++- ext/riverlea/core/css/dashboard.css | 5 +++++ ext/riverlea/info.xml | 2 +- ext/riverlea/streams/hackneybrook/css/_dark.css | 1 + 8 files changed, 32 insertions(+), 11 deletions(-) diff --git a/ext/riverlea/CHANGELOG.md b/ext/riverlea/CHANGELOG.md index 79d4d21aad4c..adbff22656a1 100644 --- a/ext/riverlea/CHANGELOG.md +++ b/ext/riverlea/CHANGELOG.md @@ -1,3 +1,10 @@ +1.3.6-6.1alpha + - FIXED - Responsive: make dashlets stack on Civi Dashboard under 990px (same as Greenwich) + - FIXED - Show Add Address without hover on Contact Dashboard (#109) + - ADDED - Swapped edit icon for add icon on add address on Contact Dashboard (#109) + - FIXED - code/pre formatting is wrapping on one line (#108) + - FIXED - HackneyBrook/DarkMode: Notification text colour illegible (https://github.com/civicrm/civicrm-core/pull/31994) + 1.3.5-6.0alpha - ADDED - padding to contact dashboard inline edit div (#107) - FIXED - Contact Layout Editor extension: double padding; broken right float (#107) diff --git a/ext/riverlea/core/css/_base.css b/ext/riverlea/core/css/_base.css index a3c5389a3654..eeeca5a07aff 100755 --- a/ext/riverlea/core/css/_base.css +++ b/ext/riverlea/core/css/_base.css @@ -344,21 +344,14 @@ dl dl { font-size: var(--crm-font-size) !important /* vs inline css on api3 */; line-height: 1.4 !important /* vs inline css on api3 */; color: var(--crm-c-text); - word-break: break-all; - word-wrap: break-word; background-color: var(--crm-c-code-background); border: 1px solid var(--crm-c-background4); border-radius: var(--crm-roundness); } -.crm-container pre { - white-space: normal; - word-break: normal; -} .crm-container pre code { padding: 0; font-size: inherit; color: inherit; - white-space: pre-wrap; background-color: transparent; border-radius: 0; } diff --git a/ext/riverlea/core/css/_core.css b/ext/riverlea/core/css/_core.css index 56b58ae4a95c..b3da5428eaba 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.5-6.0.alpha'; + --crm-release: '1.3.6-6.1alpha'; } diff --git a/ext/riverlea/core/css/components/_form.css b/ext/riverlea/core/css/components/_form.css index eaa93977058e..4f8c6157e6fa 100644 --- a/ext/riverlea/core/css/components/_form.css +++ b/ext/riverlea/core/css/components/_form.css @@ -557,6 +557,9 @@ input.crm-form-checkbox) + label { border-bottom-left-radius: 0; border-bottom-right-radius: 0; } +.select2-search { + padding: var(--crm-s); +} .select2-search::after { font-family: "FontAwesome"; font-style: normal; @@ -574,6 +577,7 @@ input.crm-form-checkbox) + label { font-family: var(--crm-font); line-height: 20px; max-width: 100%; + width: 100%; } .crm-container .select2-results { font-size: var(--crm-m2); @@ -663,7 +667,6 @@ input.crm-form-checkbox) + label { padding: 0; } - /* Dates */ .form-inline:has(.crm-form-date-wrapper) { diff --git a/ext/riverlea/core/css/contactSummary.css b/ext/riverlea/core/css/contactSummary.css index 0af8a7bc86c0..bf8253f7e294 100644 --- a/ext/riverlea/core/css/contactSummary.css +++ b/ext/riverlea/core/css/contactSummary.css @@ -85,7 +85,8 @@ background-color: transparent; } .crm-container #crm-contactname-content .crm-edit-help:hover, -.crm-edit-ready .crm-summary-block .crm-inline-edit:hover .crm-edit-help { +.crm-edit-ready .crm-summary-block .crm-inline-edit:hover .crm-edit-help, +.crm-container .crm-summary-block .address.add-new .crm-edit-help { color: var(--crm-c-text); display: block; opacity: 1; @@ -97,9 +98,20 @@ color: var(--crm-c-text); margin: var(--crm-xs) 0 0 var(--crm-m); } +.crm-container .address.add-new .crm-i.fa-pencil::before { + content: "\f055"; +} .crm-container div.crm-inline-edit.form .crm-edit-help { display: none !important; } +/* .crm-container .address.add-new .crm-edit-help { + width: 100%; + height: 100%; + display: flex; + align-items: center; + justify-content: center; + gap: 0.5rem; +} */ .crm-container .crm-address-block+.crm-address-block .add-new .crm-summary-row { display: none; } diff --git a/ext/riverlea/core/css/dashboard.css b/ext/riverlea/core/css/dashboard.css index 9ea977662488..b000780b82f5 100644 --- a/ext/riverlea/core/css/dashboard.css +++ b/ext/riverlea/core/css/dashboard.css @@ -200,3 +200,8 @@ fieldset.crm-inactive-dashlet-fieldset legend .crm-hover-button { .crm-dashlet .crm-search-display .form-inline { padding: var(--crm-padding-reg); } +@media (max-width: 991px) { + #civicrm-dashboard > .crm-flex-box { + grid-template-columns: 1fr; + } +} diff --git a/ext/riverlea/info.xml b/ext/riverlea/info.xml index cfee32c045f1..09be14706629 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.5-[civicrm.version] + 1.3.6-[civicrm.version] stable [civicrm.majorVersion] diff --git a/ext/riverlea/streams/hackneybrook/css/_dark.css b/ext/riverlea/streams/hackneybrook/css/_dark.css index 516b538da544..0fe4a26eb37a 100644 --- a/ext/riverlea/streams/hackneybrook/css/_dark.css +++ b/ext/riverlea/streams/hackneybrook/css/_dark.css @@ -78,6 +78,7 @@ --crm-dialog-header-bg: var(--crm-c-background2); --crm-dialog-body-bg: var(--crm-c-background2); --crm-notify-background: var(--crm-c-darkest); + --crm-notify-col: var(--crm-c-text); --crm-wizard-active-bg: var(--crm-c-blue-dark); --crm-form-block-background: var(--crm-c-background2); --crm-c-code-background: var(--crm-c-background2); From 1946b1ad46403ee151957655708d31fc43b91ce1 Mon Sep 17 00:00:00 2001 From: Nicol Date: Thu, 13 Feb 2025 11:09:47 +0000 Subject: [PATCH 2/3] updates Changelog --- ext/riverlea/CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ext/riverlea/CHANGELOG.md b/ext/riverlea/CHANGELOG.md index adbff22656a1..330f7fbb7e67 100644 --- a/ext/riverlea/CHANGELOG.md +++ b/ext/riverlea/CHANGELOG.md @@ -1,9 +1,10 @@ 1.3.6-6.1alpha - FIXED - Responsive: make dashlets stack on Civi Dashboard under 990px (same as Greenwich) - FIXED - Show Add Address without hover on Contact Dashboard (#109) - - ADDED - Swapped edit icon for add icon on add address on Contact Dashboard (#109) - FIXED - code/pre formatting is wrapping on one line (#108) - FIXED - HackneyBrook/DarkMode: Notification text colour illegible (https://github.com/civicrm/civicrm-core/pull/31994) + - CHANGED - Select2 search box now fills width of Select, neatens padding. + - CHANGED - Swapped edit icon for add icon on add address on Contact Dashboard (#109) 1.3.5-6.0alpha - ADDED - padding to contact dashboard inline edit div (#107) From 84797b1946765cf0dc48d413cdd30b96508fe99b Mon Sep 17 00:00:00 2001 From: Nicol Date: Thu, 13 Feb 2025 12:59:07 +0000 Subject: [PATCH 3/3] Adjusted styling of regression 4 / change 1 (add address on contact dashboard) --- ext/riverlea/CHANGELOG.md | 2 +- ext/riverlea/core/css/contactSummary.css | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/ext/riverlea/CHANGELOG.md b/ext/riverlea/CHANGELOG.md index 330f7fbb7e67..394811643dd0 100644 --- a/ext/riverlea/CHANGELOG.md +++ b/ext/riverlea/CHANGELOG.md @@ -4,7 +4,7 @@ - FIXED - code/pre formatting is wrapping on one line (#108) - FIXED - HackneyBrook/DarkMode: Notification text colour illegible (https://github.com/civicrm/civicrm-core/pull/31994) - CHANGED - Select2 search box now fills width of Select, neatens padding. - - CHANGED - Swapped edit icon for add icon on add address on Contact Dashboard (#109) + - CHANGED - Swapped edit icon for add icon on add address on Contact Dashboard & tidied appearance (#109) 1.3.5-6.0alpha - ADDED - padding to contact dashboard inline edit div (#107) diff --git a/ext/riverlea/core/css/contactSummary.css b/ext/riverlea/core/css/contactSummary.css index bf8253f7e294..fac1241f3425 100644 --- a/ext/riverlea/core/css/contactSummary.css +++ b/ext/riverlea/core/css/contactSummary.css @@ -80,10 +80,6 @@ opacity: .6; padding: var(--crm-padding-small); } -.crm-container .crm-address-block+.crm-address-block .add-new .crm-edit-help { - display: block; - background-color: transparent; -} .crm-container #crm-contactname-content .crm-edit-help:hover, .crm-edit-ready .crm-summary-block .crm-inline-edit:hover .crm-edit-help, .crm-container .crm-summary-block .address.add-new .crm-edit-help { @@ -104,14 +100,14 @@ .crm-container div.crm-inline-edit.form .crm-edit-help { display: none !important; } -/* .crm-container .address.add-new .crm-edit-help { +.crm-container .crm-summary-block .address.add-new .crm-edit-help { width: 100%; height: 100%; display: flex; align-items: center; - justify-content: center; - gap: 0.5rem; -} */ + justify-content: right; + flex-direction: row-reverse; +} .crm-container .crm-address-block+.crm-address-block .add-new .crm-summary-row { display: none; }