diff --git a/app/assets/stylesheets/conversations.css.scss b/app/assets/stylesheets/conversations.css.scss index 597a958dc..e9d641c05 100644 --- a/app/assets/stylesheets/conversations.css.scss +++ b/app/assets/stylesheets/conversations.css.scss @@ -239,3 +239,36 @@ text-align: center; font-size: 12px; } + +#new_message_pane { + ul.as-selections { width: 100% !important; } + input#contact_ids { box-shadow: none; } + textarea { width: 98%; } + + .bottom_submit_section { + text-align: right; + } + + .button.creation { + $button-border-color: #aaa; + @include border-radius(3px); + @include box-shadow(0,1px,1px,#cfcfcf); + @include transition(border); + @include button-gradient($creation-blue); + font-size: 12px; + color: #fff; + padding: 4px 9px; + min-width: 90px; + min-height: 10px; + border: 1px solid darken($button-border-color,20%); + + cursor: pointer; + white-space: nowrap; + + &:hover { + @include button-gradient-hover($creation-blue); + border: 1px solid darken($button-border-color,35%); + text-decoration: none; + } + } +} diff --git a/app/assets/stylesheets/new-templates.css.scss b/app/assets/stylesheets/new-templates.css.scss index 523c14bc0..bd0026331 100644 --- a/app/assets/stylesheets/new-templates.css.scss +++ b/app/assets/stylesheets/new-templates.css.scss @@ -30,3 +30,4 @@ /* conversations */ @import 'conversations'; @import 'popover'; +@import 'facebox'; diff --git a/app/views/conversations/new.haml b/app/views/conversations/new.haml index 36c10b4fd..1458abdbc 100644 --- a/app/views/conversations/new.haml +++ b/app/views/conversations/new.haml @@ -27,28 +27,27 @@ }); #new_message_pane - .span-12.last - #facebox_header - %h3 - = t('conversations.index.new_message') + .span5#facebox_header + %h3 + = t('conversations.index.new_message') - = form_for Conversation.new, html: {class: "new_conversation form_do_not_clear"}, remote: true do |conversation| + = form_for Conversation.new, html: {class: "new_conversation form_do_not_clear"}, remote: true do |conversation| - .span-2 - %h4 - = t('.to') - .span-10.last - = text_field_tag "contact_autocomplete" - .clearfix - %br - .span-2 - %h4 - = t('.subject') - .span-10.last - = conversation.text_field :subject - %br - .span-10.prepend-2.last - = text_area_tag "conversation[text]", '', :rows => 5 - .clearfix - .bottom_submit_section - = conversation.submit t('.send'), 'data-disable-with' => t('.sending'), :class => 'button creation' + .span1 + %h4 + = t('.to') + .span4 + = text_field_tag "contact_autocomplete" + .clearfix + %br + .span1 + %h4 + = t('.subject') + .span4 + = conversation.text_field :subject + %br + .span4.offset1 + = text_area_tag "conversation[text]", '', :rows => 5 + .clearfix + .bottom_submit_section + = conversation.submit t('.send'), 'data-disable-with' => t('.sending'), :class => 'button creation'