Merge branch 'master' of https://github.com/kaernyk/vichan

Conflicts:
	stylesheets/style.css

2 files changed, 200 insertions, 1 deletions

diff --git a/stylesheets/style.css b/stylesheets/style.css
index 2f14f187..ecbcd58a 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -1,7 +1,11 @@
 body {
   background: #EEF2FF url('img/fade-blue.png') repeat-x 50% 0%;
   color: black;
+<<<<<<< HEAD
   font-family: arial,helvetica,sans-serif;
+=======
+  font-family: arial, helvetica, sans-serif;
+>>>>>>> 197e4d4bfcb5a312a699e1f6d012da03ee36fbe2
   font-size: 10pt;
   margin: 0 4px;
   padding-left: 4px;
@@ -100,7 +104,11 @@ input[type="text"],input[type="password"],textarea {
   max-width: 75%;
 }
 
+<<<<<<< HEAD
 #quick-reply input[type="text"],input[type="password"],#quick-reply textarea {
+=======
+#quick-reply input[type="text"], input[type="password"], #quick-reply textarea {
+>>>>>>> 197e4d4bfcb5a312a699e1f6d012da03ee36fbe2
   max-width: 100%;
 }
 
@@ -917,4 +925,4 @@ code>pre>span.pln {
   div.post div.body {
     clear: none;
   }
-}
\ No newline at end of file
+}
diff --git a/stylesheets/v8ch.css b/stylesheets/v8ch.css
new file mode 100644
index 00000000..bd8e68ab
--- /dev/null
+++ b/stylesheets/v8ch.css
@@ -0,0 +1,191 @@
+@import url(https://fonts.googleapis.com/css?family=Source+Sans+Pro);
+ 
+body{
+  background: #eee !important;
+  font-family: 'Source Sans Pro', Arial, Helvetica, sans-serif !important;
+}
+ 
+a{
+  text-decoration: none;
+}
+ 
+.boardlist{
+  width: 100% !important;
+  position: fixed !important;
+  z-index: 99999 !important;
+  top: 0 !important;
+  left: 0 !important;
+  color: #222 !important;
+  background: #fff !important;
+  padding: 1em !important;
+  box-sizing: border-box !important;
+  margin-top: 0 !important;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3) !important;
+}
+ 
+img.banner,
+img.board_image{
+  border: none !important;
+}
+ 
+.board_image,
+.board_image + header{
+  margin-top: 3.75em !important;
+  margin-bottom: 1em !important;
+  float: left !important;
+}
+ 
+.board_image + header{
+  margin-left: 1em !important;
+}
+ 
+header,
+header h1,
+header .subtitle{
+  text-align: left !important;
+}
+ 
+.board_image + header + .banner{
+  width: 100% !important;
+  float: left !important;
+  margin-top: 0 !important;
+  margin-left: 0 !important;
+  padding: 0.5em 0 !important;
+  background-color: #666 !important;
+}
+ 
+form[name=post]{
+  box-sizing: border-box !important;
+  position: fixed !important;
+  bottom: 0 !important;
+  right: 0 !important;
+  background: #fff !important;
+  margin-bottom: 0 !important;
+  padding: 1em !important;
+  box-shadow: 0 0 5px rgba(0, 0, 0, 0.3) !important;
+}
+ 
+form[name=post] input[type="text"],
+form[name=post] textarea{
+  width: 100% !important;
+  padding: 0.5em !important;
+  box-sizing: border-box !important;
+}
+ 
+form table tr th{
+  color: #fff !important;
+  background: #222 !important;
+}
+ 
+#expand-all-images,
+#shrink-all-images,
+#treeview{
+  right: 1em !important;
+  position: absolute !important;
+}
+ 
+#expand-all-images{
+  margin-top: 4em !important;
+}
+ 
+#treeview{
+  margin-top: 5em !important;
+}
+ 
+#shrink-all-images{
+  margin-top: 6em !important;
+}
+ 
+#expand-all-images + hr,
+#shrink-all-images + hr{
+  opacity: 0 !important;
+  margin: 0 !important;
+}
+ 
+#treeview + hr{
+  opacity: 0 !important;
+  clear: both !important;
+}
+ 
+#options_handler{
+  margin-top: 3em !important;
+}
+ 
+[id^=thread]{
+  background: #f8f8f8 !important;
+  margin-bottom: 1em !important;
+  padding: 1em 1em 0 1em !important;
+  border: none !important;
+  box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2) !important;
+}
+ 
+[id^=thread] hr{
+  display: none !important;
+}
+ 
+[id^=thread] div.post.reply {
+  margin: 0.5em 1em !important;
+  padding: 0.5em !important;
+  color: #222 !important;
+  background: #fff !important;
+  border: none !important;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3) !important;
+}
+ 
+[id^=thread] div.post.reply.highlighted {
+  background: #fec !important;
+}
+ 
+p.intro.thread-hidden{
+  padding-bottom: 1em !important;
+}
+ 
+#vechan-reply,
+#update_thread{
+  float: right;
+  margin-right: 0.25em !important;
+  cursor: pointer !important;
+}
+ 
+#update_thread{
+  padding-left: 0 !important;
+}
+ 
+#update_secs{
+  color: #900 !important;
+}
+ 
+.theme-catalog header{
+  margin-top: 4em !important;
+}
+ 
+.theme-catalog div.threads{
+  text-align: left !important;
+}
+ 
+.theme-catalog div.thread{
+  color: #222 !important;
+  word-break: break-all !important;
+  background: #fff !important;
+  border: none !important;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3) !important;
+}
+ 
+.boardlist.bottom,
+.sub[data-description='1'],
+.sub[data-description='2'],
+.sub[data-description='3'],
+#quick-reply{
+  display: none !important;
+}
+ 
+#favorite-star{
+  text-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) !important;
+}
+ 
+pre.prettyprint.prettyprinted{
+  display: block !important;
+  overflow-x: scroll !important;
+}
+ 
+/* If you want to make a redistributable style, be sure to have a Yotsuba B theme selected. */