From 0bac5d836db66f54c43d187370e769613cfd4b7c Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 20 Sep 2017 09:36:55 -0300
Subject: [PATCH] Merge pull request #8194 from RocketChat/more-rtl-fixes

Fix more rtl issues
---
 .../client/imports/components/message-box.css |  6 ++++++
 .../imports/components/modal/full-modal.css   | 20 +++++++++++++++----
 .../imports/components/sidebar/toolbar.css    |  6 ++++++
 .../client/imports/forms/popup-list.css       |  5 +++++
 .../client/imports/general/rtl.css            | 16 ++++-----------
 .../client/messageBox.html                    |  2 +-
 .../client/views/app/fullModal.html           |  2 +-
 7 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/packages/rocketchat-theme/client/imports/components/message-box.css b/packages/rocketchat-theme/client/imports/components/message-box.css
index ab9e171fb33..142ab9ce3bc 100644
--- a/packages/rocketchat-theme/client/imports/components/message-box.css
+++ b/packages/rocketchat-theme/client/imports/components/message-box.css
@@ -243,3 +243,9 @@
 		}
 	}
 }
+
+.rtl .rc-message-box__typing {
+	right: 0;
+
+	margin-right: 24px;
+}
diff --git a/packages/rocketchat-theme/client/imports/components/modal/full-modal.css b/packages/rocketchat-theme/client/imports/components/modal/full-modal.css
index cd2bc4eca1a..55516a09b9c 100644
--- a/packages/rocketchat-theme/client/imports/components/modal/full-modal.css
+++ b/packages/rocketchat-theme/client/imports/components/modal/full-modal.css
@@ -28,13 +28,15 @@
 	}
 
 	&__back-text {
-		margin-right: 0.375rem;
+		margin-right: 2px;
+
+		line-height: 22px;
 	}
 
 	&__back-icon {
-		width: 10px;
-		height: 10px;
-		stroke: currentColor;
+		transform: rotate(45deg);
+
+		font-size: 1rem;
 	}
 }
 
@@ -55,3 +57,13 @@
 		}
 	}
 }
+
+.rtl .full-modal {
+	&__back-button {
+		left: 0
+	}
+
+	&__back-text {
+		margin-left: 0.375rem;
+	}
+}
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/toolbar.css b/packages/rocketchat-theme/client/imports/components/sidebar/toolbar.css
index 7ad0eabe920..5717024106b 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/toolbar.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/toolbar.css
@@ -107,3 +107,9 @@
 		padding: 0 calc(var(--sidebar-small-default-padding) - 8px) var(--sidebar-small-default-padding);
 	}
 }
+
+.rtl .toolbar {
+	& .rc-input__icon + .rc-input__element {
+		padding: 0.5rem 2.25rem 0.5rem 1rem;
+	}
+}
diff --git a/packages/rocketchat-theme/client/imports/forms/popup-list.css b/packages/rocketchat-theme/client/imports/forms/popup-list.css
index 340130cdcb0..923e580cb18 100644
--- a/packages/rocketchat-theme/client/imports/forms/popup-list.css
+++ b/packages/rocketchat-theme/client/imports/forms/popup-list.css
@@ -43,3 +43,8 @@
 		}
 	}
 }
+
+.rtl .rc-popup-list__item-image {
+	margin-right: 0;
+	margin-left: 1rem;
+}
diff --git a/packages/rocketchat-theme/client/imports/general/rtl.css b/packages/rocketchat-theme/client/imports/general/rtl.css
index 2dfc17e7f7d..c3c66aacbd7 100644
--- a/packages/rocketchat-theme/client/imports/general/rtl.css
+++ b/packages/rocketchat-theme/client/imports/general/rtl.css
@@ -1,6 +1,10 @@
 .rtl {
 	direction: rtl;
 
+	& .rc-old .page-container .content .rocket-form .submit {
+		text-align: left;
+	}
+
 	& button {
 		text-align: right;
 	}
@@ -641,18 +645,6 @@
 		}
 	}
 
-	& .first-unread .body {
-		&::before {
-			right: 20px;
-			left: 0;
-		}
-
-		&::after {
-			right: auto;
-			left: 0;
-		}
-	}
-
 	& .ticks-bar {
 		right: auto;
 		left: 2px;
diff --git a/packages/rocketchat-ui-message/client/messageBox.html b/packages/rocketchat-ui-message/client/messageBox.html
index e506486f4ed..0b1d080ec6f 100644
--- a/packages/rocketchat-ui-message/client/messageBox.html
+++ b/packages/rocketchat-ui-message/client/messageBox.html
@@ -25,7 +25,7 @@
 					<div class="rc-message-box__icon emoji-picker-icon">
 						{{> icon block="rc-input__icon-svg" icon="emoji"}}
 					</div>
-					<textarea autofocus dir="auto" name="msg" maxlength="{{maxMessageLength}}" placeholder="{{_ 'Message'}}" rows="1" class="rc-message-box__textarea js-input-message autogrow-short"></textarea>
+					<textarea autofocus name="msg" maxlength="{{maxMessageLength}}" placeholder="{{_ 'Message'}}" rows="1" class="rc-message-box__textarea js-input-message autogrow-short"></textarea>
 					{{#unless disableSendIcon}}
 						<div class="rc-message-box__icon rc-message-box__send js-send" data-desktop>
 							{{> icon block="rc-input__icon-svg" icon="send"}}
diff --git a/packages/rocketchat-ui/client/views/app/fullModal.html b/packages/rocketchat-ui/client/views/app/fullModal.html
index 2febffb428f..7bbfa988c29 100644
--- a/packages/rocketchat-ui/client/views/app/fullModal.html
+++ b/packages/rocketchat-ui/client/views/app/fullModal.html
@@ -3,7 +3,7 @@
 		<div class="full-modal__wrapper">
 			<button class="full-modal__back-button">
 				<span class="full-modal__back-text">{{_ "Cancel"}}</span>
-				{{> icon block="full-modal__back-icon" icon="cross"}}
+				{{> icon block="full-modal__back-icon" icon="plus"}}
 			</button>
 			{{> Template.dynamic template=template}}
 		</div>