From: slene <vslene@gmail.com>
Date: Thu, 20 Mar 2014 13:02:52 +0000 (+0800)
Subject: Merge branch 'master' of github.com:gogits/gogs
X-Git-Tag: v0.9.99~2367^2~32
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c6bd723ce17ae3c0495f84e46a9296b30db5aee1;p=gitea.git

Merge branch 'master' of github.com:gogits/gogs

Conflicts:
	public/js/app.js
---

c6bd723ce17ae3c0495f84e46a9296b30db5aee1
diff --cc public/css/gogs.css
index 83d1b96fe2,d2ba5b9a43..eb5f7ad2a5
--- a/public/css/gogs.css
+++ b/public/css/gogs.css
@@@ -644,17 -644,21 +644,29 @@@ html, body 
  }
  
  .file-content .file-body {
-     padding: 30px 30px 50px;
+     padding: 0;
+     border: none;
+     background-color: #FFF;
+ }
+ 
+ .file-content .file-body pre {
+     background-color: #FFF;
+     border: none;
+ }
+ 
+ .file-content .markdown > pre > ol.linenums > li:first-child {
+     padding-top: 0;
+     margin-top: 0;
  }
  
 +.file-content .file-body.file-code {
 +    padding: 0;
 +}
 +
 +.file-content .file-body.file-code > pre {
 +    border: none;
 +}
 +
  .branch-list th, .commit-list th {
      background-color: #FFF;
      line-height: 28px !important;