Merge remote-tracking branch 'upstream/dev'

Conflicts:
	models/repo.go

2 files changed, 125 insertions, 4 deletions

diff --git a/public/ng/css/gogs.css b/public/ng/css/gogs.css
index feb21c97..52a503cc 100644
--- a/public/ng/css/gogs.css
+++ b/public/ng/css/gogs.css
@@ -88,6 +88,7 @@ img.avatar-100 {
   z-index: 100;
   font-size: 12px;
   width: 120%;
+  min-width: 100px;
 }
 #footer-lang .drop-down li > a {
   padding: 3px 9px;
@@ -270,6 +271,10 @@ img.avatar-100 {
 .pagination li {
   display: inline;
 }
+.list-unstyled {
+  padding-left: 0;
+  list-style: none;
+}
 .markdown {
   background-color: white;
   font-size: 16px;
@@ -1397,12 +1402,10 @@ The register and sign-in page style
 }
 .code-view .lines-num span {
   font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
-  line-height: 18px;
-  padding: 0 8px 0 10px;
+  line-height: 1.6;
+  padding: 0 10px;
   cursor: pointer;
   display: block;
-  margin-top: 2px;
-  font-size: 12px;
 }
 .code-view .lines-code > pre {
   border: none;
@@ -1486,6 +1489,106 @@ The register and sign-in page style
   font-family: Consolas, Menlo, Monaco, "Lucida Console", monospace;
   font-size: 14px;
 }
+.diff-head-box {
+  margin-top: 10px;
+}
+.diff-head-box .panel-body {
+  padding: 10px 15px 5px 10px;
+}
+.diff-head-box .author img {
+  margin-top: -7px;
+}
+.diff-detail-box {
+  margin: 15px 0;
+  line-height: 30px;
+}
+.diff-detail-box ol {
+  clear: both;
+  padding-left: 0;
+  margin-bottom: 28px;
+}
+.diff-detail-box ol li {
+  list-style: none;
+  padding-bottom: 4px;
+  margin-bottom: 4px;
+  border-bottom: 1px dashed #DDD;
+  padding-left: 6px;
+}
+.diff-detail-box span.status {
+  display: inline-block;
+  width: 12px;
+  height: 12px;
+  margin-right: 8px;
+  vertical-align: middle;
+}
+.diff-detail-box span.status.modify {
+  background-color: #f0db88;
+}
+.diff-detail-box span.status.add {
+  background-color: #b4e2b4;
+}
+.diff-detail-box span.status.del {
+  background-color: #e9aeae;
+}
+.diff-detail-box span.status.rename {
+  background-color: #dad8ff;
+}
+.diff-box .count {
+  margin-right: 12px;
+}
+.diff-box .count .bar {
+  background-color: #e75316;
+  height: 12px;
+  width: 40px;
+  display: inline-block;
+  margin: 2px 4px 0 4px;
+  vertical-align: text-top;
+}
+.diff-box .count .bar .add {
+  background-color: #77c64a;
+  height: 12px;
+}
+.diff-box .file {
+  color: #888;
+}
+.diff-box .panel-header {
+  font-size: 14px;
+}
+.diff-file-box .code-diff tbody tr:hover td,
+.diff-file-box .code-diff tbody tr:hover pre {
+  background-color: #FFF8D2 !important;
+  border-color: #F0DB88 !important;
+}
+.diff-file-box .file-body.file-code .lines-num-old {
+  border-right: 1px solid #DDD;
+}
+.file-content .file-body.file-code .lines-num {
+  text-align: right;
+  color: #999;
+  background: #fafafa;
+  width: 1%;
+}
+.diff-file-box .code-diff tbody tr.tag-code td,
+.diff-file-box .code-diff tbody tr.tag-code pre {
+  background-color: #E0E0E0 !important;
+  border-color: #ADADAD !important;
+}
+.diff-file-box .code-diff tbody tr.del-code td,
+.diff-file-box .code-diff tbody tr.del-code pre {
+  background-color: #ffe2dd !important;
+  border-color: #e9aeae !important;
+}
+.diff-file-box .code-diff tbody tr.add-code td,
+.diff-file-box .code-diff tbody tr.add-code pre {
+  background-color: #d1ffd6 !important;
+  border-color: #b4e2b4 !important;
+}
+.compare-head-box {
+  margin-top: 10px;
+}
+.compare-head-box .compare {
+  padding: 0 15px 15px 15px;
+}
 #admin-wrapper,
 #setting-wrapper {
   padding-bottom: 100px;
diff --git a/public/ng/css/ui.css b/public/ng/css/ui.css
index 9c3c8ded..e659180d 100644
--- a/public/ng/css/ui.css
+++ b/public/ng/css/ui.css
@@ -366,6 +366,9 @@ dt {
 .grid-4-5 {
   width: 80%;
 }
+.btn {
+  white-space: nowrap;
+}
 .btn-small {
   font-size: 10.8px;
   padding: .4em .9em;
@@ -457,6 +460,9 @@ dt {
   box-sizing: content-box;
   text-align: center;
 }
+.btn-comb {
+  margin-left: -1px;
+}
 .btn-disabled {
   opacity: .6;
   cursor: not-allowed;
@@ -480,6 +486,10 @@ dt {
 .ipt-large {
   font-size: 14.4px;
 }
+.ipt-textarea {
+  height: auto !important;
+  width: auto;
+}
 .ipt-disabled,
 input[disabled] {
   background-color: #f2f2f2 !important;
@@ -709,6 +719,14 @@ ul.menu-radius > li:last-child > a {
   border-bottom-left-radius: .3em;
   border-bottom-right-radius: .3em;
 }
+.panel.panel-info {
+  border-color: #85c5e5;
+}
+.panel.panel-info > .panel-header {
+  color: #31708f;
+  background-color: #d9edf7;
+  border-color: #85c5e5;
+}
 .panel.panel-warning {
   border-color: #F0C36D;
 }