Skip to content

Commit

Permalink
Merge branch 'feature/PB-26170_11-Build--publish-styleguide' into 'de…
Browse files Browse the repository at this point in the history
…velop'

PB-26170: Bump styleguide version to v4.3.0-alpha.1 for the desktop app

See merge request passbolt/passbolt-styleguide!1311
  • Loading branch information
Gamabunta57 committed Sep 6, 2023
2 parents f089e9b + 1cc32e8 commit bcddd77
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
4 changes: 2 additions & 2 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": "4.3.0-alpha.0",
"version": "4.3.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
2 changes: 2 additions & 0 deletions src/locales/en-UK/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -436,11 +436,13 @@
"Import": "Import",
"Import account": "Import account",
"Import an OpenPGP Public key": "Import an OpenPGP Public key",
"Import another account": "Import another account",
"Import folders": "Import folders",
"Import passwords": "Import passwords",
"Import success!": "Import success!",
"Import/Export": "Import/Export",
"Important notice:": "Important notice:",
"Importing account kit": "Importing account kit",
"In order to use the "Username & Password" authentication method with Google, you will need to enable MFA on your Google Account. The password should not be your login password, you have to create an "App Password" generated by Google.. However, the email remain the same.": "In order to use the "Username & Password" authentication method with Google, you will need to enable MFA on your Google Account. The password should not be your login password, you have to create an "App Password" generated by Google.. However, the email remain the same.",
"In this section you can adjust the composition of the emails, e.g. which information will be included in the notification.": "In this section you can adjust the composition of the emails, e.g. which information will be included in the notification.",
"In this section you can choose the default behavior of account recovery for all users.": "In this section you can choose the default behavior of account recovery for all users.",
Expand Down
2 changes: 1 addition & 1 deletion src/shared/components/Password/Password.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ class Password extends Component {
const fullStyle = {background: this.props.securityToken.backgroundColor, color: this.props.securityToken.textColor};
return this.state.hasPassphraseFocus ? inverseStyle : fullStyle;
}

/**
* Get the passphrase input style.
* @return {Object}
Expand Down

0 comments on commit bcddd77

Please sign in to comment.