fix #1720

diff --git a/public/css/gogs.css b/public/css/gogs.css
index a65588ec38207be6bcfd054bf6d119218ba6c901..ff1aaba7ea538de19d3534dfb342d7be5e83dc91 100755 (executable)
--- a/public/css/gogs.css
+++ b/public/css/gogs.css
@@ -1908,8 +1908,8 @@ footer .container .links > *:first-child {
   padding: 5px 5px 0 5px;
 }
 .repository.file.list #file-content .code-view * {
-  font-size: 13px;
-  font-family: monospace;
+  font-size: 12px;
+  font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
   line-height: 20px;
 }
 .repository.file.list #file-content .code-view table {
@@ -1923,7 +1923,6 @@ footer .container .links > *:first-child {
   width: 1%;
 }
 .repository.file.list #file-content .code-view .lines-num span {
-  font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
   line-height: 20px;
   padding: 0 10px;
   cursor: pointer;
@@ -2322,7 +2321,7 @@ footer .container .links > *:first-child {
 }
 .repository .diff-file-box .file-body.file-code .lines-num {
   text-align: right;
-  color: #999;
+  color: #A7A7A7;
   background: #fafafa;
   width: 1%;
 }
@@ -2330,15 +2329,15 @@ footer .container .links > *:first-child {
   border-right: 1px solid #DDD;
 }
 .repository .diff-file-box .code-diff {
-  font-size: 13px;
+  font-size: 12px;
 }
 .repository .diff-file-box .code-diff td {
   padding: 0;
+  padding-left: 10px;
   border-top: none;
 }
 .repository .diff-file-box .code-diff pre {
   margin: 0;
-  font-size: 13px;
 }
 .repository .diff-file-box .code-diff .lines-num {
   border-right: 1px solid #d4d4d5;
@@ -2346,25 +2345,20 @@ footer .container .links > *:first-child {
 }
 .repository .diff-file-box .code-diff tbody tr.tag-code td,
 .repository .diff-file-box .code-diff tbody tr.tag-code pre {
-  background-color: #E0E0E0 !important;
-  border-color: #ADADAD!important;
+  background-color: #F0F0F0 !important;
+  border-color: #D2CECE!important;
+  padding-top: 4px;
+  padding-bottom: 4px;
 }
 .repository .diff-file-box .code-diff tbody tr.del-code td,
 .repository .diff-file-box .code-diff tbody tr.del-code pre {
-  background-color: #ffe2dd !important;
-  border-color: #e9aeae !important;
+  background-color: #ffecec !important;
+  border-color: #f1c0c0 !important;
 }
 .repository .diff-file-box .code-diff tbody tr.add-code td,
 .repository .diff-file-box .code-diff tbody tr.add-code pre {
-  background-color: #d1ffd6 !important;
-  border-color: #b4e2b4 !important;
-}
-.repository .diff-file-box .code-diff tbody tr:hover td {
-  background-color: #FFF8D2 !important;
-  border-color: #F0DB88 !important;
-}
-.repository .diff-file-box .code-diff tbody tr:hover pre {
-  background-color: transparent !important;
+  background-color: #eaffea !important;
+  border-color: #c1e9c1 !important;
 }
 .repository .diff-file-box.file-content img {
   max-width: 100%;

diff --git a/public/less/_repository.less b/public/less/_repository.less
index 7f12f05deab2bb65fd3d7e78bfd06ac3d1cd0a5c..2b413f0975ecf0ff3a9e5f859451066e80c5896b 100644 (file)
--- a/public/less/_repository.less
+++ b/public/less/_repository.less
@@ -190,8 +190,8 @@
 
                        .code-view {
                                * {
-                                       font-size: 13px;
-                                       font-family: monospace;
+                                       font-size: 12px;
+                                       font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
                                        line-height: 20px;
                                }
 
@@ -206,7 +206,6 @@
                                        width: 1%;
 
                                        span {
-                                               font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
                                                line-height: 20px;
                                                padding: 0 10px;
                                                cursor: pointer;
@@ -666,7 +665,7 @@
                .file-body.file-code {
                        .lines-num {
                                text-align: right;
-                               color: #999;
+                               color: #A7A7A7;
                                background: #fafafa;
                                width: 1%;
                        }
@@ -675,15 +674,15 @@
                        }
                }
                .code-diff {
-                       font-size: 13px;
+                       font-size: 12px;
 
                        td {
                                padding: 0;
+                               padding-left: 10px;
                                border-top: none;
                        }
                        pre {
                                margin: 0;
-                               font-size: 13px;
                        }
                        .lines-num {
                                border-right: 1px solid #d4d4d5;
@@ -691,10 +690,13 @@
                        }
                        tbody {
                                tr {
+
                                        &.tag-code {
                                                td, pre {
-                                                       background-color: #E0E0E0 !important;
-                                                       border-color: #ADADAD!important;
+                                                       background-color: #F0F0F0 !important;
+                                                       border-color: #D2CECE!important;
+                                                       padding-top: 4px;
+                                                       padding-bottom: 4px;
                                                }
                                                // td.selected-line, td.selected-line pre {
                                                //      background-color: #ffffdd !important;
@@ -707,8 +709,8 @@
                                        // }
                                        &.del-code {
                                                td, pre {
-                                                       background-color: #ffe2dd !important;
-                                                       border-color: #e9aeae !important;
+                                                       background-color: #ffecec !important;
+                                           border-color: #f1c0c0 !important;
                                                }
                                                // td.selected-line, td.selected-line pre {
                                                //      background-color: #ffffdd !important;
@@ -716,22 +718,13 @@
                                        }
                                        &.add-code {
                                                td, pre {
-                                                       background-color: #d1ffd6 !important;
-                                                       border-color: #b4e2b4 !important;
+                                                       background-color: #eaffea !important;
+                                                       border-color: #c1e9c1 !important;
                                                }
                                                // td.selected-line, td.selected-line pre {
                                                //      background-color: #ffffdd !important;
                                                // }
                                        }
-                                       &:hover {
-                                               td {
-                                                       background-color: #FFF8D2 !important;
-                                                       border-color: #F0DB88 !important;
-                                               }
-                                               pre {
-                                                       background-color: transparent !important;
-                                               }
-                                       }
                                }
                        }
                }