Skip to content

Commit

Permalink
Merge branch 'develop' into v5-develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Benj1er committed Jan 31, 2025
2 parents c781648 + 6fee03c commit 453f4e5
Show file tree
Hide file tree
Showing 51 changed files with 1,966 additions and 354 deletions.
11 changes: 6 additions & 5 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "passbolt-styleguide",
"version": "5.0.0-alpha.0",
"version": "5.0.0-alpha.1",
"license": "AGPL-3.0",
"copyright": "Copyright 2023 Passbolt SA",
"description": "Passbolt styleguide contains common styling assets used by the different sites, plugin, etc.",
Expand Down
54 changes: 54 additions & 0 deletions src/less/pages/administration/administration.less
Original file line number Diff line number Diff line change
Expand Up @@ -136,4 +136,58 @@
margin-left: auto;
}
}

.input.toggle-switch {
.warning-message {
margin: 0;
}

.toggle-switch-checkbox+label {
white-space: normal;
}

.toggle-switch-checkbox:focus-visible+label,
.toggle-switch-checkbox:focus+label {
background: none;
}
}

.metadata-key-info {
border: 1px solid @input-radio-list-border;
border-radius: 3px;
background-color: @input-radio-list-background;
padding: 1.6rem;
margin-top: 1.6rem;
margin-right: 0;

&.error {
border: 1px solid @hint-error-color;
color: @text-error-color;

.empty-value {
color: @default-text-color;
}
}

table {
margin-top: 0;
border-spacing: .8rem;

tr.error-message {
color: @text-error-color;
}

td {
line-height: normal;

&:first-child {
color: inherit
}

&.table-button {
justify-items: end;
}
}
}
}
}
49 changes: 48 additions & 1 deletion src/locales/de-DE/common.json

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion src/locales/en-UK/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@
"A passphrase is required.": "A passphrase is required.",
"A password is required.": "A password is required.",
"A port is required.": "A port is required.",
"A shared metadata key is required to save the metadata keys settings.": "A shared metadata key is required to save the metadata keys settings.",
"A shared metadata key is required.": "A shared metadata key is required.",
"A strong passphrase is required. The minimum complexity must be 'fair'.": "A strong passphrase is required. The minimum complexity must be 'fair'.",
"A subscription key is required.": "A subscription key is required.",
"A tag name is required.": "A tag name is required.",
Expand Down Expand Up @@ -1185,6 +1187,7 @@
"The key is required.": "The key is required.",
"The logs directory and its content are not writable": "The logs directory and its content are not writable",
"The logs directory and its content are writable": "The logs directory and its content are writable",
"The metadata key settings were updated.": "The metadata key settings were updated.",
"The MFA policy settings were updated.": "The MFA policy settings were updated.",
"The multi factor authentication settings for the organization were updated.": "The multi factor authentication settings for the organization were updated.",
"The name is required.": "The name is required.",
Expand Down Expand Up @@ -1584,7 +1587,7 @@
"You need to click save for the changes to take place.": "You need to click save for the changes to take place.",
"You need to enter your current passphrase.": "You need to enter your current passphrase.",
"You need to finalize the account recovery process with the same computer you used for the account recovery request.": "You need to finalize the account recovery process with the same computer you used for the account recovery request.",
"You need to generate a new to enable encrypted metadata.": "You need to generate a new to enable encrypted metadata.",
"You need to generate a new shared key to enable encrypted metadata.": "You need to generate a new shared key to enable encrypted metadata.",
"You need to upload an account kit to start using the desktop app. ": "You need to upload an account kit to start using the desktop app. ",
"You need use the same computer and browser to finalize the process.": "You need use the same computer and browser to finalize the process.",
"You need your passphrase to continue.": "You need your passphrase to continue.",
Expand Down
Loading

0 comments on commit 453f4e5

Please sign in to comment.