Merge branch 'master' of github.com:vichan-devel/Tinyboard

Conflicts:
	inc/mod/pages.php

1 files changed, 2 insertions, 8 deletions

diff --git a/stylesheets/style.css b/stylesheets/style.css
index 58e3f4ba..664bf717 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -145,13 +145,13 @@ img.banner, img.board_image {
 	border: 1px solid #a9a9a9;
 	margin: 12px auto 0 auto;
 }
-img.post-image {
+.post-image {
 	display: block;
 	float: left;
 	margin: 10px 20px;
 	border: none;
 }
-div.post img.post-image {
+div.post .post-image {
 	padding: 5px;
 	margin: 5px 20px 0 0;
 }
@@ -623,12 +623,6 @@ form.ban-appeal textarea {
 }
 
 /* Containerchan */
-    video.post-image {
-        display: block;
-        float: left;
-        margin: 10px 20px;
-        border: none;
-    }
     div.post video.post-image {
         padding: 0px;
         margin: 10px 25px 5px 5px;