diff options
author | Phil Hughes <me@iamphill.com> | 2017-02-24 14:56:20 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-02-28 14:38:23 +0000 |
commit | e13dc680523c14c205c20c2cd299ad64c287cd23 (patch) | |
tree | 7cfe9b7bb59c749455c444cd1c523c4d907d5771 /app | |
parent | db44e5569851d5542ae3fbe283cd7ccf0522b46a (diff) | |
download | gitlab-ce-e13dc680523c14c205c20c2cd299ad64c287cd23.tar.gz |
Disables interaction with expanded linesdiff-make-obvious-cant-comment
Fixed scss-lint errors
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/stylesheets/highlight/dark.scss | 7 | ||||
-rw-r--r-- | app/assets/stylesheets/highlight/monokai.scss | 7 | ||||
-rw-r--r-- | app/assets/stylesheets/highlight/solarized_dark.scss | 7 | ||||
-rw-r--r-- | app/assets/stylesheets/highlight/solarized_light.scss | 8 | ||||
-rw-r--r-- | app/assets/stylesheets/highlight/white.scss | 8 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/diff.scss | 9 | ||||
-rw-r--r-- | app/views/projects/blob/diff.html.haml | 8 |
7 files changed, 33 insertions, 21 deletions
diff --git a/app/assets/stylesheets/highlight/dark.scss b/app/assets/stylesheets/highlight/dark.scss index 7d2818281a5..09951fe3d3e 100644 --- a/app/assets/stylesheets/highlight/dark.scss +++ b/app/assets/stylesheets/highlight/dark.scss @@ -21,6 +21,7 @@ $dark-highlight-color: $black; $dark-pre-hll-bg: #373b41; $dark-hll-bg: #373b41; $dark-over-bg: #9f9ab5; +$dark-expanded-bg: #3e3e3e; $dark-c: #969896; $dark-err: #c66; $dark-k: #b294bb; @@ -160,15 +161,15 @@ $dark-il: #de935f; &.diff-expanded + .line_holder:not(.diff-expanded) { > .diff-line-num, > .line_content { - border-top: 1px solid #000; + border-top: 1px solid $black; } } &.diff-expanded { > .diff-line-num, > .line_content { - background: #3e3e3e; - border-color: #3e3e3e; + background: $dark-expanded-bg; + border-color: $dark-expanded-bg; } } } diff --git a/app/assets/stylesheets/highlight/monokai.scss b/app/assets/stylesheets/highlight/monokai.scss index d2fac66b980..b6a6d298adf 100644 --- a/app/assets/stylesheets/highlight/monokai.scss +++ b/app/assets/stylesheets/highlight/monokai.scss @@ -14,6 +14,7 @@ $monokai-line-empty-border: darken($monokai-line-empty-bg, 15%); $monokai-diff-border: #808080; $monokai-highlight-bg: #ffe792; $monokai-over-bg: #9f9ab5; +$monokai-expanded-bg: #3e3e3e; $monokai-new-bg: rgba(166, 226, 46, 0.1); $monokai-new-idiff: rgba(166, 226, 46, 0.15); @@ -160,15 +161,15 @@ $monokai-gi: #a6e22e; &.diff-expanded + .line_holder:not(.diff-expanded) { > .diff-line-num, > .line_content { - border-top: 1px solid #000; + border-top: 1px solid $black; } } &.diff-expanded { > .diff-line-num, > .line_content { - background: #3e3e3e; - border-color: #3e3e3e; + background: $monokai-expanded-bg; + border-color: $monokai-expanded-bg; } } } diff --git a/app/assets/stylesheets/highlight/solarized_dark.scss b/app/assets/stylesheets/highlight/solarized_dark.scss index e86b5bb0e9b..4f7a50dcb4f 100644 --- a/app/assets/stylesheets/highlight/solarized_dark.scss +++ b/app/assets/stylesheets/highlight/solarized_dark.scss @@ -18,6 +18,7 @@ $solarized-dark-line-color-old: #7a6c71; $solarized-dark-highlight: #094554; $solarized-dark-hll-bg: #174652; $solarized-dark-over-bg: #9f9ab5; +$solarized-dark-expanded-bg: #010d10; $solarized-dark-c: #586e75; $solarized-dark-err: #93a1a1; $solarized-dark-g: #93a1a1; @@ -164,15 +165,15 @@ $solarized-dark-il: #2aa198; &.diff-expanded + .line_holder:not(.diff-expanded) { > .diff-line-num, > .line_content { - border-top: 1px solid #000; + border-top: 1px solid $black; } } &.diff-expanded { > .diff-line-num, > .line_content { - background: #010d10; - border-color: #010d10; + background: $solarized-dark-expanded-bg; + border-color: $solarized-dark-expanded-bg; } } } diff --git a/app/assets/stylesheets/highlight/solarized_light.scss b/app/assets/stylesheets/highlight/solarized_light.scss index 14ac0d9d860..6463fe96c1b 100644 --- a/app/assets/stylesheets/highlight/solarized_light.scss +++ b/app/assets/stylesheets/highlight/solarized_light.scss @@ -19,6 +19,8 @@ $solarized-light-line-color-old: #ad9186; $solarized-light-highlight: #eee8d5; $solarized-light-hll-bg: #ddd8c5; $solarized-light-over-bg: #ded7fc; +$solarized-light-expanded-border: #d2cdbd; +$solarized-light-expanded-bg: #ece6d4; $solarized-light-c: #93a1a1; $solarized-light-err: #586e75; $solarized-light-g: #586e75; @@ -171,15 +173,15 @@ $solarized-light-il: #2aa198; &.diff-expanded + .line_holder:not(.diff-expanded) { > .diff-line-num, > .line_content { - border-top: 1px solid #d2cdbd; + border-top: 1px solid $solarized-light-expanded-border; } } &.diff-expanded { > .diff-line-num, > .line_content { - background: #ece6d4; - border-color: #ece6d4; + background: $solarized-light-expanded-bg; + border-color: $solarized-light-expanded-bg; } } } diff --git a/app/assets/stylesheets/highlight/white.scss b/app/assets/stylesheets/highlight/white.scss index ca7242bcd7e..ab2018bfbca 100644 --- a/app/assets/stylesheets/highlight/white.scss +++ b/app/assets/stylesheets/highlight/white.scss @@ -8,6 +8,8 @@ $white-highlight: #fafe3d; $white-pre-hll-bg: #f8eec7; $white-hll-bg: #f8f8f8; $white-over-bg: #ded7fc; +$white-expanded-border: #e0e0e0; +$white-expanded-bg: #f7f7f7; $white-c: #998; $white-err: #a61717; $white-err-bg: #e3d2d2; @@ -144,15 +146,15 @@ $white-gc-bg: #eaf2f5; &.diff-expanded + .line_holder:not(.diff-expanded) { > .diff-line-num, > .line_content { - border-top: 1px solid #e0e0e0; + border-top: 1px solid $white-expanded-border; } } &.diff-expanded { > .diff-line-num, > .line_content { - background: #f7f7f7; - border-color: #f7f7f7; + background: $white-expanded-bg; + border-color: $white-expanded-bg; } } diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index 339cdcde480..5d0c247dea8 100644 --- a/app/assets/stylesheets/pages/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss @@ -133,8 +133,13 @@ width: 35px; font-weight: normal; - &:hover { - text-decoration: underline; + &[disabled] { + cursor: default; + + &:hover, + &:active { + text-decoration: none; + } } } } diff --git a/app/views/projects/blob/diff.html.haml b/app/views/projects/blob/diff.html.haml index 2e50b90a617..d1d448f0d4c 100644 --- a/app/views/projects/blob/diff.html.haml +++ b/app/views/projects/blob/diff.html.haml @@ -13,16 +13,16 @@ - case diff_view - when :inline %td.old_line.diff-line-num{ data: { linenumber: line_old } } - %a{ href: "##{line_old}", data: { linenumber: line_old } } + %a{ href: "#", data: { linenumber: line_old }, disabled: true } %td.new_line.diff-line-num{ data: { linenumber: line_new } } - %a{ href: "##{line_new}", data: { linenumber: line_new } } + %a{ href: "#", data: { linenumber: line_new }, disabled: true } = line_content - when :parallel %td.old_line.diff-line-num{ data: { linenumber: line_old } } - %a{ href: "##{line_old}", data: { linenumber: line_old } } + %a{ href: "##{line_old}", data: { linenumber: line_old }, disabled: true } = line_content %td.new_line.diff-line-num{ data: { linenumber: line_new } } - %a{ href: "##{line_new}", data: { linenumber: line_new } } + %a{ href: "##{line_new}", data: { linenumber: line_new }, disabled: true } = line_content - if @form.unfold? && @form.bottom? && @form.to < @blob.lines.size |