From 560ac74ef797c10c63f61cd391e5bd80939ba6d0 Mon Sep 17 00:00:00 2001
From: Nikhil713 <nikhilbabu213@gmail.com>
Date: Thu, 2 Apr 2020 14:17:00 +0530
Subject: [PATCH 1/2] Update width in media query

---
 app/theme/client/imports/general/base_old.css  | 18 ++++++++++++++++++
 .../client/personalAccessTokens.html           |  4 ++--
 package-lock.json                              | 17 +++++++++++++----
 3 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/app/theme/client/imports/general/base_old.css b/app/theme/client/imports/general/base_old.css
index 33c75af298e5b..6ff71e18090a0 100644
--- a/app/theme/client/imports/general/base_old.css
+++ b/app/theme/client/imports/general/base_old.css
@@ -1495,6 +1495,15 @@ rc-old select,
 				border-bottom: none;
 			}
 
+			& .add-token {
+				display: flex;
+
+				& .rc-select {
+					width: 40%;
+					margin: 0 0 0 10px;
+				}
+			}
+
 			&:first-child {
 				padding-top: 0;
 			}
@@ -5025,6 +5034,15 @@ rc-old select,
 			display: none;
 		}
 	}
+
+	.add-token {
+		display: block !important;
+
+		& .rc-select {
+			width: auto !important;
+			margin: 10px 0 !important;
+		}
+	}
 }
 
 @media (width <= 500px) {
diff --git a/imports/personal-access-tokens/client/personalAccessTokens.html b/imports/personal-access-tokens/client/personalAccessTokens.html
index b0e790ecd1c54..9234ee6b4f53d 100644
--- a/imports/personal-access-tokens/client/personalAccessTokens.html
+++ b/imports/personal-access-tokens/client/personalAccessTokens.html
@@ -8,7 +8,7 @@
 				<div class="section-content border-component-color">
 					<div class="input-line double-col">
 						<label for="tokenName" class="setting-label">{{_ "API_Personal_Access_Tokens_To_REST_API"}}</label>
-						<div style="display: flex;">
+						<div class="add-token">
 							<div class="setting-field" style="flex-grow: 1;">
 								<input type="text" class="rc-input__element js-search" name="tokenName" id="tokenName"
 									placeholder={{_ "API_Add_Personal_Access_Token"}} autocomplete="off" />
@@ -20,8 +20,8 @@
 								</select>
 								{{> icon block="rc-select__arrow" icon="arrow-down"}}
 							</div>
+							<button name="add" class="rc-button rc-button--primary setting-action save-token">{{_ "Add"}}</button>
 						</div>
-						<button name="add" class="rc-button rc-button--primary setting-action save-token">{{_ "Add"}}</button>
 					</div>
 				</div>
 			</form>
diff --git a/package-lock.json b/package-lock.json
index e7b92f8799400..4547bae57faca 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2862,6 +2862,11 @@
 				"uuid": "^3.2.1"
 			},
 			"dependencies": {
+				"adm-zip": {
+					"version": "0.4.14",
+					"resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.14.tgz",
+					"integrity": "sha512-/9aQCnQHF+0IiCl0qhXoK7qs//SwYE7zX8lsr/DNk1BRAHYxeLZPL4pguwK29gUEqasYQjqPtEpDRSWEkdHn9g=="
+				},
 				"typescript": {
 					"version": "2.9.2",
 					"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz",
@@ -2925,17 +2930,21 @@
 		},
 		"@rocket.chat/fuselage-ui-kit": {
 			"version": "0.7.1",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-ui-kit/-/fuselage-ui-kit-0.7.1.tgz",
+			"integrity": "sha512-3OhOJ2yA1i/npYK9BeFFLuPGh9zBXCVS9PfWpN+Mc5dlCvB3CCduYExiIfho8+JZW83IXwIm9HlYsLyqMhpBpg==",
 			"requires": {
 				"@rocket.chat/ui-kit": "^0.7.1"
 			},
 			"dependencies": {
 				"@babel/preset-react": {
-					"version": "7.9.4"
+					"version": "7.9.4",
+					"resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.9.4.tgz",
+					"integrity": "sha512-AxylVB3FXeOTQXNXyiuAQJSvss62FEotbX2Pzx3K/7c+MKJMdSg6Ose6QYllkdCFA8EInCJVw7M/o5QbLuA4ZQ=="
 				},
 				"@rocket.chat/ui-kit": {
-					"version": "0.7.0",
-					"resolved": "https://registry.npmjs.org/@rocket.chat/ui-kit/-/ui-kit-0.7.0.tgz",
-					"integrity": "sha512-qsBRQlUJhLga30qosHmiVsdLLBi2vjqBhAfKvYPAT0Qe5FzsuTRn6vtOnYk16A4mZ8hV8gWNDleuvG46vOk+LA=="
+					"version": "0.7.1",
+					"resolved": "https://registry.npmjs.org/@rocket.chat/ui-kit/-/ui-kit-0.7.1.tgz",
+					"integrity": "sha512-CUpJt35zq56n4lBwWs17PRa+GGY+NKILv2ydjlL+dQNbtb9peEEzTVmglLRXUJhIwNKndSAr0eqoeTkRIsWL6A=="
 				}
 			}
 		},

From 9e961f4999e838b6c91f6f7519a814c609abfbd8 Mon Sep 17 00:00:00 2001
From: Nikhil713 <nikhilbabu213@gmail.com>
Date: Fri, 3 Apr 2020 11:34:54 +0530
Subject: [PATCH 2/2] Fix the preferences page

---
 package-lock.json | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4547bae57faca..e7b92f8799400 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2862,11 +2862,6 @@
 				"uuid": "^3.2.1"
 			},
 			"dependencies": {
-				"adm-zip": {
-					"version": "0.4.14",
-					"resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.14.tgz",
-					"integrity": "sha512-/9aQCnQHF+0IiCl0qhXoK7qs//SwYE7zX8lsr/DNk1BRAHYxeLZPL4pguwK29gUEqasYQjqPtEpDRSWEkdHn9g=="
-				},
 				"typescript": {
 					"version": "2.9.2",
 					"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz",
@@ -2930,21 +2925,17 @@
 		},
 		"@rocket.chat/fuselage-ui-kit": {
 			"version": "0.7.1",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-ui-kit/-/fuselage-ui-kit-0.7.1.tgz",
-			"integrity": "sha512-3OhOJ2yA1i/npYK9BeFFLuPGh9zBXCVS9PfWpN+Mc5dlCvB3CCduYExiIfho8+JZW83IXwIm9HlYsLyqMhpBpg==",
 			"requires": {
 				"@rocket.chat/ui-kit": "^0.7.1"
 			},
 			"dependencies": {
 				"@babel/preset-react": {
-					"version": "7.9.4",
-					"resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.9.4.tgz",
-					"integrity": "sha512-AxylVB3FXeOTQXNXyiuAQJSvss62FEotbX2Pzx3K/7c+MKJMdSg6Ose6QYllkdCFA8EInCJVw7M/o5QbLuA4ZQ=="
+					"version": "7.9.4"
 				},
 				"@rocket.chat/ui-kit": {
-					"version": "0.7.1",
-					"resolved": "https://registry.npmjs.org/@rocket.chat/ui-kit/-/ui-kit-0.7.1.tgz",
-					"integrity": "sha512-CUpJt35zq56n4lBwWs17PRa+GGY+NKILv2ydjlL+dQNbtb9peEEzTVmglLRXUJhIwNKndSAr0eqoeTkRIsWL6A=="
+					"version": "0.7.0",
+					"resolved": "https://registry.npmjs.org/@rocket.chat/ui-kit/-/ui-kit-0.7.0.tgz",
+					"integrity": "sha512-qsBRQlUJhLga30qosHmiVsdLLBi2vjqBhAfKvYPAT0Qe5FzsuTRn6vtOnYk16A4mZ8hV8gWNDleuvG46vOk+LA=="
 				}
 			}
 		},