Fix CSS for code highlighting

3 files changed, 12 insertions, 8 deletions

diff --git a/app/assets/stylesheets/gitlab_bootstrap/files.scss b/app/assets/stylesheets/gitlab_bootstrap/files.scss
index 4887d1c9402..e4a36148e18 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/files.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/files.scss
@@ -95,8 +95,8 @@
         pre {
           padding:0;
           margin:0;
-          background:none;
           border:none;
+          border-radius: 0;
         }
       }
     }
@@ -142,8 +142,8 @@
         table-layout: fixed;
 
         pre {
-          background: none;
           border: none;
+          border-radius: 0;
           font-family: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono','lucida console',monospace;
           font-size: 12px !important;
           line-height: 16px !important;
diff --git a/app/assets/stylesheets/highlight/dark.scss b/app/assets/stylesheets/highlight/dark.scss
index 0996cc772f4..398d81456f6 100644
--- a/app/assets/stylesheets/highlight/dark.scss
+++ b/app/assets/stylesheets/highlight/dark.scss
@@ -1,6 +1,8 @@
-.black .lines .highlight {
-  background: #333;
-  pre { color: #eee; }
+.black .highlight {
+  pre {
+    background-color: #333;
+    color: #eee;
+  }
 
   .hll { display: block; background-color: darken($hover, 65%) }
   .c { color: #888888; font-style: italic } /* Comment */
diff --git a/app/assets/stylesheets/highlight/white.scss b/app/assets/stylesheets/highlight/white.scss
index d6792b37e9c..2a43e9f6b65 100644
--- a/app/assets/stylesheets/highlight/white.scss
+++ b/app/assets/stylesheets/highlight/white.scss
@@ -1,6 +1,8 @@
-.white .lines .highlight {
-  background: white;
-  pre { color: #333; }
+.white .highlight {
+  pre {
+    background-color: #fff;
+    color: #333;
+  }
 
   .hll { display: block; background-color: $hover }
   .c { color: #888888; font-style: italic } /* Comment */