diff --git a/CHANGELOG.md b/CHANGELOG.md index d8ba915ff761..fd301292c4b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +0.10.17 + - ADDED civicrm.css to core with default settings. This is primarily to support separate theme extensions using RiverLea as a parent theme. + - REMOVED civicrm.css from streams where not custom (e.g. Minetta but not Walbrook) + - CHANGED front-end form layout, including hiding Stream name/version on front-end + 0.10.16 - ADDED CiviMail custom CSS override (civi_mail-ang/crmMailing.css) - CHANGED CiviMail custom CSS to integrate with override file, replace fixed values with variables diff --git a/core/ang/crmStatusPage.css b/core/ang/crmStatusPage.css index 23dd2b07cba8..dc39f4ea41e7 100644 --- a/core/ang/crmStatusPage.css +++ b/core/ang/crmStatusPage.css @@ -41,14 +41,14 @@ font-size: var(--crm-small-font-size); margin-right: var(--crm-r); } -#tab-status-visible-1 .hush-menu { +#crm-status-list .hush-menu { margin-left: auto; } -#tab-status-visible-1 .hush-menu > div { +#crm-status-list .hush-menu > div { position: relative; } #crm-status-list .hush-menu button { - background-color: rgba(256,256,256,0.5); + background-color: rgba(256,256,256,0.6); color: var(--crm-c-text); font-size: initial; } diff --git a/core/css/_core.css b/core/css/_core.css index 066817357f3a..9fca7a9068e7 100755 --- a/core/css/_core.css +++ b/core/css/_core.css @@ -17,4 +17,4 @@ @import url(components/_components.css); @import url(components/_front.css); -:root {--crm-release: '0.10.16';} \ No newline at end of file +:root {--crm-release: '0.10.17';} \ No newline at end of file diff --git a/core/css/_variables.css b/core/css/_variables.css index cdecee9e99e0..f82b86a1f84c 100644 --- a/core/css/_variables.css +++ b/core/css/_variables.css @@ -447,4 +447,4 @@ --crm-f-form-error-bg: var(--crm-c-red); --crm-f-logo-height: 40px; --crm-f-logo-align: center; /* left, right or center */ -} +} \ No newline at end of file diff --git a/core/css/civicrm.css b/core/css/civicrm.css new file mode 100644 index 000000000000..01f588409a0f --- /dev/null +++ b/core/css/civicrm.css @@ -0,0 +1,4 @@ +@import url(_base.css); /* resets and civi wide styles */ +@import url(_cms.css); /* CMS-specific hacks/workarounds */ +@import url(_core.css); /* components and utility classes */ +@import url(_fixes.css); /* deprecated-Civi handling, hacks/workarounds. one day this will go. */ diff --git a/core/css/components/_form.css b/core/css/components/_form.css index a31b93892997..2a793fca270b 100644 --- a/core/css/components/_form.css +++ b/core/css/components/_form.css @@ -286,6 +286,7 @@ input.crm-form-checkbox + label, width: auto; appearance: auto; height: auto; + box-shadow: none; } /* Checkbox/radio fields with n-per-line. See https://lab.civicrm.org/dev/core/-/issues/4985 */ .crm-container .crm-multiple-checkbox-radio-options { diff --git a/core/css/components/_front.css b/core/css/components/_front.css index b850899fce32..4e9eb80dec48 100644 --- a/core/css/components/_front.css +++ b/core/css/components/_front.css @@ -10,7 +10,9 @@ .crm-container.crm-public fieldset:not(.collapsed, .crm-inactive-dashlet-fieldset, .af-container-style-pane), .crm-container.crm-public .crm-event-info-form-block, .crm-container.crm-public #crm-profile-block, -.crm-container.crm-public .af-container:not(.af-container-style-pane) { +.crm-container.crm-public +.crm-container.crm-public .af-container:not(.af-container-style-pane), +.crm-container.crm-public .email-5-section { background-color: var(--crm-f-fieldset-bg); margin: var(--crm-f-fieldset-margin); padding: var(--crm-f-fieldset-padding); @@ -38,6 +40,9 @@ .crm-contribution-confirm-form-block fieldset legend:has(~ .header-dark) { display: none; /* fix for duplication on confirmation screen of legend text with Header Dark text */ } +.crm-container.crm-public .crm-section { + padding: 0; +} .crm-container.crm-public fieldset > fieldset, .crm-container.crm-public fieldset:has(> fieldset) { padding-top: 0; @@ -50,17 +55,31 @@ background: transparent; padding: 0; } +.crm-container.crm-public .form-layout-compressed { + display: block; +} +.crm-container.crm-public span#msgbox { + border-radius: var(--crm-roundness); + padding: var(--crm-padding-small); +} +.crm-container.crm-public #civicrm-footer::after { + display: none; +} /* Input */ .crm-container.crm-public .crm-section:has( > .label) { padding: var(--crm-f-form-padding); display: var(--crm-f-form-layout); grid-template-columns: var(--crm-f-label-width) 1fr 0; - margin: 0 calc(-1 * var(--crm-f-form-padding)) !important; + margin: 0 calc(-1 * var(--crm-f-form-padding)); } -.crm-container.crm-public .crm-section:has(> div > input:focus) { +.crm-container.crm-public .crm-section:has(> div > input:focus), +.crm-container.crm-public .crm-section:has(> div > select:focus), +.crm-container.crm-public .crm-section:has(> div > textarea:focus) { background-color: var(--crm-f-form-focus-bg); } -.crm-container.crm-public .crm-section:has(> div > input.crm-inline-error) { +.crm-container.crm-public .crm-section:has(> div > input.crm-inline-error), +.crm-container.crm-public .crm-section:has(> div > textarea.crm-inline-error), +.crm-container.crm-public .crm-section:has(> div > select.crm-inline-error) { background-color: var(--crm-f-form-error-bg); } .crm-container.crm-public input[type="text"], @@ -72,7 +91,7 @@ border-radius: var(--crm-f-input-radius); padding: var(--crm-f-input-padding); font-size: var(--crm-f-input-font-size); - width: var(--crm-f-input-width); + min-width: var(--crm-f-input-width); } .crm-container.crm-public input[type="radio"] { margin: var(--crm-s2) var(--crm-s3) 0 0; @@ -91,7 +110,7 @@ } .crm-container.crm-public .select2-dropdown-open .select2-choice, .crm-container.crm-public .select2-dropdown-open .select2-choices { - border-radius: 0; + border-radius: var(--crm-f-input-radius) var(--crm-f-input-radius) 0 0; } .crm-submit-buttons { padding-inline: 0; diff --git a/streams/empty/css/civicrm.css b/streams/empty/css/civicrm.css deleted file mode 100755 index 2370f87f0d79..000000000000 --- a/streams/empty/css/civicrm.css +++ /dev/null @@ -1,4 +0,0 @@ -@import url(../../../core/css/_base.css); /* resets and civi wide styles */ -@import url(../../../core/css/_cms.css); /* CMS-specific hacks/workarounds */ -@import url(../../../core/css/_core.css); /* components and utility classes */ -@import url(../../../core/css/_fixes.css); /* deprecated-Civi handling, hacks/workarounds. one day this will go. */ diff --git a/streams/hackneybrook/css/civicrm.css b/streams/hackneybrook/css/civicrm.css deleted file mode 100755 index 2370f87f0d79..000000000000 --- a/streams/hackneybrook/css/civicrm.css +++ /dev/null @@ -1,4 +0,0 @@ -@import url(../../../core/css/_base.css); /* resets and civi wide styles */ -@import url(../../../core/css/_cms.css); /* CMS-specific hacks/workarounds */ -@import url(../../../core/css/_core.css); /* components and utility classes */ -@import url(../../../core/css/_fixes.css); /* deprecated-Civi handling, hacks/workarounds. one day this will go. */ diff --git a/streams/minetta/css/civicrm.css b/streams/minetta/css/civicrm.css deleted file mode 100755 index 2370f87f0d79..000000000000 --- a/streams/minetta/css/civicrm.css +++ /dev/null @@ -1,4 +0,0 @@ -@import url(../../../core/css/_base.css); /* resets and civi wide styles */ -@import url(../../../core/css/_cms.css); /* CMS-specific hacks/workarounds */ -@import url(../../../core/css/_core.css); /* components and utility classes */ -@import url(../../../core/css/_fixes.css); /* deprecated-Civi handling, hacks/workarounds. one day this will go. */ diff --git a/streams/walbrook/css/_variables.css b/streams/walbrook/css/_variables.css index 35d472cd4391..0ebee612d46b 100755 --- a/streams/walbrook/css/_variables.css +++ b/streams/walbrook/css/_variables.css @@ -5,6 +5,8 @@ Description: Based on Shoreditch theme. Named after after River Walbrook, which runs under Shoreditch, London; */ +@import url(_font.css); + :root { --crm-version: 'Walbrook, v' var(--crm-release); @@ -231,4 +233,4 @@ /* Frontend */ --crm-f-legend-align:; --crm-f-legend-size: var(--crm-r2); -} \ No newline at end of file +}