From ca4e527f2b49ee294ba6347f2b04376aa6057af9 Mon Sep 17 00:00:00 2001
From: Shahar Porat <shahar3012@outlook.com>
Date: Fri, 26 Jun 2015 16:24:23 +0300
Subject: [PATCH 1/2] RTL support with the new info class

Fix to the RTL support and the code text-alignment after the recent
changes in message info class
---
 client/stylesheets/base.less |  3 ++-
 client/stylesheets/rtl.less  | 42 ++++++++++++++++++++++++++----------
 2 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/client/stylesheets/base.less b/client/stylesheets/base.less
index fe290e2c6ec6..7e28ef12c3b6 100644
--- a/client/stylesheets/base.less
+++ b/client/stylesheets/base.less
@@ -53,6 +53,7 @@ code {
 	padding: 0.5em;
 	vertical-align: middle;
 	word-wrap: break-word;
+	text-align: left;
 	&.inline {
 		display: inline-block;
 		padding: 0 5px;
@@ -1144,7 +1145,7 @@ a.github-fork {
 		select {
 			border-width: 0 0 1px 0;
 			border-color: @tertiary-font-color;
-			background-color: transparent;
+			background-color: #04436a;
 			color: @quaternary-font-color;
 			padding: 0 8px;
 			box-shadow: 0 0 0;
diff --git a/client/stylesheets/rtl.less b/client/stylesheets/rtl.less
index 8e429821b081..42f9cfd85b0c 100644
--- a/client/stylesheets/rtl.less
+++ b/client/stylesheets/rtl.less
@@ -182,21 +182,41 @@
   }
 
   .messages-box {
+    margin: 60px 0px 20px 0px;
+
+    li.load-more {
+      padding-bottom: 25px;
+    }
+
     .message {
-       .padding-right(50px);
-     }
+      padding-right: 50px;
+      padding-left: 50px;
+        margin: 12px 20px 5px 20px;
+        .thumb {
+          .right(0px);
+        }
+      }
+      .message.sequential {
+        .info {
+          .right(-15px);
+          .edited, .time {
+            float: left;
+          }
+          .edit-message {
+            float: right;
+            .margin-right(5px);
+          }
+        }
 
-     .thumb {
-       .right(0px);
-     }
+       .message.with-thumb .time {
+         .right(4px);
+       }
 
-     .message.with-thumb .time {
-       .right(4px);
-     }
+        .time-single {
+          .right(-15px);
+       }
+    }
 
-      .time-single {
-        .right(-15px);
-     }
   }
 
   .messages-container {

From 6a1ce7f3bd0b4f1cfbc9b4b5f92d7143da13d95c Mon Sep 17 00:00:00 2001
From: Shahar Porat <shahar3012@outlook.com>
Date: Fri, 26 Jun 2015 16:25:50 +0300
Subject: [PATCH 2/2] Fixing the last commit

---
 packages/rocketchat-ldap/.npm/package/npm-shrinkwrap.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/rocketchat-ldap/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-ldap/.npm/package/npm-shrinkwrap.json
index 7e02a6823096..3dd543e2c5ed 100644
--- a/packages/rocketchat-ldap/.npm/package/npm-shrinkwrap.json
+++ b/packages/rocketchat-ldap/.npm/package/npm-shrinkwrap.json
@@ -59,9 +59,6 @@
               }
             }
           }
-        },
-        "dtrace-provider": {
-          "version": "0.2.8"
         }
       }
     }