Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions css/systems/nldesign/theme.css
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion css/tokens/amsterdam.css
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down
2 changes: 1 addition & 1 deletion css/tokens/denhaag.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion css/tokens/drechterland.css
Original file line number Diff line number Diff line change
Expand Up @@ -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%);
Expand Down
2 changes: 1 addition & 1 deletion css/tokens/epe.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion css/tokens/hoorn.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion css/tokens/leiden.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion css/tokens/nijmegen.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion css/tokens/noordwijk.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion css/tokens/provincie-zuid-holland.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 9 additions & 1 deletion css/tokens/rijkshuisstijl.css
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion css/tokens/rotterdam.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion css/tokens/tilburg.css
Original file line number Diff line number Diff line change
Expand Up @@ -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%);
Expand Down
2 changes: 1 addition & 1 deletion css/tokens/utrecht.css
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down
2 changes: 1 addition & 1 deletion css/tokens/vng.css
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion css/tokens/xxllnc.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
20 changes: 10 additions & 10 deletions js/admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down Expand Up @@ -254,7 +254,7 @@ function nldesignAdminMain() {
+ ' <thead><tr><th>' + escapeHtml(t('nldesign', 'Setting')) + '</th><th>' + escapeHtml(t('nldesign', 'Current')) + '</th><th>' + escapeHtml(t('nldesign', 'Proposed')) + '</th></tr></thead>'
+ ' <tbody>' + rows + '</tbody>'
+ ' </table>'
+ ' <p class="nldesign-dialog-hint">' + escapeHtml(t('nldesign', 'Only values that differ are shown. Items without a proposed value are left unchanged.')) + '</p>'
+ ' <p class="nldesign-dialog-hint">' + escapeHtml(t('nldesign', 'Only values that differ are shown. items without a proposed value are left unchanged.')) + '</p>'
+ ' <div class="nldesign-dialog-actions">'
+ ' <button class="nldesign-dialog-cancel">' + escapeHtml(t('nldesign', 'Cancel')) + '</button>'
+ ' <button class="nldesign-dialog-confirm">' + escapeHtml(t('nldesign', 'Update theming')) + '</button>'
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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.'));
}
Expand All @@ -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.'));
}
Expand Down Expand Up @@ -486,7 +486,7 @@ function nldesignAdminMain() {
container.innerHTML = ''
+ '<div class="nldesign-token-editor">'
+ '<div class="nldesign-token-editor-header">'
+ '<h3>' + escapeHtml(t('nldesign', 'Custom Token Overrides')) + '</h3>'
+ '<h3>' + escapeHtml(t('nldesign', 'Custom token overrides')) + '</h3>'
+ '<div class="nldesign-token-editor-actions">'
+ '<button class="nldesign-btn nldesign-btn--small" id="nldesign-export-btn">' + escapeHtml(t('nldesign', 'Download')) + '</button>'
+ '<label class="nldesign-btn nldesign-btn--small" style="cursor:pointer">'
Expand Down Expand Up @@ -695,7 +695,7 @@ function nldesignAdminMain() {
updateSaveStatus();
OC.Notification.showTemporary(t('nldesign', 'Token overrides saved.'));
} else {
OC.Notification.showTemporary(t('nldesign', 'Failed to save overrides: ') + (data.error || ''));
OC.Notification.showTemporary(t('nldesign', 'Failed to save overrides:') + (data.error || ''));
}
})
.catch(function(err) {
Expand Down Expand Up @@ -738,7 +738,7 @@ function nldesignAdminMain() {
}
initTokenEditor();
} else {
OC.Notification.showTemporary(t('nldesign', 'Import failed: ') + (data.error || ''));
OC.Notification.showTemporary(t('nldesign', 'Import failed:') + (data.error || ''));
}
})
.catch(function(err) {
Expand Down Expand Up @@ -810,7 +810,7 @@ function nldesignAdminMain() {
var html = '<div id="nldesign-apply-dialog-overlay" class="nldesign-dialog-overlay">'
+ '<div class="nldesign-dialog">'
+ '<h3>' + escapeHtml(t('nldesign', 'Apply token set: {name}').replace('{name}', newTokenSetId)) + '</h3>'
+ '<p class="settings-hint">' + escapeHtml(t('nldesign', 'These values would change. Check which ones to apply to your custom overrides.')) + '</p>'
+ '<p class="settings-hint">' + escapeHtml(t('nldesign', 'These values would change. check which ones to apply to your custom overrides.')) + '</p>'
+ '<div style="margin-bottom:8px">'
+ '<button class="nldesign-apply-dialog-toggle" id="nldesign-apply-select-all">' + escapeHtml(t('nldesign', 'Select all')) + '</button>'
+ ' / '
Expand Down
63 changes: 63 additions & 0 deletions l10n/en.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
{
"translations": {
"NL design system theme": "NL Design System Theme",
"Documentation": "Documentation",
"Select a dutch government design token set as a base, or customize individual Nextcloud CSS tokens below.": "Select a Dutch government design token set as a base, or customize individual Nextcloud CSS tokens below.",
"Design token set": "Design token set",
"Hide Nextcloud slogan/payoff on login page": "Hide Nextcloud slogan/payoff on login page",
"Show text labels in app menu (hide icons)": "Show text labels in app menu (hide icons)",
"Preview": "Preview",
"Primary button": "Primary button",
"Secondary button": "Secondary button",
"Loading token editor…": "Loading token editor…",
"Learn more about NL design system": "Learn more about NL Design System",
"Theme updated successfully. reload the page to see changes.": "Theme updated successfully. Reload the page to see changes.",
"Failed to update theme.": "Failed to update theme.",
"Primary color": "Primary color",
"Background color": "Background color",
"Logo": "Logo",
"(custom logo)": "(custom logo)",
"(default)": "(default)",
"Background image": "Background image",
"(custom)": "(custom)",
"Update Nextcloud theming to match {name}?": "Update Nextcloud theming to match {name}?",
"Current": "Current",
"Proposed": "Proposed",
"Setting": "Setting",
"Only values that differ are shown. items without a proposed value are left unchanged.": "Only values that differ are shown. Items without a proposed value are left unchanged.",
"Cancel": "Cancel",
"Update theming": "Update theming",
"Updating...": "Updating...",
"Nextcloud theming updated successfully. reloading page...": "Nextcloud theming updated successfully. Reloading page...",
"Failed to update Nextcloud theming:": "Failed to update Nextcloud theming: ",
"Failed to update Nextcloud theming.": "Failed to update Nextcloud theming.",
"Setting saved successfully. reload the login page to see changes.": "Setting saved successfully. Reload the login page to see changes.",
"Failed to save setting.": "Failed to save setting.",
"Setting saved successfully. reload the page to see changes.": "Setting saved successfully. Reload the page to see changes.",
"Could not load token editor.": "Could not load token editor.",
"Custom token overrides": "Custom token overrides",
"Download": "Download",
"Upload": "Upload",
"Save overrides": "Save overrides",
"Custom value": "Custom value",
"Reset to default": "Reset to default",
"Unsaved changes": "Unsaved changes",
"Token overrides saved.": "Token overrides saved.",
"Failed to save overrides:": "Failed to save overrides: ",
"Failed to save overrides.": "Failed to save overrides.",
"{imported} tokens imported, {skipped} tokens skipped (not recognized)": "{imported} tokens imported, {skipped} tokens skipped (not recognized)",
"Import failed:": "Import failed: ",
"Import failed.": "Import failed.",
"Apply token set: {name}": "Apply token set: {name}",
"These values would change. check which ones to apply to your custom overrides.": "These values would change. Check which ones to apply to your custom overrides.",
"Select all": "Select all",
"Deselect all": "Deselect all",
"Token": "Token",
"New": "New",
"Apply selected": "Apply selected",
"Applying…": "Applying…",
"Token overrides applied.": "Token overrides applied.",
"Failed to apply token set.": "Failed to apply token set."
},
"plurals": {}
}
63 changes: 63 additions & 0 deletions l10n/nl.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
{
"translations": {
"NL design system theme": "NL Design System-thema",
"Documentation": "Documentatie",
"Select a dutch government design token set as a base, or customize individual Nextcloud CSS tokens below.": "Selecteer een Nederlandse overheidsontwerp-tokenset als basis, of pas hieronder individuele Nextcloud CSS-tokens aan.",
"Design token set": "Ontwerp-tokenset",
"Hide Nextcloud slogan/payoff on login page": "Verberg Nextcloud-slogan/payoff op de inlogpagina",
"Show text labels in app menu (hide icons)": "Toon tekstlabels in het app-menu (verberg pictogrammen)",
"Preview": "Voorbeeld",
"Primary button": "Primaire knop",
"Secondary button": "Secundaire knop",
"Loading token editor…": "Token-editor laden…",
"Learn more about NL design system": "Meer informatie over NL Design System",
"Theme updated successfully. reload the page to see changes.": "Thema succesvol bijgewerkt. Laad de pagina opnieuw om de wijzigingen te zien.",
"Failed to update theme.": "Bijwerken van het thema mislukt.",
"Primary color": "Primaire kleur",
"Background color": "Achtergrondkleur",
"Logo": "Logo",
"(custom logo)": "(aangepast logo)",
"(default)": "(standaard)",
"Background image": "Achtergrondafbeelding",
"(custom)": "(aangepast)",
"Update Nextcloud theming to match {name}?": "Nextcloud-thema bijwerken zodat het overeenkomt met {name}?",
"Current": "Huidig",
"Proposed": "Voorgesteld",
"Setting": "Instelling",
"Only values that differ are shown. items without a proposed value are left unchanged.": "Alleen afwijkende waarden worden getoond. Items zonder voorgestelde waarde blijven ongewijzigd.",
"Cancel": "Annuleren",
"Update theming": "Thema bijwerken",
"Updating...": "Bijwerken…",
"Nextcloud theming updated successfully. reloading page...": "Nextcloud-thema succesvol bijgewerkt. Pagina wordt opnieuw geladen…",
"Failed to update Nextcloud theming:": "Bijwerken van Nextcloud-thema mislukt: ",
"Failed to update Nextcloud theming.": "Bijwerken van Nextcloud-thema mislukt.",
"Setting saved successfully. reload the login page to see changes.": "Instelling succesvol opgeslagen. Laad de inlogpagina opnieuw om de wijzigingen te zien.",
"Failed to save setting.": "Opslaan van instelling mislukt.",
"Setting saved successfully. reload the page to see changes.": "Instelling succesvol opgeslagen. Laad de pagina opnieuw om de wijzigingen te zien.",
"Could not load token editor.": "Token-editor kon niet worden geladen.",
"Custom token overrides": "Aangepaste token-overschrijvingen",
"Download": "Downloaden",
"Upload": "Uploaden",
"Save overrides": "Overschrijvingen opslaan",
"Custom value": "Aangepaste waarde",
"Reset to default": "Terugzetten naar standaard",
"Unsaved changes": "Niet-opgeslagen wijzigingen",
"Token overrides saved.": "Token-overschrijvingen opgeslagen.",
"Failed to save overrides:": "Opslaan van overschrijvingen mislukt: ",
"Failed to save overrides.": "Opslaan van overschrijvingen mislukt.",
"{imported} tokens imported, {skipped} tokens skipped (not recognized)": "{imported} tokens geïmporteerd, {skipped} tokens overgeslagen (niet herkend)",
"Import failed:": "Importeren mislukt: ",
"Import failed.": "Importeren mislukt.",
"Apply token set: {name}": "Tokenset toepassen: {name}",
"These values would change. check which ones to apply to your custom overrides.": "Deze waarden zouden wijzigen. Selecteer welke u op uw aangepaste overschrijvingen wilt toepassen.",
"Select all": "Alles selecteren",
"Deselect all": "Alles deselecteren",
"Token": "Token",
"New": "Nieuw",
"Apply selected": "Geselecteerde toepassen",
"Applying…": "Toepassen…",
"Token overrides applied.": "Token-overschrijvingen toegepast.",
"Failed to apply token set.": "Toepassen van tokenset mislukt."
},
"plurals": {}
}
4 changes: 2 additions & 2 deletions templates/settings/admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ class="checkbox"
<div class="nldesign-preview-box">
<div class="nldesign-preview-header"></div>
<div class="nldesign-preview-content">
<button class="nldesign-preview-button primary"><?php p($l->t('Primary Button')); ?></button>
<button class="nldesign-preview-button"><?php p($l->t('Secondary Button')); ?></button>
<button class="nldesign-preview-button primary"><?php p($l->t('Primary button')); ?></button>
<button class="nldesign-preview-button"><?php p($l->t('Secondary button')); ?></button>
</div>
</div>
</div>
Expand Down
Loading