Merge branch 'master' of https://github.com/savetheinternet/Tinyboard

Conflicts: js/hide-threads.js js/inline-expanding.js stylesheets/style.css
2013-07-27 01:04:36 -04:00
parent e3cb427fee 1c33285c81
commit 64a66db613
6 changed files with 188 additions and 18 deletions
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -405,7 +405,6 @@ table.mod.config-editor td {
 table.mod.config-editor input[type="text"] {
 	width: 98%;
 }
-
 .desktop-style div.boardlist:nth-child(1) {
  position: fixed;
  top: 0px;
@@ -459,6 +458,6 @@ table.mod.config-editor input[type="text"] {
  opacity: 0.8;
 }
 p.intro.thread-hidden {
-  margin: 0px;
-  padding: 0px;
+	margin: 0px;
+	padding: 0px;
 }