diff --git a/frontend/.github/workflows/node.js.yml b/frontend/.github/workflows/node.js.yml index 7fe505f194..aaf78fa263 100644 --- a/frontend/.github/workflows/node.js.yml +++ b/frontend/.github/workflows/node.js.yml @@ -5,7 +5,7 @@ name: Node.js CI on: push: - branches: [ master ] + branches: [ main ] pull_request: jobs: diff --git a/frontend/README.md b/frontend/README.md index d06c41c58a..e90a740e1b 100644 --- a/frontend/README.md +++ b/frontend/README.md @@ -1,4 +1,4 @@ -[![Build Status](https://travis-ci.org/Unleash/unleash-frontend.svg?branch=master)](https://travis-ci.org/Unleash/unleash-frontend) +[![Build Status](https://travis-ci.org/Unleash/unleash-frontend.svg?branch=main)](https://travis-ci.org/Unleash/unleash-frontend) # Developing diff --git a/frontend/src/component/common/PasswordField/PasswordField.tsx b/frontend/src/component/common/PasswordField/PasswordField.tsx index 7b95a09625..61fa587a21 100644 --- a/frontend/src/component/common/PasswordField/PasswordField.tsx +++ b/frontend/src/component/common/PasswordField/PasswordField.tsx @@ -22,7 +22,7 @@ const PasswordField = ({ ...rest }) => { type={showPassword ? 'text' : 'password'} InputProps={{ style: { - paddingRight: '0px !important', + paddingRight: '0px', }, endAdornment: ( diff --git a/frontend/src/component/context/form-context-component.jsx b/frontend/src/component/context/form-context-component.jsx index e5a1d2df48..3616acf8d6 100644 --- a/frontend/src/component/context/form-context-component.jsx +++ b/frontend/src/component/context/form-context-component.jsx @@ -269,7 +269,7 @@ class AddContextComponent extends Component { specific values of this context field. PS! Not all client SDK's support this feature yet!{' '} diff --git a/frontend/src/component/user/PasswordAuth/PasswordAuth.jsx b/frontend/src/component/user/PasswordAuth/PasswordAuth.jsx index 98ed83b58c..1dda82d4a5 100644 --- a/frontend/src/component/user/PasswordAuth/PasswordAuth.jsx +++ b/frontend/src/component/user/PasswordAuth/PasswordAuth.jsx @@ -114,6 +114,8 @@ const PasswordAuth = ({ authDetails, passwordLogin }) => { helperText={usernameError} autoComplete="true" data-test={LOGIN_EMAIL_ID} + variant="outlined" + size="small" />