Fix global search result CSS, misc CSS tweaks (#7789)

- Fixes double line-numbers and padding in Explore > Code > Search
- Moved code-view specific CSS out of their parents to share those
styles better.
- Fix misc issues discovered in code,diff and blame view, especially for
the dark theme.

3 files changed, 150 insertions, 179 deletions

diff --git a/public/less/_base.less b/public/less/_base.less
index 24b3e3c9c9..d961e18c37 100644
--- a/public/less/_base.less
+++ b/public/less/_base.less
@@ -910,3 +910,112 @@ footer {
         }
     }
 }
+
+.lines-num {
+    vertical-align: top;
+    text-align: right !important;
+    color: #999999;
+    background: #f5f5f5;
+    width: 1%;
+    user-select: none;
+
+    span {
+        line-height: 20px !important;
+        padding: 0 10px;
+        cursor: pointer;
+        display: block;
+    }
+}
+
+.lines-num,
+.lines-code {
+    padding: 0 !important;
+
+    pre,
+    ol,
+    .hljs {
+        background-color: white;
+        margin: 0;
+        padding: 0 !important;
+
+        li {
+            display: block;
+            width: 100%;
+
+            &:before {
+                content: ' ';
+            }
+        }
+    }
+}
+
+.lines-commit {
+    vertical-align: top;
+    color: #999999;
+    padding: 0 !important;
+    background: #f5f5f5;
+    width: 1%;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    -webkit-user-select: none;
+    user-select: none;
+
+    .blame-info {
+        width: 350px;
+        max-width: 350px;
+        display: block;
+        user-select: none;
+        padding: 0 0 0 10px;
+
+        .blame-data {
+            display: flex;
+            font-family: @default-fonts;
+
+            .blame-message {
+                flex-grow: 2;
+                overflow: hidden;
+                white-space: nowrap;
+                text-overflow: ellipsis;
+                line-height: 20px;
+            }
+
+            .blame-time,
+            .blame-avatar {
+                flex-shrink: 0;
+            }
+        }
+    }
+
+    .ui.avatar.image {
+        height: 18px;
+        width: 18px;
+    }
+}
+
+.lines-num,
+.lines-code,
+.lines-commit {
+    .bottom-line {
+        border-bottom: 1px solid #eaecef;
+    }
+}
+
+.code-view {
+    overflow: auto;
+    overflow-x: auto;
+    overflow-y: hidden;
+
+    * {
+        font-size: 12px;
+        font-family: @monospaced-fonts, monospace;
+        line-height: 20px;
+    }
+
+    table {
+        width: 100%;
+    }
+
+    .active {
+        background: #fff866;
+    }
+}
diff --git a/public/less/_repository.less b/public/less/_repository.less
index 093f35f831..9b0b7fdce7 100644
--- a/public/less/_repository.less
+++ b/public/less/_repository.less
@@ -403,115 +403,6 @@
             pre {
                 overflow: auto;
             }
-
-            .code-view {
-                * {
-                    font-size: 12px;
-                    font-family: @monospaced-fonts, monospace;
-                    line-height: 20px;
-                }
-
-                table {
-                    width: 100%;
-                }
-
-                .lines-num {
-                    vertical-align: top;
-                    text-align: right;
-                    color: #999999;
-                    background: #f5f5f5;
-                    width: 1%;
-                    user-select: none;
-
-                    span {
-                        line-height: 20px;
-                        padding: 0 10px;
-                        cursor: pointer;
-                        display: block;
-                    }
-                }
-
-                .lines-num,
-                .lines-code {
-                    padding: 0;
-
-                    pre,
-                    ol,
-                    .hljs {
-                        background-color: white;
-                        margin: 0;
-                        padding: 0 !important;
-
-                        li {
-                            display: block;
-                            width: 100%;
-
-                            &.active {
-                                background: #ffffdd;
-                            }
-
-                            &:before {
-                                content: ' ';
-                            }
-                        }
-                    }
-                }
-
-                .lines-commit {
-                    vertical-align: top;
-                    color: #999999;
-                    padding: 0;
-                    background: #f5f5f5;
-                    width: 1%;
-                    -moz-user-select: none;
-                    -ms-user-select: none;
-                    -webkit-user-select: none;
-                    user-select: none;
-
-                    .blame-info {
-                        width: 350px;
-                        max-width: 350px;
-                        display: block;
-                        user-select: none;
-                        padding: 0 0 0 10px;
-
-                        .blame-data {
-                            display: flex;
-                            font-family: @default-fonts;
-
-                            .blame-message {
-                                flex-grow: 2;
-                                overflow: hidden;
-                                white-space: nowrap;
-                                text-overflow: ellipsis;
-                                line-height: 20px;
-                            }
-
-                            .blame-time,
-                            .blame-avatar {
-                                flex-shrink: 0;
-                            }
-                        }
-                    }
-
-                    .ui.avatar.image {
-                        height: 18px;
-                        width: 18px;
-                    }
-                }
-
-                .lines-num,
-                .lines-code,
-                .lines-commit {
-                    .bottom-line {
-                        border-bottom: 1px solid #eaecef;
-                    }
-                }
-
-                .active {
-                    background: #ffffdd;
-                }
-            }
         }
 
         .sidebar {
@@ -1420,7 +1311,7 @@
             font-size: 12px;
 
             td {
-                padding: 0 0 0 10px;
+                padding: 0 0 0 10px !important;
                 border-top: 0;
             }
 
@@ -1428,7 +1319,7 @@
                 border-color: #d4d4d5;
                 border-right-width: 1px;
                 border-right-style: solid;
-                padding: 0 5px;
+                padding: 0 5px !important;
             }
 
             tbody {
@@ -1438,23 +1329,6 @@
                         width: 49%;
                     }
 
-                    &.tag-code td,
-                    td.tag-code {
-                        background-color: #f0f0f0 !important;
-                        border-color: #d3cfcf !important;
-                        padding-top: 8px;
-                        padding-bottom: 8px;
-                        // td.selected-line, td.selected-line pre {
-                        //     background-color: #ffffdd !important;
-                        // }
-                    }
-
-                    // &.same-code {
-                    //     td.selected-line, td.selected-line pre {
-                    //         background-color: #ffffdd !important;
-                    //     }
-                    // }
-
                     .removed-code {
                         background-color: #ff9999;
                     }
@@ -1547,12 +1421,6 @@
         }
     }
 
-    .code-view {
-        overflow: auto;
-        overflow-x: auto;
-        overflow-y: hidden;
-    }
-
     .repo-search-result {
         padding-top: 10px;
         padding-bottom: 10px;
@@ -2408,3 +2276,11 @@ tbody.commit-list {
     border-left: 0 !important;
     margin: 0 !important;
 }
+
+.tag-code,
+.tag-code td {
+    background-color: #f0f0f0 !important;
+    border-color: #d3cfcf !important;
+    padding-top: 8px;
+    padding-bottom: 8px;
+}
diff --git a/public/less/themes/arc-green.less b/public/less/themes/arc-green.less
index 37911c186c..cff51f0908 100644
--- a/public/less/themes/arc-green.less
+++ b/public/less/themes/arc-green.less
@@ -7,11 +7,6 @@
     color: #bababa;
 }
 
-.repository.file.list .non-diff-file-content .code-view .lines-num,
-.repository.file.list .non-diff-file-content .code-view .lines-code ol {
-    background-color: #2b2b2b !important;
-}
-
 .hljs-strong,
 .hljs-emphasis {
     color: #a8a8a2;
@@ -498,12 +493,12 @@ a.ui.basic.green.label:hover {
 
 .ui.table {
     color: #a5a5a5 !important;
-    border: 1px solid #4c505c;
+    border-color: #4c505c;
     background: #353945;
 }
 
 .ui.table tbody tr {
-    border-bottom: 1px solid #333640;
+    border-color: #333640;
     background: #2a2e3a;
 }
 
@@ -714,19 +709,6 @@ a.ui.basic.green.label:hover {
     background-color: #3a523a;
 }
 
-.repository .diff-file-box .code-diff .lines-num {
-    border-right: 1px solid #2d2d2d;
-}
-
-.repository .diff-file-box .file-body.file-code .lines-num {
-    color: #9e9e9e;
-    background: #2e323e;
-}
-
-.repository .diff-file-box .file-body.file-code .lines-num-old {
-    border-right: 1px solid #2d2d2d;
-}
-
 .hljs-title,
 .hljs-section,
 .hljs-selector-id {
@@ -742,9 +724,10 @@ a.ui.basic.green.label:hover {
     background-color: #5f3737;
 }
 
-.repository .diff-file-box .code-diff tbody tr.tag-code td,
-.repository .diff-file-box .code-diff tbody tr td.tag-code {
-    background-color: #292727 !important;
+.tag-code,
+.tag-code td {
+    background: #242637 !important;
+    border-color: transparent !important;
 }
 
 .ui.vertical.menu .active.item {
@@ -1054,10 +1037,6 @@ input {
     color: #668cb1;
 }
 
-.repository.file.list #file-content .code-view .lines-num {
-    background: #2e323e;
-}
-
 .repository.file.list #repo-files-table tbody .octicon.octicon-file-directory,
 .repository.file.list #repo-files-table tbody .octicon.octicon-file-submodule {
     color: #7c9b5e;
@@ -1080,13 +1059,31 @@ input {
     color: #87ab63 !important;
 }
 
-.repository.file.list #file-content .code-view .lines-num pre,
-.repository.file.list #file-content .code-view .lines-code pre,
-.repository.file.list #file-content .code-view .lines-num ol,
-.repository.file.list #file-content .code-view .lines-code ol,
-.repository.file.list #file-content .code-view .lines-num .hljs,
-.repository.file.list #file-content .code-view .lines-code .hljs {
-    background-color: #2a2e3a;
+.lines-commit {
+    background: #2e323e !important;
+}
+
+.bottom-line {
+    border-color: #4e525e !important;
+}
+
+.lines-num {
+    background: #2e323e !important;
+    color: #9e9e9e !important;
+    border-color: #2d2d2d !important;
+}
+
+.lines-num pre,
+.lines-code pre,
+.lines-num ol,
+.lines-code ol,
+.lines-num .hljs,
+.lines-code .hljs {
+    background-color: #2a2e3a !important;
+}
+
+.code-view .active {
+    background: #554a00;
 }
 
 a.ui.label:hover,
@@ -1116,17 +1113,6 @@ a.ui.labels .label:hover {
     color: #87ab63 !important;
 }
 
-.repository.file.list #file-content .code-view {
-    .lines-num pre,
-    .lines-code pre,
-    .lines-num ol,
-    .lines-code ol,
-    .lines-num .hljs,
-    .hljs {
-        background-color: #2a2e3a;
-    }
-}
-
 .repository .diff-file-box .code-diff-split tbody tr.add-code td:nth-child(1),
 .repository .diff-file-box .code-diff-split tbody tr.add-code td:nth-child(2),
 .repository .diff-file-box .code-diff-split tbody tr.add-code td:nth-child(3),