diff --git a/css/systems/nldesign/theme.css b/css/systems/nldesign/theme.css index 646eb2d..9279640 100644 --- a/css/systems/nldesign/theme.css +++ b/css/systems/nldesign/theme.css @@ -331,6 +331,12 @@ body.body-login-container header { display: none !important; } +/* Hide the original Nextcloud theming logo on the login page — + NL Design replaces it with the ::after pseudo-element on the guest-box. */ +#body-login .header-guest .logo { + display: none !important; +} + /* Hide empty alternative-logins and empty headline containers */ #body-login .login-box__alternative-logins:empty, #body-login .login-form__headline:empty { diff --git a/css/tokens/amsterdam.css b/css/tokens/amsterdam.css index 7892dd1..6bc8ba8 100644 --- a/css/tokens/amsterdam.css +++ b/css/tokens/amsterdam.css @@ -29,7 +29,7 @@ --amsterdam-color-info-blue: #009de6; /* Logo image */ - --nldesign-logo-url: url('../img/logos/amsterdam.svg'); + --nldesign-logo-url: url('../../../img/logos/amsterdam.svg'); /* Background colors - for hover states and dark variants. */ /* Main background managed by Nextcloud theming system. */ diff --git a/css/tokens/denhaag.css b/css/tokens/denhaag.css index e943ffe..b2d06c6 100644 --- a/css/tokens/denhaag.css +++ b/css/tokens/denhaag.css @@ -14,7 +14,7 @@ --nldesign-color-primary-light-hover: #cce9d7; /* Logo image */ - --nldesign-logo-url: url('../img/logos/denhaag.svg'); + --nldesign-logo-url: url('../../../img/logos/denhaag.svg'); /* Den Haag color palette */ --denhaag-color-green: #1a7a3e; diff --git a/css/tokens/drechterland.css b/css/tokens/drechterland.css index 3aab32c..574ff2f 100644 --- a/css/tokens/drechterland.css +++ b/css/tokens/drechterland.css @@ -9,7 +9,7 @@ :root { /* Logo image */ - --nldesign-logo-url: url('../img/logos/drechterland.svg'); + --nldesign-logo-url: url('../../../img/logos/drechterland.svg'); /* NL Design tokens */ --nldesign-color-blue-40: hsl(198 70% 35%); diff --git a/css/tokens/epe.css b/css/tokens/epe.css index 481b5a5..de85687 100644 --- a/css/tokens/epe.css +++ b/css/tokens/epe.css @@ -9,7 +9,7 @@ :root { /* Logo image */ - --nldesign-logo-url: url('../img/logos/epe.svg'); + --nldesign-logo-url: url('../../../img/logos/epe.svg'); /* NL Design tokens */ --nldesign-brand-epe-color-error: #dc3545; diff --git a/css/tokens/hoorn.css b/css/tokens/hoorn.css index 4fb881a..8fdea00 100644 --- a/css/tokens/hoorn.css +++ b/css/tokens/hoorn.css @@ -9,7 +9,7 @@ :root { /* Logo image */ - --nldesign-logo-url: url('../img/logos/hoorn.svg'); + --nldesign-logo-url: url('../../../img/logos/hoorn.svg'); /* NL Design tokens */ --nldesign-color-blue-20: #09366c; diff --git a/css/tokens/leiden.css b/css/tokens/leiden.css index dfef7e9..92ae28c 100644 --- a/css/tokens/leiden.css +++ b/css/tokens/leiden.css @@ -11,7 +11,7 @@ /* NL Design tokens */ --nldesign-color-primary: #d62410; --nldesign-color-primary-hover: #b81f0e; - --nldesign-logo-url: url('../img/logos/leiden.svg'); + --nldesign-logo-url: url('../../../img/logos/leiden.svg'); --nldesign-color-error: #d62410; --nldesign-color-alert-error: #721c24; --nldesign-color-alert-error-background: #f8d7da; diff --git a/css/tokens/nijmegen.css b/css/tokens/nijmegen.css index d0d9c05..44cdae3 100644 --- a/css/tokens/nijmegen.css +++ b/css/tokens/nijmegen.css @@ -9,7 +9,7 @@ :root { /* Logo image */ - --nldesign-logo-url: url('../img/logos/nijmegen.svg'); + --nldesign-logo-url: url('../../../img/logos/nijmegen.svg'); /* NL Design tokens */ --nldesign-color-green-20: #17564a; diff --git a/css/tokens/noordwijk.css b/css/tokens/noordwijk.css index 6840b9c..b84e8e6 100644 --- a/css/tokens/noordwijk.css +++ b/css/tokens/noordwijk.css @@ -9,7 +9,7 @@ :root { /* Logo image */ - --nldesign-logo-url: url('../img/logos/noordwijk.svg'); + --nldesign-logo-url: url('../../../img/logos/noordwijk.svg'); /* NL Design tokens */ --nldesign-color-error: #dc3545; diff --git a/css/tokens/provincie-zuid-holland.css b/css/tokens/provincie-zuid-holland.css index cb7199f..5642d5f 100644 --- a/css/tokens/provincie-zuid-holland.css +++ b/css/tokens/provincie-zuid-holland.css @@ -9,7 +9,7 @@ :root { /* Logo image */ - --nldesign-logo-url: url('../img/logos/provincie-zuid-holland.svg'); + --nldesign-logo-url: url('../../../img/logos/provincie-zuid-holland.svg'); /* NL Design tokens */ --nldesign-color-wit: #FFFFFF; diff --git a/css/tokens/rijkshuisstijl.css b/css/tokens/rijkshuisstijl.css index e1331c4..94cc027 100644 --- a/css/tokens/rijkshuisstijl.css +++ b/css/tokens/rijkshuisstijl.css @@ -86,7 +86,7 @@ --nldesign-font-family: 'Fira Sans', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, Ubuntu, 'Helvetica Neue', Arial, sans-serif; /* Logo image */ - --nldesign-logo-url: url('../img/nederland-logo.svg'); + --nldesign-logo-url: url('../../../img/nederland-logo.svg'); /* Logo lint/ribbon (rhc.logo.image.* + rhc.size.lint) */ /* When these are defined, theme.css renders a colored bar behind the logo */ @@ -97,6 +97,14 @@ --nldesign-logo-center: 32px; --nldesign-logo-filter: brightness(0) invert(1); + /* Heading sizes — scaled to fit Nextcloud's compact UI */ + --nldesign-component-heading-1-font-size: 1.75rem; + --nldesign-component-heading-2-font-size: 1.35rem; + --nldesign-component-heading-3-font-size: 1.15rem; + --nldesign-component-heading-4-font-size: 1rem; + --nldesign-component-heading-5-font-size: 0.95rem; + --nldesign-component-heading-6-font-size: 0.875rem; + /* Border radius - Rijkshuisstijl typically uses minimal rounding */ --nldesign-border-radius: 0; --nldesign-border-radius-small: 0; diff --git a/css/tokens/rotterdam.css b/css/tokens/rotterdam.css index c75a410..5320c1e 100644 --- a/css/tokens/rotterdam.css +++ b/css/tokens/rotterdam.css @@ -20,7 +20,7 @@ --nldesign-color-primary-light-hover: #ccead5; /* Logo image */ - --nldesign-logo-url: url('../img/logos/rotterdam.svg'); + --nldesign-logo-url: url('../../../img/logos/rotterdam.svg'); /* Rotterdam color palette (rods.color.*) */ --rotterdam-color-green: #00811f; diff --git a/css/tokens/tilburg.css b/css/tokens/tilburg.css index b07ce59..3d96c94 100644 --- a/css/tokens/tilburg.css +++ b/css/tokens/tilburg.css @@ -9,7 +9,7 @@ :root { /* Logo image */ - --nldesign-logo-url: url('../img/logos/tilburg.svg'); + --nldesign-logo-url: url('../../../img/logos/tilburg.svg'); /* NL Design tokens */ --nldesign-color-blue-20: hsl(207 100% 20%); diff --git a/css/tokens/utrecht.css b/css/tokens/utrecht.css index 59b404e..90e5796 100644 --- a/css/tokens/utrecht.css +++ b/css/tokens/utrecht.css @@ -27,7 +27,7 @@ --utrecht-color-blue-light: #2964A3; /* Logo image */ - --nldesign-logo-url: url('../img/logos/utrecht.svg'); + --nldesign-logo-url: url('../../../img/logos/utrecht.svg'); /* Background colors - for hover states and dark variants. */ /* Main background managed by Nextcloud theming system. */ diff --git a/css/tokens/vng.css b/css/tokens/vng.css index ceed375..6ac503c 100644 --- a/css/tokens/vng.css +++ b/css/tokens/vng.css @@ -79,7 +79,7 @@ --nldesign-color-primary-light-hover: #b9e4fc; /* Logo image */ - --nldesign-logo-url: url('../img/logos/vng.svg'); + --nldesign-logo-url: url('../../../img/logos/vng.svg'); /* =================================================================== * STATUS COLORS diff --git a/css/tokens/xxllnc.css b/css/tokens/xxllnc.css index ae105d3..3949016 100644 --- a/css/tokens/xxllnc.css +++ b/css/tokens/xxllnc.css @@ -11,7 +11,7 @@ /* NL Design tokens */ --nldesign-color-primary: #000000ad; --nldesign-color-primary-hover: #00000080; - --nldesign-logo-url: url('../img/logos/xxllnc.svg'); + --nldesign-logo-url: url('../../../img/logos/xxllnc.svg'); --nldesign-color-error: #dc3545; --nldesign-color-alert-error: #721c24; --nldesign-color-alert-error-background: #f8d7da; diff --git a/js/admin.js b/js/admin.js index c2b51d9..f4141a6 100644 --- a/js/admin.js +++ b/js/admin.js @@ -121,7 +121,7 @@ function nldesignAdminMain() { .then(function(response) { return response.json(); }) .then(function(data) { if (data.status === 'ok') { - OC.Notification.showTemporary(t('nldesign', 'Theme updated successfully. Reload the page to see changes.')); + OC.Notification.showTemporary(t('nldesign', 'Theme updated successfully. reload the page to see changes.')); // Check if this token set has theming metadata var tsData = tokenSetsData[tokenSet]; @@ -254,7 +254,7 @@ function nldesignAdminMain() { + ' ' + escapeHtml(t('nldesign', 'Setting')) + '' + escapeHtml(t('nldesign', 'Current')) + '' + escapeHtml(t('nldesign', 'Proposed')) + '' + ' ' + rows + '' + ' ' - + '

' + escapeHtml(t('nldesign', 'Only values that differ are shown. Items without a proposed value are left unchanged.')) + '

' + + '

' + escapeHtml(t('nldesign', 'Only values that differ are shown. items without a proposed value are left unchanged.')) + '

' + '
' + ' ' + ' ' @@ -308,12 +308,12 @@ function nldesignAdminMain() { .then(function(data) { overlay.remove(); if (data.status === 'ok') { - OC.Notification.showTemporary(t('nldesign', 'Nextcloud theming updated successfully. Reloading page...')); + OC.Notification.showTemporary(t('nldesign', 'Nextcloud theming updated successfully. reloading page...')); setTimeout(function() { window.location.reload(); }, 1500); } else { - OC.Notification.showTemporary(t('nldesign', 'Failed to update Nextcloud theming: ') + (data.error || '')); + OC.Notification.showTemporary(t('nldesign', 'Failed to update Nextcloud theming:') + (data.error || '')); } }) .catch(function(error) { @@ -363,7 +363,7 @@ function nldesignAdminMain() { .then(function(response) { return response.json(); }) .then(function(data) { if (data.status === 'ok') { - OC.Notification.showTemporary(t('nldesign', 'Setting saved successfully. Reload the login page to see changes.')); + OC.Notification.showTemporary(t('nldesign', 'Setting saved successfully. reload the login page to see changes.')); } else { OC.Notification.showTemporary(t('nldesign', 'Failed to save setting.')); } @@ -389,7 +389,7 @@ function nldesignAdminMain() { .then(function(response) { return response.json(); }) .then(function(data) { if (data.status === 'ok') { - OC.Notification.showTemporary(t('nldesign', 'Setting saved successfully. Reload the page to see changes.')); + OC.Notification.showTemporary(t('nldesign', 'Setting saved successfully. reload the page to see changes.')); } else { OC.Notification.showTemporary(t('nldesign', 'Failed to save setting.')); } @@ -486,7 +486,7 @@ function nldesignAdminMain() { container.innerHTML = '' + '
' + '
' - + '

' + escapeHtml(t('nldesign', 'Custom Token Overrides')) + '

' + + '

' + escapeHtml(t('nldesign', 'Custom token overrides')) + '

' + '
' + '' + '