From 43aaf541c13b648b620dc9c50e4fc70c67dfe20d Mon Sep 17 00:00:00 2001
From: lilia <liliakai@gmail.com>
Date: Mon, 31 Aug 2015 15:11:00 -0700
Subject: [PATCH] Compose flow style tweaks

---
 images/back.png                   | Bin 129 -> 125 bytes
 js/views/new_group_update_view.js |   4 +---
 js/views/recipients_input_view.js |   2 +-
 stylesheets/_global.scss          |  14 +++++++++-----
 stylesheets/_index.scss           |   1 +
 stylesheets/manifest.css          |  18 +++++++++++-------
 6 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/images/back.png b/images/back.png
index 2f735cae8528d2a26a0e9813d91e313c5c030fc7..22b624b31f2a72ecb5a5c1493ebf0bc7563b6807 100644
GIT binary patch
delta 95
zcmZo<tev0|>Eh|)7*fHQ?7+I%fsw;A=pO?|s%PN8`40`4`FW?xEBgKnWQ$9Rt!G&A
zhrQXP!?TO`xI{&J=d@}bqa~_*m7jzjYA`T3X3CzuA}{@u0SG)@{an^LB{Ts5{YM~W

delta 99
zcmV-p0G$7QfdP;tT}VkpK~y-)V_+Bs$l$-ie+AN%KLA2mQk4JyfA~KS4V51uP5IIP
zyu`Zx08sgl|I(y|&j0_%h_+#{Yq|GdhP1>XKboV+0|2``Rh4_wyG;N9002ovPDHLk
FV1iX`FW~?H

diff --git a/js/views/new_group_update_view.js b/js/views/new_group_update_view.js
index 1277538fe..fcc44ffe4 100644
--- a/js/views/new_group_update_view.js
+++ b/js/views/new_group_update_view.js
@@ -28,9 +28,7 @@
                 window: options.window
             });
 
-            this.recipients_view = new Whisper.RecipientsInputView({
-                placeholder: "Add member"
-            });
+            this.recipients_view = new Whisper.RecipientsInputView();
             this.listenTo(this.recipients_view.typeahead, 'sync', function() {
                 this.model.contactCollection.models.forEach(function(model) {
                     if (this.recipients_view.typeahead.get(model)) {
diff --git a/js/views/recipients_input_view.js b/js/views/recipients_input_view.js
index 9e6da619c..8a7b7d4f7 100644
--- a/js/views/recipients_input_view.js
+++ b/js/views/recipients_input_view.js
@@ -97,7 +97,7 @@
         },
 
         render_attributes: function() {
-            return { placeholder: this.placeholder || "Name or phone number" };
+            return { placeholder: this.placeholder || "name or phone number" };
         },
 
         events: {
diff --git a/stylesheets/_global.scss b/stylesheets/_global.scss
index c1db267e5..337fd58dd 100644
--- a/stylesheets/_global.scss
+++ b/stylesheets/_global.scss
@@ -76,7 +76,7 @@ button { cursor: pointer; }
 
 button.back {
   float: left;
-  background: $header-color url('/images/back.png') no-repeat center center;
+  background: url('/images/back.png') no-repeat center center;
 
   & + .title-text {
     text-indent: -$header-height;
@@ -252,10 +252,6 @@ $avatar-size: 44px;
     .last-message, .last-timestamp {
       display: none;
     }
-    &:hover {
-      background: white;
-      cursor: auto;
-    }
   }
 }
 
@@ -271,6 +267,7 @@ $avatar-size: 44px;
   white-space: nowrap;
   overflow: hidden;
   box-shadow: 0 0px 1px rgba(#aaa, 0.8);
+  background: $grey_l;
 
   &:hover {
     background: #f8f8f8;
@@ -363,6 +360,13 @@ $avatar-size: 44px;
   }
 
 }
+.new-conversation .recipients-input .recipients::before {
+  content: 'To: ';
+}
+.new-group-update-form .recipients-input .recipients::before {
+  content: 'Add: ';
+}
+
 
 // avatar colors
 .avatar.colorgray { background-color: #999999 }
diff --git a/stylesheets/_index.scss b/stylesheets/_index.scss
index 05523b2d8..8465a5480 100644
--- a/stylesheets/_index.scss
+++ b/stylesheets/_index.scss
@@ -20,6 +20,7 @@
 .gutter {
   float: left;
   width: 300px;
+  border-right: solid 1px #ddd;
   .conversations {
     width: 100%;
   }
diff --git a/stylesheets/manifest.css b/stylesheets/manifest.css
index f86c6611e..9d5ac0337 100644
--- a/stylesheets/manifest.css
+++ b/stylesheets/manifest.css
@@ -78,7 +78,7 @@ button {
 
 button.back {
   float: left;
-  background: #2090ea url("/images/back.png") no-repeat center center; }
+  background: url("/images/back.png") no-repeat center center; }
   button.back + .title-text {
     text-indent: -36px; }
 
@@ -212,10 +212,6 @@ img.emoji {
   .new-group-update-form .members .contact .last-message,
   .new-group-update-form .members .contact .last-timestamp {
     display: none; }
-  .group-member-list .members .contact:hover,
-  .new-group-update-form .members .contact:hover {
-    background: white;
-    cursor: auto; }
 
 .conversation-header .check {
   float: right;
@@ -227,7 +223,8 @@ img.emoji {
   cursor: pointer;
   white-space: nowrap;
   overflow: hidden;
-  box-shadow: 0 0px 1px rgba(170, 170, 170, 0.8); }
+  box-shadow: 0 0px 1px rgba(170, 170, 170, 0.8);
+  background: #f3f3f3; }
   .contact:hover {
     background: #f8f8f8; }
   .contact.selected {
@@ -282,6 +279,12 @@ img.emoji {
   .attachment-preview img {
     width: 100%; }
 
+.new-conversation .recipients-input .recipients::before {
+  content: 'To: '; }
+
+.new-group-update-form .recipients-input .recipients::before {
+  content: 'Add: '; }
+
 .avatar.colorgray {
   background-color: #999999; }
 
@@ -359,7 +362,8 @@ img.emoji {
 
 .gutter {
   float: left;
-  width: 300px; }
+  width: 300px;
+  border-right: solid 1px #ddd; }
   .gutter .conversations {
     width: 100%; }