From 7277a3434f91122729a3152a89495d15ef565bc5 Mon Sep 17 00:00:00 2001
From: Yukimi Kazari <divine-exseed-freya-megna@live.com>
Date: Wed, 25 Jan 2017 06:42:14 -0500
Subject: [PATCH] Revert "Merge branch 'testing' into 'master'"

This reverts commit 04c65079d2ae6a4e1787cc90e1177bacbf531d46
---
 app/views/post/show_partials/_statistics_panel.php     | 10 ++++------
 .../application-0b1f0761b0f488c409a80b516518e0e1.css   |  4 ++--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/views/post/show_partials/_statistics_panel.php b/app/views/post/show_partials/_statistics_panel.php
index 14e721b..c502589 100755
--- a/app/views/post/show_partials/_statistics_panel.php
+++ b/app/views/post/show_partials/_statistics_panel.php
@@ -1,12 +1,9 @@
 <div id="stats" class="vote-container">
   <ul>
-    <li><?= $this->t('.id') ?>: <?= $this->post->id ?></li>
-	<?php if ($this->post->image()) : ?>
-      <div style="width: 25em; height: <?= max($this->user->avatar_height, 80) ?>px; position: relative;">
-		<div style="position: absolute; bottom: 0;">
-      <?= $this->avatar($this->user, 1) ?>
-    </div>
+    <?php if ($this->post->user->has_avatar()) : ?>
+      <li><?= $this->avatar($this->post->user, 1) ?></li>
     <?php endif ?>
+	<li><?= $this->t('.id') ?>: <?= $this->post->id ?></li>
     <li><?= $this->t('.posted') ?>: <?= $this->t(['.posted_data_html', 'time' => $this->linkTo($this->t(['time.x_ago', 't' => $this->timeAgoInWords($this->post->created_at)]), ["#index", 'tags' => "date:" . substr($this->post->created_at, 0, 10)], ['title' => substr(date('r', strtotime($this->post->created_at)), 0, -6)]), 'user' => $this->linkToIf($this->post->user_id, $this->post->author(), ['user#show', 'id' => $this->post->user_id])]) ?></li>
     <?php if (current_user()->is_admin() && $this->post->approver) : ?>
       <li><?= $this->t('.approver') ?>: <?= $this->post->approver->name ?></li>
@@ -44,3 +41,4 @@
   Post.init_add_to_favs(<?= $this->post->id ?>, $("add-to-favs"), $("remove-from-favs"));
 </script>
 <?php }) ?>
+
diff --git a/public/assets/application-0b1f0761b0f488c409a80b516518e0e1.css b/public/assets/application-0b1f0761b0f488c409a80b516518e0e1.css
index 74f09c5..7bb27f8 100644
--- a/public/assets/application-0b1f0761b0f488c409a80b516518e0e1.css
+++ b/public/assets/application-0b1f0761b0f488c409a80b516518e0e1.css
@@ -649,7 +649,7 @@ div#post-view>div#right-col>div>div#note-container>div.note-box{background:#FFE;
 div#post-view>div#right-col>div>div#note-container>div.note-box>div.note-corner{background:black;bottom:0;cursor:se-resize;height:7px;position:absolute;right:0;width:7px}
 div#post-view>div#right-col>div>div#note-container>div.unsaved{background:#FFF;border:1px solid red}
 div#post-view>div#right-col>div>div#note-container>div.unsaved>div.note-corner{background:red}
-div#post-view>div#right-col>div>img{margin-right:5em;border:1px solid rgba(109, 0, 0, 0.54);}
+div#post-view>div#right-col>div>img{margin-right:5em}
 div#post-view>div#right-col>div#edit{margin-bottom:2em;padding:1em}
 div.quote>a{color:#581a21}
 div#related{margin:0 3em 1em 0}
@@ -671,7 +671,7 @@ div#static-index>div#links>a{margin:0 .5em}
 div#static-more>div{float:left;width:25%}
 div#static-more>div>ul{margin-top:2em}
 div#static-more>div>ul>li{list-style-type:none;margin:0}
-div.status-notice{background:black;border:2px solid #BF5050;margin:0 0 .5em;padding:5px 10px 5px 10px}
+div.status-notice{background:black;border:2px solid #BF5050;margin:0 0 .5em;padding:.5em}
 div.status-notice p{margin:0}
 div#tag-list{margin-bottom:2em;text-align:center}
 div#tag-list>a{padding-right:5px}