summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-02-27 10:50:15 +0000
committerPhil Hughes <me@iamphill.com>2017-02-27 10:50:15 +0000
commitf0e51180de11b3fd2974f4e3bda0306fc25abb0d (patch)
treeb4fd8223a6e73b4b45e0bd62b2a9929c1aef2c88
parentfaf5bc0eafd6d77cdd924bbf5d2e93ce18d3a62a (diff)
downloadgitlab-ce-f0e51180de11b3fd2974f4e3bda0306fc25abb0d.tar.gz
Removed link transitionmr-diff-comment-button
Fixed hll overriding is-over class
-rw-r--r--app/assets/stylesheets/highlight/dark.scss3
-rw-r--r--app/assets/stylesheets/highlight/monokai.scss3
-rw-r--r--app/assets/stylesheets/highlight/solarized_dark.scss3
-rw-r--r--app/assets/stylesheets/highlight/solarized_light.scss3
-rw-r--r--app/assets/stylesheets/highlight/white.scss3
-rw-r--r--app/assets/stylesheets/pages/diff.scss4
6 files changed, 14 insertions, 5 deletions
diff --git a/app/assets/stylesheets/highlight/dark.scss b/app/assets/stylesheets/highlight/dark.scss
index ca818ddbcfe..9c76e58dfc8 100644
--- a/app/assets/stylesheets/highlight/dark.scss
+++ b/app/assets/stylesheets/highlight/dark.scss
@@ -141,7 +141,8 @@ $dark-il: #de935f;
}
.diff-line-num {
- &.is-over {
+ &.is-over,
+ &.hll:not(.empty-cell).is-over {
background-color: $dark-over-bg;
border-color: darken($dark-over-bg, 5%);
diff --git a/app/assets/stylesheets/highlight/monokai.scss b/app/assets/stylesheets/highlight/monokai.scss
index d5d238095ba..6488a099c74 100644
--- a/app/assets/stylesheets/highlight/monokai.scss
+++ b/app/assets/stylesheets/highlight/monokai.scss
@@ -141,7 +141,8 @@ $monokai-gi: #a6e22e;
}
.diff-line-num {
- &.is-over {
+ &.is-over,
+ &.hll:not(.empty-cell).is-over {
background-color: $monokai-over-bg;
border-color: darken($monokai-over-bg, 5%);
diff --git a/app/assets/stylesheets/highlight/solarized_dark.scss b/app/assets/stylesheets/highlight/solarized_dark.scss
index 0bb1634a31e..00079cc2b5b 100644
--- a/app/assets/stylesheets/highlight/solarized_dark.scss
+++ b/app/assets/stylesheets/highlight/solarized_dark.scss
@@ -145,7 +145,8 @@ $solarized-dark-il: #2aa198;
}
.diff-line-num {
- &.is-over {
+ &.is-over,
+ &.hll:not(.empty-cell).is-over {
background-color: $solarized-dark-over-bg;
border-color: darken($solarized-dark-over-bg, 5%);
diff --git a/app/assets/stylesheets/highlight/solarized_light.scss b/app/assets/stylesheets/highlight/solarized_light.scss
index a4b82fbc236..2e3b68f1a58 100644
--- a/app/assets/stylesheets/highlight/solarized_light.scss
+++ b/app/assets/stylesheets/highlight/solarized_light.scss
@@ -152,7 +152,8 @@ $solarized-light-il: #2aa198;
}
.diff-line-num {
- &.is-over {
+ &.is-over,
+ &.hll:not(.empty-cell).is-over {
background-color: $solarized-light-over-bg;
border-color: darken($solarized-light-over-bg, 5%);
diff --git a/app/assets/stylesheets/highlight/white.scss b/app/assets/stylesheets/highlight/white.scss
index 86e6764ec92..0eca30e570f 100644
--- a/app/assets/stylesheets/highlight/white.scss
+++ b/app/assets/stylesheets/highlight/white.scss
@@ -124,7 +124,8 @@ $white-gc-bg: #eaf2f5;
}
}
- &.is-over {
+ &.is-over,
+ &.hll:not(.empty-cell).is-over {
background-color: $white-over-bg;
border-color: darken($white-over-bg, 5%);
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss
index a8704c96011..339cdcde480 100644
--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
@@ -89,6 +89,10 @@
.diff-line-num {
width: 50px;
+
+ a {
+ transition: none;
+ }
}
.line_holder td {