Merge branch 'master' of github.com:jamierumbelow/revisionhub

jamierumbelow · Nov 13, 2011 · 0afd095 · 0afd095
2 parents febf0b6 + 46e1c14
commit 0afd095
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/app/assets/stylesheets/home.css.erb b/app/assets/stylesheets/home.css.erb
@@ -136,3 +136,8 @@ input:focus { outline: none; border: 1px solid #cc4e1a; }
 
 .prompt-active { color: #a1a1a1; font-style: italic; }
 
+.note {
+    padding: 10px 0;
+    margin: 5px 0;
+    border-bottom: 1px solid #CCC;
+}
diff --git a/app/assets/stylesheets/notes.css.erb b/app/assets/stylesheets/notes.css.erb
@@ -2,4 +2,4 @@
     width: 800px;
     height: 400px;
     margin: 10px auto;
-}
+}
diff --git a/app/views/notes/show.html.erb b/app/views/notes/show.html.erb
@@ -5,7 +5,7 @@
         <p>Edit away to your heart's content. All your changes are done in real time and saved automatically so there's no need to worry about losing work or over-writing that of others.</p>
     <% else %>
         <h1 id="notes-heading"><%=@note.title %></h1>
-        <div id="notepad-not-logged"><%= @pad.text %></div>
+        <div id="notepad-not-logged"><%= @pad.text.gsub("\n", '<br />').html_safe %></div>
         <p>As you're not logged in you can only view the text, not edit it. Sorry.</p>
     <% end %>
-</div>
+</div>