From 191cb4fff672c8c0207a4f716619171bd28133c5 Mon Sep 17 00:00:00 2001
From: Alex 'AdUser' Z <ad_user@runbox.com>
Date: Sun, 3 Jan 2016 17:21:25 +1000
Subject: [PATCH] * merge zerobin.css to default.css

---
 public/theme/css/default.css | 34 ++++++++++++++++++++++++++++++++++
 public/theme/css/zerobin.css | 32 --------------------------------
 2 files changed, 34 insertions(+), 32 deletions(-)
 delete mode 100644 public/theme/css/zerobin.css

diff --git a/public/theme/css/default.css b/public/theme/css/default.css
index 3fff425..25e4c4f 100644
--- a/public/theme/css/default.css
+++ b/public/theme/css/default.css
@@ -150,3 +150,37 @@ hr {
   border-style: dashed;
   background-color: #A0B0C0;
 }
+
+pre code {
+  background-color: #777777;
+}
+
+/* zerobin */
+textarea#paste {
+  width: 50%;
+  height: 300px;
+}
+
+div.paste {
+  padding: 20px;
+  border: 1px dotted #777777;
+  text-align: justify;
+}
+
+/* imgbin */
+div.img-preview {
+  margin: 5px;
+  display: inline-block;
+  vertical-align: top;
+}
+
+a.zerobin {
+  padding-left: 18px;
+  background: transparent no-repeat scroll left center;
+  font-size: 12pt;
+}
+
+a.zerobin.create   { background-image: url('/img/pcreate.png');   }
+a.zerobin.download { background-image: url('/img/pdownload.png'); }
+a.zerobin.upload   { background-image: url('/img/upload.png');    }
+a.zerobin.latest   { background-image: url('/img/images.png');    }
diff --git a/public/theme/css/zerobin.css b/public/theme/css/zerobin.css
deleted file mode 100644
index e05e9e2..0000000
--- a/public/theme/css/zerobin.css
+++ /dev/null
@@ -1,32 +0,0 @@
-textarea#paste {
-  width: 50%;
-  height: 300px;
-}
-
-pre code {
-  background-color: #777777;
-}
-
-div.paste {
-  padding: 20px;
-  border: 1px dotted #777777;
-  text-align: justify;
-}
-
-/* imgbin */
-div.img-preview {
-  margin: 5px;
-  display: inline-block;
-  vertical-align: top;
-}
-
-a.zerobin {
-  padding-left: 18px;
-  background: transparent no-repeat scroll left center;
-  font-size: 12pt;
-}
-
-a.zerobin.create   { background-image: url('/img/pcreate.png');   }
-a.zerobin.download { background-image: url('/img/pdownload.png'); }
-a.zerobin.upload   { background-image: url('/img/upload.png');    }
-a.zerobin.latest   { background-image: url('/img/images.png');    }