From db48131ce43d3d52c20cd964c14ec99340f85222 Mon Sep 17 00:00:00 2001
From: wyd621 <wyd621@163.com>
Date: Tue, 11 Mar 2014 08:34:45 +0000
Subject: [PATCH]  * finish task #1823.

---
 module/common/view/m.footer.html.php | 4 ++++
 www/theme/default/style.css          | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/module/common/view/m.footer.html.php b/module/common/view/m.footer.html.php
index d8d3fb1cad..49eab793c5 100755
--- a/module/common/view/m.footer.html.php
+++ b/module/common/view/m.footer.html.php
@@ -10,6 +10,10 @@ $extHookFiles = glob($extHookRule);
 if($extHookFiles) foreach($extHookFiles as $extHookFile) include $extHookFile;
 ?>
 <?php if($this->server->HTTP_X_PJAX == false):?>
+<script>
+/* May be fix bug #576. */
+$(function(){$("#main").css('padding-top', $("div[data-role='header']").height() + 'px')})
+</script>
 </div>
 </body>
 </html>
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index e74c6b4cce..cf2da4544d 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -117,14 +117,14 @@ i[class^="icon-"],i[class*=" icon-"],.link-icon i[class^="icon-"],.link-icon i[c
 
 i[class^="icon-"].disabled,i[class*=" icon-"].disabled,i[class^="icon-"].disabled:hover,i[class*=" icon-"].disabled:hover,i[class^="icon-"].disabled:before,i[class*=" icon-"].disabled:before{color: #ccc;}
 
-.change-show,.change-hide,.log-desc,.log-asc,.diff-all,.diff-sort{display: inline-block; font-family: FontAwesome;border: 1px solid #555;color: #555; font-size: 13px;font-weight: lighter; width: 14px;height: 13px;line-height: 13px;text-align: center;}
-.change-show:hover,.change-hide:hover,.log-desc:hover,.log-asc:hover,.diff-all:hover,.diff-sort:hover{background-color: #333;color: #fff}
+.change-show,.change-hide,.log-desc,.log-asc,.diff-all,.diff-short{display: inline-block; font-family: FontAwesome;border: 1px solid #555;color: #555; font-size: 13px;font-weight: lighter; width: 14px;height: 13px;line-height: 13px;text-align: center;}
+.change-show:hover,.change-hide:hover,.log-desc:hover,.log-asc:hover,.diff-all:hover,.diff-short:hover{background-color: #333;color: #fff}
 .change-show:before{content: "\f067";}
 .change-hide:before{content: "\f068";}
 .log-desc:before{content: "\f063";}
 .log-asc:before{content: "\f062";}
 .diff-all:before{content: "\f0b2";}
-.diff-sort:before{content: "\f036";}
+.diff-short:before{content: "\f036";}
 
 /* zenicon */
 @font-face {font-family: 'zenicon';src:url('../fontawesome/font/zenicon.eot');src:url('../fontawesome/font/zenicon.eot?#iefix') format('embedded-opentype'),url('../fontawesome/font/zenicon.ttf') format('truetype'),url('../fontawesome/font/zenicon.woff') format('woff'),url('../fontawesome/font/zenicon.svg#zenicon') format('svg');font-weight: normal;font-style: normal;}