Page: Compare 2 commits

3 files changed, 139 insertions, 26 deletions

diff --git a/public/ng/less/gogs/base.less b/public/ng/less/gogs/base.less
index de1781a449..a3a7c2ffe5 100644
--- a/public/ng/less/gogs/base.less
+++ b/public/ng/less/gogs/base.less
@@ -291,4 +291,8 @@ clear: both;
     li {
         display: inline;
     }
+}
+.list-unstyled {
+    padding-left: 0;
+    list-style: none;
 }
\ No newline at end of file
diff --git a/public/ng/less/gogs/repository.less b/public/ng/less/gogs/repository.less
index daa8983bcb..717c0d0e8e 100644
--- a/public/ng/less/gogs/repository.less
+++ b/public/ng/less/gogs/repository.less
@@ -494,37 +494,138 @@
   }
 }
 .repo-user-list-block {
-  position: relative;
-  top: 5px;
+    position: relative;
+    top: 5px;
 }
 .setting-list {
-  width: 100%;
-  list-style: none;
+    width: 100%;
+    list-style: none;
 }
 #commits-list {
-  padding-top: 20px;
-  h4{
-    line-height: 30px;
-    margin-bottom: 0;
-  }
+    padding-top: 20px;
+    h4{
+        line-height: 30px;
+        margin-bottom: 0;
+    }
 }
 .commit-list {
-  th {
-    background-color: #FFF;
-    line-height: 28px !important;
-  }
-  .date {
-    width: 120px;
-  }
-  .author {
-    padding-left: 20px;
-    min-width: 180px;
-    img {
-      margin-top: -4px;
+    th {
+        background-color: #FFF;
+        line-height: 28px !important;
+    }
+    .date {
+        width: 120px;
+    }
+    .author {
+        padding-left: 20px;
+        min-width: 180px;
+        img {
+            margin-top: -4px;
+        }
+    }
+    .sha a {
+        font-family: Consolas, Menlo, Monaco, "Lucida Console", monospace;
+        font-size: 14px;
+    }
+}
+.diff-head-box {
+    margin-top: 10px;
+    .panel-body {
+        padding: 10px 15px 5px 10px;
+    }
+    .author {
+        img {
+            margin-top: -7px;
+        }
+    }
+}
+.diff-detail-box {
+    margin: 15px 0;
+    line-height: 30px;
+    ol {
+        clear: both;
+        padding-left: 0;
+        margin-bottom: 28px;
+        li {
+            list-style: none;
+            padding-bottom: 4px;
+            margin-bottom: 4px;
+            border-bottom: 1px dashed #DDD;
+            padding-left: 6px;
+        }
+    }
+    span.status{
+        display: inline-block;
+        width: 12px;
+        height: 12px;
+        margin-right: 8px;
+        vertical-align: middle;
+        &.modify {
+            background-color: #f0db88;
+        }
+        &.add {
+            background-color: #b4e2b4;
+        }
+        &.del {
+            background-color: #e9aeae;
+        }
+        &.rename {
+            background-color: #dad8ff;
+        }
+    }
+}
+.diff-box {
+    .count {
+        margin-right: 12px;
+        .bar {
+            background-color: #e75316;
+            height: 12px;
+            width: 40px;
+            display: inline-block;
+            margin: 2px 4px 0 4px;
+            vertical-align: text-top;
+            .add {
+                background-color: #77c64a;
+                height: 12px;
+            }
+        }
+    }
+    .file {
+        color: #888;
+    }
+    .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 {
+        padding: 0 15px 15px 15px;
     }
-  }
-  .sha a {
-    font-family: Consolas, Menlo, Monaco, "Lucida Console", monospace;
-    font-size: 14px;
-  }
 }
\ No newline at end of file
diff --git a/public/ng/less/ui/panel.less b/public/ng/less/ui/panel.less
index c4bba16e24..929de21ec8 100644
--- a/public/ng/less/ui/panel.less
+++ b/public/ng/less/ui/panel.less
@@ -36,6 +36,14 @@
           border-bottom-right-radius: .3em;
         }
     }
+    &.panel-info {
+        border-color: #85c5e5;
+        > .panel-header {
+            color: #31708f;
+            background-color: #d9edf7;
+            border-color: #85c5e5;
+        }
+    }
     &.panel-warning {
         border-color: #F0C36D;
         > .panel-header {