Add latest changes from gitlab-org/gitlab@master

7 files changed, 9 insertions, 31 deletions

diff --git a/app/assets/stylesheets/highlight/common.scss b/app/assets/stylesheets/highlight/common.scss
index bdeac7e97c0..95f6fb8c333 100644
--- a/app/assets/stylesheets/highlight/common.scss
+++ b/app/assets/stylesheets/highlight/common.scss
@@ -29,3 +29,12 @@
     color: $link;
   }
 }
+
+// Links to URLs, emails, or dependencies
+.code .line a {
+  color: inherit;
+
+  &:hover {
+    text-decoration: underline;
+  }
+}
diff --git a/app/assets/stylesheets/highlight/themes/dark.scss b/app/assets/stylesheets/highlight/themes/dark.scss
index cbce0ba3f1e..16e6824baf8 100644
--- a/app/assets/stylesheets/highlight/themes/dark.scss
+++ b/app/assets/stylesheets/highlight/themes/dark.scss
@@ -193,11 +193,6 @@ $dark-il: #de935f;
     color: $dark-highlight-color !important;
   }
 
-  // Links to URLs, emails, or dependencies
-  .line a {
-    color: $dark-na;
-  }
-
   .hll { background-color: $dark-hll-bg; }
   .c { color: $dark-c; } /* Comment */
   .err { color: $dark-err; } /* Error */
diff --git a/app/assets/stylesheets/highlight/themes/monokai.scss b/app/assets/stylesheets/highlight/themes/monokai.scss
index 1b61ffa37e3..cfbb7a1db94 100644
--- a/app/assets/stylesheets/highlight/themes/monokai.scss
+++ b/app/assets/stylesheets/highlight/themes/monokai.scss
@@ -193,11 +193,6 @@ $monokai-gi: #a6e22e;
     color: $black !important;
   }
 
-  // Links to URLs, emails, or dependencies
-  .line a {
-    color: $monokai-k;
-  }
-
   .hll { background-color: $monokai-hll; }
   .c { color: $monokai-c; } /* Comment */
   .err { color: $monokai-err-color; background-color: $monokai-err-bg; } /* Error */
diff --git a/app/assets/stylesheets/highlight/themes/none.scss b/app/assets/stylesheets/highlight/themes/none.scss
index a7ede266fb5..a099563542d 100644
--- a/app/assets/stylesheets/highlight/themes/none.scss
+++ b/app/assets/stylesheets/highlight/themes/none.scss
@@ -143,12 +143,6 @@
     background-color: $white-normal;
   }
 
-    // Links to URLs, emails, or dependencies
-  .line a {
-    color: $gl-text-color;
-    text-decoration: underline;
-  }
-
   .hll { background-color: $white-light; }
 
   .gd {
diff --git a/app/assets/stylesheets/highlight/themes/solarized-dark.scss b/app/assets/stylesheets/highlight/themes/solarized-dark.scss
index 6569f3abc8b..d74d5c6ebda 100644
--- a/app/assets/stylesheets/highlight/themes/solarized-dark.scss
+++ b/app/assets/stylesheets/highlight/themes/solarized-dark.scss
@@ -196,11 +196,6 @@ $solarized-dark-il: #2aa198;
     background-color: $solarized-dark-highlight !important;
   }
 
-  // Links to URLs, emails, or dependencies
-  .line a {
-    color: $solarized-dark-kd;
-  }
-
   /* Solarized Dark
 
   For use with Jekyll and Pygments
diff --git a/app/assets/stylesheets/highlight/themes/solarized-light.scss b/app/assets/stylesheets/highlight/themes/solarized-light.scss
index 4e74a9ea50a..d995c5bba1f 100644
--- a/app/assets/stylesheets/highlight/themes/solarized-light.scss
+++ b/app/assets/stylesheets/highlight/themes/solarized-light.scss
@@ -204,11 +204,6 @@ $solarized-light-il: #2aa198;
     background-color: $solarized-light-highlight !important;
   }
 
-  // Links to URLs, emails, or dependencies
-  .line a {
-    color: $solarized-light-kd;
-  }
-
   /* Solarized Light
 
   For use with Jekyll and Pygments
diff --git a/app/assets/stylesheets/highlight/white_base.scss b/app/assets/stylesheets/highlight/white_base.scss
index 973f94c63aa..c58cf89f0ca 100644
--- a/app/assets/stylesheets/highlight/white_base.scss
+++ b/app/assets/stylesheets/highlight/white_base.scss
@@ -209,11 +209,6 @@ span.highlight_word {
   background-color: $white-highlight !important;
 }
 
-// Links to URLs, emails, or dependencies
-.line a {
-  color: $white-nb;
-}
-
 .hll { background-color: $white-hll-bg; }
 
 .c { color: $white-c;