Merge branch 'wordh' of 10.0.47.245:/home/trustie2 into wordh

app/views/forums/show.html.erb

@@ -1,5 +1,5 @@
 <!-- added by fq -->
-<div id="add-memo" style="display:none;">
+<div id="add-memo" class='lz' style="display: none; padding: 20px;">
 	<h3><%=l(:label_memo_new)%></h3>
 	<% if User.current.logged? %>
 	<%= labelled_form_for(@memo, :url => forum_memos_path(@forum), :html => {:multipart => true} ) do |f|  %>
@@ -15,7 +15,7 @@
 		</div>
 	<% end %>
 	<div class="actions" style="max-width:680px">
-		<p><%= f.text_field :subject, :required => true, :size => 95 %></p>
+		<p><%= f.text_field :subject, :required => true%></p>
 		<p style="max-width:680px"><%= f.text_area :content, :required => true, :id => 'editor02' %></p>
 		<script type="text/javascript">var ckeditor=CKEDITOR.replace('editor02');</script>
 		<br/>

public/javascripts/application.js

@@ -22,7 +22,7 @@ function showAndScrollTo(id, focus) {
   if (focus !== null) {
     $('#'+focus).focus();
   }
-  $('html, body').animate({scrollTop: $('#'+id).offset().top}, 100);
+  $('html, body').animate({scrollTop: $('#'+id).offset().top}, 400);
 }
 
 function toggleRowGroup(el) {

public/stylesheets/nyan.css

@@ -201,6 +201,14 @@ input[class='nyan-clean-gray']:active, .nyan-clean-gray:active {
   -moz-box-sizing: border-box;
   -box-sizing: border-box;
 }*/
+div.actions input[type="text"]{
+  padding: 3px;
+  width: 100%;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  -box-sizing: border-box;
+
+}
 .lz {
     position:relative;
     min-height: 200px;