merge from jiawei

3 files changed, 13 insertions, 20 deletions

diff --git a/static/pastebin.js b/static/pastebin.js
index 8507726..4412595 100644
--- a/static/pastebin.js
+++ b/static/pastebin.js
@@ -1,11 +1,8 @@
 (function() {
   var global = this;
 
-  var jug = new Juggernaut();
-
   var lib = global.pastebin = {
     urlRoot : '/',
-    jug : jug,
 
     autoHideFlashes : function() {
       var flashes = $('p.flash:visible').hide();
@@ -38,19 +35,8 @@
       if (reply.author)
         msg.append($('<span></span>').text(' ' + reply.author))
       lib.flash(msg);
-    },
-
-    subscribePaste : function(pasteID) {
-      jug.subscribe('paste-replies:' + pasteID, function(data) {
-        lib.onNewReply(data, 'paste');
-      });
-    },
-
-    subscribeUser : function(userID) {
-      jug.subscribe('user-replies:' + userID, function(data) {
-        lib.onNewReply(data, 'user');
-      });
     }
+
   };
 
 
diff --git a/static/small.css b/static/small.css
new file mode 100644
index 0000000..af50a92
--- /dev/null
+++ b/static/small.css
@@ -0,0 +1,6 @@
+pre {
+    font-size: 18px;
+    line-height: 1.8em;
+}
+
+.page         { margin: 50px auto; width: 100%; }
diff --git a/static/style.css b/static/style.css
index 7b19c76..d58599a 100644
--- a/static/style.css
+++ b/static/style.css
@@ -1,6 +1,6 @@
 body          { margin: 0; padding: 0; }
 body, input   { font-size: 16px; font-family: 'Helvetica Neue', sans-serif; }
-.page         { margin: 50px auto; width: 740px; }
+.page         { margin: 50px auto; width: 800px; }
 h1            { margin: 0; font-weight: normal; color: #c00; }
 a             { color: black; }
 a:hover       { color: #c00; }
@@ -12,10 +12,11 @@ dl            { overflow: auto; font-size: 14px; }
 dl dt         { font-weight: bold; width: 90px; float: left;
                 clear: left; }
 dl dd         { float: left; margin: 0; padding: 0; }
-pre, textarea { font-family: 'Consolas', monospace; font-size: 14px;
-                background: #eee; padding: 0; margin: 0; }
-textarea      { border: none; width: 720px; }
-.code, .flash { background: #eee; margin: 10px -30px; padding: 10px 30px; }
+pre, textarea { font-family: 'Consolas', monospace; font-size: 18px;
+                background: #eee; padding: 0; margin: 0; line-height: 2em;
+                word-break: break-word; white-space: pre-wrap;}
+textarea      { border: none; width: 100%; }
+.code, .flash { background: #eee; padding: 20px; }
 .pagination strong,
 .pagination span.ellipsis,
 .pagination a { border: 1px solid #d00; padding: 2px 6px; text-decoration: none; }