fixed merge conflicts

2016-08-19 01:09:43 -03:00
parent c637878603 27e3c14f10
commit 5ffd4123a1
28 changed files with 493 additions and 203 deletions
--- a/static/main.css
+++ b/static/main.css
@@ -555,6 +555,19 @@ input[type='text'] {
  line-height: 1.5em;
 }

+/*
+ * TORRENT LIST: ERRORS
+ */
+
+.torrent-list p {
+  margin: 10px 20px;
+}
+
+.torrent-list a {
+  color: #99f;
+  text-decoration: none;
+}
+
 /*
 * TORRENT LIST: DRAG-DROP TARGET
 */