From d6678b591f6754d857e2f61661b875c614f3e246 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Wed, 15 Jul 2015 14:12:00 -0400
Subject: [PATCH] Backed out changeset f983c54e52e1 (bug 1183576) for
 browser_parsable_css.js failures.

---
 browser/components/loop/content/css/panel.css |  4 +-
 .../loop/content/shared/css/common.css        |  2 +-
 .../loop/content/shared/css/conversation.css  | 40 +++----------------
 .../shared/img/chatbubble-arrow-right.svg     |  2 +-
 4 files changed, 9 insertions(+), 39 deletions(-)

diff --git a/browser/components/loop/content/css/panel.css b/browser/components/loop/content/css/panel.css
index d05bd4c37b3..d4f183c8f1d 100644
--- a/browser/components/loop/content/css/panel.css
+++ b/browser/components/loop/content/css/panel.css
@@ -215,7 +215,7 @@ body {
 
 .new-room-view > .context {
   margin: .5rem 0 0;
-  background-color: #dbf7ff;
+  background-color: #DEEFF7;
   border-radius: 3px 3px 0 0;
   padding: .5rem;
 }
@@ -243,7 +243,7 @@ body {
 }
 
 .new-room-view > .context > .checkbox-wrapper > label {
-  color: #333;
+  color: #3c3c3c;
   font-weight: 700;
 }
 
diff --git a/browser/components/loop/content/shared/css/common.css b/browser/components/loop/content/shared/css/common.css
index 59346140e30..20fb1d681c1 100644
--- a/browser/components/loop/content/shared/css/common.css
+++ b/browser/components/loop/content/shared/css/common.css
@@ -520,7 +520,7 @@ html[dir="rtl"] .context-content {
 }
 
 .context-wrapper {
-  border: 1px solid #5cccee;
+  border: 1px solid #0096dd;
   border-radius: 3px;
   background: #fff;
   padding: .8em;
diff --git a/browser/components/loop/content/shared/css/conversation.css b/browser/components/loop/content/shared/css/conversation.css
index fed126cb742..d89f9bc0e89 100644
--- a/browser/components/loop/content/shared/css/conversation.css
+++ b/browser/components/loop/content/shared/css/conversation.css
@@ -1465,20 +1465,14 @@ html[dir="rtl"] .standalone .room-conversation-wrapper .room-inner-info-area {
 .text-chat-entry {
   display: flex;
   flex-direction: row;
-  margin-right: .2em;
   margin-bottom: .5em;
-  text-align: end;
+  text-align: start;
   flex-wrap: nowrap;
   justify-content: flex-start;
   align-content: stretch;
   align-items: flex-start;
 }
 
-html[dir="rtl"] .text-chat-entry {
-  margin-right: auto;
-  margin-left: .2em;
-}
-
 .text-chat-entry > p {
   position: relative;
   z-index: 10;
@@ -1489,9 +1483,10 @@ html[dir="rtl"] .text-chat-entry {
   max-width: 80%;
   border-width: 1px;
   border-style: solid;
-  border-color: #5cccee;
+  border-color: #2ea4ff;
   background: #fff;
   word-wrap: break-word;
+  word-wrap: break-word;
   flex: 0 1 auto;
   align-self: auto;
 }
@@ -1539,7 +1534,7 @@ html[dir="rtl"] .text-chat-entry.received > p {
 
 /* Text chat entry timestamp */
 .text-chat-entry-timestamp {
-  margin: 0 .5em;
+  margin: 0 .2em;
   color: #aaa;
   font-style: italic;
   font-size: .8em;
@@ -1674,32 +1669,7 @@ html[dir="rtl"] .text-chat-entry.received .text-chat-arrow {
   padding: 0 .5em .5em;
   font-size: 1.1em;
   border: 0;
-  border-top: 1px solid #d8d8d8;
-}
-
-.text-chat-box > form > input::-webkit-input-placeholder {
-  font-size: 1.1em;
-  color: #999;
-}
-
-.text-chat-box > form > input::-moz-placeholder {
-  font-size: 1.1em;
-  color: #999;
-}
-
-.text-chat-box > form > input:-moz-placeholder {
-  font-size: 1.1em;
-  color: #999;
-}
-
-.text-chat-box > form > input:-ms-input-placeholder {
-  font-size: 1.1em;
-  color: #999;
-}
-
-.text-chat-box > form > input:input-placeholder {
-  font-size: 1.1em;
-  color: #999;
+  border-top: 1px solid #999;
 }
 
 /* turn the visible border blue as a visual indicator of focus */
diff --git a/browser/components/loop/content/shared/img/chatbubble-arrow-right.svg b/browser/components/loop/content/shared/img/chatbubble-arrow-right.svg
index c1d12497ead..7b1251e3301 100644
--- a/browser/components/loop/content/shared/img/chatbubble-arrow-right.svg
+++ b/browser/components/loop/content/shared/img/chatbubble-arrow-right.svg
@@ -5,7 +5,7 @@
  <g>
   <title>Layer 1</title>
   <g id="svg_1" fill="none">
-   <path id="svg_2" fill="#5cccee" d="m19.505243,8.972466l-9.299002,0l0,-1l6.088001,0c-2.110002,-0.967 -4.742001,-2.818 -6.088001,-6.278l0.932,-0.363c2.202,5.664 8.377999,6.637 8.44,6.646c0.259001,0.039 0.444,0.27 0.426001,0.531c-0.019001,0.262 -0.237,0.464 -0.498999,0.464l-12.072001,-0.352"/>
+   <path id="svg_2" fill="#2EA4FF" d="m19.505243,8.972466l-9.299002,0l0,-1l6.088001,0c-2.110002,-0.967 -4.742001,-2.818 -6.088001,-6.278l0.932,-0.363c2.202,5.664 8.377999,6.637 8.44,6.646c0.259001,0.039 0.444,0.27 0.426001,0.531c-0.019001,0.262 -0.237,0.464 -0.498999,0.464l-12.072001,-0.352"/>
   </g>
   <line id="svg_13" y2="8.474788" x2="6.200791" y1="8.474788" x1="10.265923" stroke="#22a4ff" fill="none"/>
   <line id="svg_26" y2="8.474788" x2="2.14584" y1="8.474788" x1="6.210972" stroke="#22a4ff" fill="none"/>