From 97e8cfe5a162dfc9e3f8e4fcb34b4e3111c67e72 Mon Sep 17 00:00:00 2001
From: Thomas Heartman <thomas.heartman+git@gmail.com>
Date: Thu, 23 Dec 2021 14:06:53 +0100
Subject: [PATCH 1/3] chore(workflows): update with new branch names

---
 frontend/.github/workflows/node.js.yml | 2 +-
 frontend/README.md                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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
 

From 373b588514ee9a06b10c5abf1a7d82a61a101385 Mon Sep 17 00:00:00 2001
From: Youssef <khedher.youssef@hotmail.fr>
Date: Sun, 9 Jan 2022 12:10:05 +0100
Subject: [PATCH 2/3] fix: add outlined for username login input and fix eye
 icon padding

---
 frontend/src/component/common/PasswordField/PasswordField.tsx | 2 +-
 frontend/src/component/user/PasswordAuth/PasswordAuth.jsx     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

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: (
                     <InputAdornment position="end">
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"
                             />
                             <PasswordField
                                 label="Password"

From c7e441fad6090a02d7a669e3d74a3b76f7214e50 Mon Sep 17 00:00:00 2001
From: Youssef Khedher <khedher.youssef@hotmail.fr>
Date: Mon, 10 Jan 2022 11:43:31 +0100
Subject: [PATCH 3/3] fix: replace broken link in stickiness description (#587)

---
 frontend/src/component/context/form-context-component.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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!{' '}
                             <a
-                                href="https://unleash.github.io/docs/activation_strategy#flexiblerollout"
+                                href="https://docs.getunleash.io/advanced/stickiness"
                                 target="_blank"
                                 rel="noreferrer"
                             >