Compose flow style tweaks

This commit is contained in:
lilia 2015-08-31 15:11:00 -07:00
parent cc92cdfa29
commit 43aaf541c1
6 changed files with 23 additions and 16 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 129 B

After

Width:  |  Height:  |  Size: 125 B

View file

@ -28,9 +28,7 @@
window: options.window window: options.window
}); });
this.recipients_view = new Whisper.RecipientsInputView({ this.recipients_view = new Whisper.RecipientsInputView();
placeholder: "Add member"
});
this.listenTo(this.recipients_view.typeahead, 'sync', function() { this.listenTo(this.recipients_view.typeahead, 'sync', function() {
this.model.contactCollection.models.forEach(function(model) { this.model.contactCollection.models.forEach(function(model) {
if (this.recipients_view.typeahead.get(model)) { if (this.recipients_view.typeahead.get(model)) {

View file

@ -97,7 +97,7 @@
}, },
render_attributes: function() { render_attributes: function() {
return { placeholder: this.placeholder || "Name or phone number" }; return { placeholder: this.placeholder || "name or phone number" };
}, },
events: { events: {

View file

@ -76,7 +76,7 @@ button { cursor: pointer; }
button.back { button.back {
float: left; float: left;
background: $header-color url('/images/back.png') no-repeat center center; background: url('/images/back.png') no-repeat center center;
& + .title-text { & + .title-text {
text-indent: -$header-height; text-indent: -$header-height;
@ -252,10 +252,6 @@ $avatar-size: 44px;
.last-message, .last-timestamp { .last-message, .last-timestamp {
display: none; display: none;
} }
&:hover {
background: white;
cursor: auto;
}
} }
} }
@ -271,6 +267,7 @@ $avatar-size: 44px;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
box-shadow: 0 0px 1px rgba(#aaa, 0.8); box-shadow: 0 0px 1px rgba(#aaa, 0.8);
background: $grey_l;
&:hover { &:hover {
background: #f8f8f8; 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 colors
.avatar.colorgray { background-color: #999999 } .avatar.colorgray { background-color: #999999 }

View file

@ -20,6 +20,7 @@
.gutter { .gutter {
float: left; float: left;
width: 300px; width: 300px;
border-right: solid 1px #ddd;
.conversations { .conversations {
width: 100%; width: 100%;
} }

View file

@ -78,7 +78,7 @@ button {
button.back { button.back {
float: left; 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 { button.back + .title-text {
text-indent: -36px; } text-indent: -36px; }
@ -212,10 +212,6 @@ img.emoji {
.new-group-update-form .members .contact .last-message, .new-group-update-form .members .contact .last-message,
.new-group-update-form .members .contact .last-timestamp { .new-group-update-form .members .contact .last-timestamp {
display: none; } display: none; }
.group-member-list .members .contact:hover,
.new-group-update-form .members .contact:hover {
background: white;
cursor: auto; }
.conversation-header .check { .conversation-header .check {
float: right; float: right;
@ -227,7 +223,8 @@ img.emoji {
cursor: pointer; cursor: pointer;
white-space: nowrap; white-space: nowrap;
overflow: hidden; 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 { .contact:hover {
background: #f8f8f8; } background: #f8f8f8; }
.contact.selected { .contact.selected {
@ -282,6 +279,12 @@ img.emoji {
.attachment-preview img { .attachment-preview img {
width: 100%; } width: 100%; }
.new-conversation .recipients-input .recipients::before {
content: 'To: '; }
.new-group-update-form .recipients-input .recipients::before {
content: 'Add: '; }
.avatar.colorgray { .avatar.colorgray {
background-color: #999999; } background-color: #999999; }
@ -359,7 +362,8 @@ img.emoji {
.gutter { .gutter {
float: left; float: left;
width: 300px; } width: 300px;
border-right: solid 1px #ddd; }
.gutter .conversations { .gutter .conversations {
width: 100%; } width: 100%; }