Bug 1211438 - Review comments from bug 1184940 didn't make Fx43 - fixing borders for edit context [r=dmose, a=lizzard, l10n=lizzard]
authorEd Lee <edilee@mozilla.com>
Fri, 04 Sep 2015 07:43:53 -0700
changeset 296302 38d39d3820244bc8495b31cb17a8e8859f9e0cb7
parent 296301 e8b417baee24d6fa89db56b146330bf170ff8b95
child 296303 192e84036f5a8bab4bfe6e341c6e14a5b3806fd3
push id5245
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 11:30:51 +0000
treeherdermozilla-beta@dac831dc1bd0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdmose, lizzard
bugs1211438, 1184940
milestone43.0a2
Bug 1211438 - Review comments from bug 1184940 didn't make Fx43 - fixing borders for edit context [r=dmose, a=lizzard, l10n=lizzard]
browser/components/loop/content/shared/css/conversation.css
browser/components/loop/standalone/content/l10n/en-US/loop.properties
--- a/browser/components/loop/content/shared/css/conversation.css
+++ b/browser/components/loop/content/shared/css/conversation.css
@@ -986,18 +986,16 @@ body[platform="win"] .share-service-drop
 }
 
 .showing-room-name > .text-chat-entries > .text-chat-scroller > .context-url-view-wrapper {
   padding-top: 0;
 }
 
 .room-context {
   background: #fff;
-  border-top: 2px solid #444;
-  border-bottom: 2px solid #444;
   position: absolute;
   left: 0;
   bottom: 0;
   width: 100%;
   height: 100%;
   font-size: .9em;
   display: flex;
   flex-flow: column nowrap;
@@ -1029,67 +1027,42 @@ body[platform="win"] .share-service-drop
 }
 
 .room-context > .error-display-area.error {
   margin: 1em 0 .5em 0;
   text-align: center;
   text-shadow: 1px 1px 0 rgba(0,0,0,.3);
 }
 
-.room-context > .checkbox-wrapper {
-  margin-bottom: .5em;
-  width: 100%;
-}
-
 .room-context-header {
   color: #333;
   font-size: 1.2rem;
   font-weight: bold;
   margin: 1rem auto;
 }
 
-.room-context-comment {
-  color: #707070;
-}
-
-.room-context-comment {
-  word-wrap: break-word;
-}
-
-:not(input).room-context-url {
-  color: #0095dd;
-  font-style: italic;
-  text-decoration: none;
-  display: block;
-  cursor: pointer;
-}
-
-.room-context-url:hover {
-  text-decoration: underline;
-}
-
 .room-context > form {
   margin-bottom: 1rem;
   padding: .5rem;
   width: 100%;
 }
 
 .room-context > form > textarea,
 .room-context > form > input[type="text"] {
+  border: 1px solid #c3c3c3;
+  border-radius: 4px;
+  box-shadow: none;
+  color: #4a4a4a;
   display: block;
-  width: 100%;
-  outline: none;
-  border-radius: 4px;
+  font-size: 1.1rem;
+  height: 2.6rem;
   margin: 10px 0;
-  border: 1px solid #c3c3c3;
-  height: 2.6rem;
+  outline: none;
   padding: 6px;
-  font-size: 1.1rem;
-  color: #4a4a4a;
-  box-shadow: none;
+  width: 100%;
 }
 
 .room-context > form > textarea {
   font-family: inherit;
   height: 5.2rem;
   resize: none;
 }
 
--- a/browser/components/loop/standalone/content/l10n/en-US/loop.properties
+++ b/browser/components/loop/standalone/content/l10n/en-US/loop.properties
@@ -80,13 +80,13 @@ rooms_read_while_wait_offer=Want somethi
 ## replaced by the brand name.
 standalone_title_with_room_name={{roomName}} — {{clientShortname}}
 status_error=Something went wrong
 
 # Text chat strings
 
 chat_textbox_placeholder=Type here…
 # LOCALIZATION NOTE (context_inroom_label2): this string is followed by the
-# title/URL of the website you are having a conversation about, displayed on a
+# title/domain of the website you are having a conversation about, displayed on a
 # separate line. If this structure doesn't work for your locale, you might want
 # to consider this as a stand-alone title. See example screenshot:
 # https://bug1084991.bugzilla.mozilla.org/attachment.cgi?id=8614721
 context_inroom_label2=Let's Talk About: