From c7ac39f22c1e2234c0fdd6e5b4275660363e050a Mon Sep 17 00:00:00 2001
From: Eduarda Cunha <eduarda.mcunha@outlook.com>
Date: Tue, 28 Jan 2020 12:21:04 -0300
Subject: [PATCH 1/2] Addind text to the role description field

---
 app/authorization/client/views/permissionsRole.html | 6 +++++-
 packages/rocketchat-i18n/i18n/en.i18n.json          | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/authorization/client/views/permissionsRole.html b/app/authorization/client/views/permissionsRole.html
index a8a5ac92c312..0eb1d1e342db 100644
--- a/app/authorization/client/views/permissionsRole.html
+++ b/app/authorization/client/views/permissionsRole.html
@@ -31,10 +31,14 @@
 						</div>
 					</div>
 					<div>
-						<label for="mandatory2fa">{{_ "Users must use Two Factor Authentication"}} :</label>
+						<label for="mandatory2fa" class="message-form">{{_ "Users must use Two Factor Authentication"}} :</label>
 						<input id="mandatory2fa" type="checkbox" name="mandatory2fa" checked="{{mandatory2fa}}">
 					</div>
 
+					<div>
+						<label for="mandatory2fa" class="message-form">{{_ "Leave the description field blank if you dont want to show the role"}}.</label>
+					</div>
+
 					<div class="rc-button__group">
 						{{#if editable}}
 							<button name="delete" class="rc-button rc-button--danger delete-role">{{_ "Delete"}}</button>
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index bed62609d62d..042e793dfb60 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -3377,6 +3377,7 @@
   "Users_added": "The users have been added",
   "Users_in_role": "Users in role",
   "Users must use Two Factor Authentication": "Users must use Two Factor Authentication",
+  "Leave the description field blank if you don't want to show the role": "Leave the description field blank if you dont want to show the role",
   "Uses": "Uses",
   "Uses_left": "Uses left",
   "UTF8_Names_Slugify": "UTF8 Names Slugify",

From e58435d5b8cd37980a5149ba92c708c9ab1bbee3 Mon Sep 17 00:00:00 2001
From: Eduarda Cunha <eduarda.mcunha@outlook.com>
Date: Tue, 28 Jan 2020 13:30:43 -0300
Subject: [PATCH 2/2] Adjustments in the alert

---
 app/authorization/client/views/permissionsRole.html | 8 +++-----
 app/theme/client/imports/general/base_old.css       | 3 ++-
 packages/rocketchat-i18n/i18n/en.i18n.json          | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/authorization/client/views/permissionsRole.html b/app/authorization/client/views/permissionsRole.html
index 0eb1d1e342db..74579e16fe5d 100644
--- a/app/authorization/client/views/permissionsRole.html
+++ b/app/authorization/client/views/permissionsRole.html
@@ -31,14 +31,12 @@
 						</div>
 					</div>
 					<div>
-						<label for="mandatory2fa" class="message-form">{{_ "Users must use Two Factor Authentication"}} :</label>
+						<label for="mandatory2fa">{{_ "Users must use Two Factor Authentication"}} :</label>
 						<input id="mandatory2fa" type="checkbox" name="mandatory2fa" checked="{{mandatory2fa}}">
 					</div>
-
-					<div>
-						<label for="mandatory2fa" class="message-form">{{_ "Leave the description field blank if you dont want to show the role"}}.</label>
+					<div class="alert alert-warning">
+						<p for="mandatory2fa">{{_ "Leave the description field blank if you dont want to show the role"}}.</p>
 					</div>
-
 					<div class="rc-button__group">
 						{{#if editable}}
 							<button name="delete" class="rc-button rc-button--danger delete-role">{{_ "Delete"}}</button>
diff --git a/app/theme/client/imports/general/base_old.css b/app/theme/client/imports/general/base_old.css
index a3fb7e65919a..2654233a62a6 100644
--- a/app/theme/client/imports/general/base_old.css
+++ b/app/theme/client/imports/general/base_old.css
@@ -163,7 +163,8 @@
 }
 
 .rc-old .alert {
-	margin-bottom: 20px;
+	margin: 1rem 0;
+	padding: 0.5rem;
 
 	border-width: 1px;
 	border-radius: var(--border-radius);
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 042e793dfb60..9636ed8cb82f 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -3377,7 +3377,7 @@
   "Users_added": "The users have been added",
   "Users_in_role": "Users in role",
   "Users must use Two Factor Authentication": "Users must use Two Factor Authentication",
-  "Leave the description field blank if you don't want to show the role": "Leave the description field blank if you dont want to show the role",
+  "Leave_the_description_field_blank_if_you_dont_want_to_show_the_role": "Leave the description field blank if you don't want to show the role",
   "Uses": "Uses",
   "Uses_left": "Uses left",
   "UTF8_Names_Slugify": "UTF8 Names Slugify",