Commit e13dc680 authored by Phil Hughes's avatar Phil Hughes

Disables interaction with expanded lines

Fixed scss-lint errors
parent db44e556
...@@ -21,6 +21,7 @@ $dark-highlight-color: $black; ...@@ -21,6 +21,7 @@ $dark-highlight-color: $black;
$dark-pre-hll-bg: #373b41; $dark-pre-hll-bg: #373b41;
$dark-hll-bg: #373b41; $dark-hll-bg: #373b41;
$dark-over-bg: #9f9ab5; $dark-over-bg: #9f9ab5;
$dark-expanded-bg: #3e3e3e;
$dark-c: #969896; $dark-c: #969896;
$dark-err: #c66; $dark-err: #c66;
$dark-k: #b294bb; $dark-k: #b294bb;
...@@ -160,15 +161,15 @@ $dark-il: #de935f; ...@@ -160,15 +161,15 @@ $dark-il: #de935f;
&.diff-expanded + .line_holder:not(.diff-expanded) { &.diff-expanded + .line_holder:not(.diff-expanded) {
> .diff-line-num, > .diff-line-num,
> .line_content { > .line_content {
border-top: 1px solid #000; border-top: 1px solid $black;
} }
} }
&.diff-expanded { &.diff-expanded {
> .diff-line-num, > .diff-line-num,
> .line_content { > .line_content {
background: #3e3e3e; background: $dark-expanded-bg;
border-color: #3e3e3e; border-color: $dark-expanded-bg;
} }
} }
} }
......
...@@ -14,6 +14,7 @@ $monokai-line-empty-border: darken($monokai-line-empty-bg, 15%); ...@@ -14,6 +14,7 @@ $monokai-line-empty-border: darken($monokai-line-empty-bg, 15%);
$monokai-diff-border: #808080; $monokai-diff-border: #808080;
$monokai-highlight-bg: #ffe792; $monokai-highlight-bg: #ffe792;
$monokai-over-bg: #9f9ab5; $monokai-over-bg: #9f9ab5;
$monokai-expanded-bg: #3e3e3e;
$monokai-new-bg: rgba(166, 226, 46, 0.1); $monokai-new-bg: rgba(166, 226, 46, 0.1);
$monokai-new-idiff: rgba(166, 226, 46, 0.15); $monokai-new-idiff: rgba(166, 226, 46, 0.15);
...@@ -160,15 +161,15 @@ $monokai-gi: #a6e22e; ...@@ -160,15 +161,15 @@ $monokai-gi: #a6e22e;
&.diff-expanded + .line_holder:not(.diff-expanded) { &.diff-expanded + .line_holder:not(.diff-expanded) {
> .diff-line-num, > .diff-line-num,
> .line_content { > .line_content {
border-top: 1px solid #000; border-top: 1px solid $black;
} }
} }
&.diff-expanded { &.diff-expanded {
> .diff-line-num, > .diff-line-num,
> .line_content { > .line_content {
background: #3e3e3e; background: $monokai-expanded-bg;
border-color: #3e3e3e; border-color: $monokai-expanded-bg;
} }
} }
} }
......
...@@ -18,6 +18,7 @@ $solarized-dark-line-color-old: #7a6c71; ...@@ -18,6 +18,7 @@ $solarized-dark-line-color-old: #7a6c71;
$solarized-dark-highlight: #094554; $solarized-dark-highlight: #094554;
$solarized-dark-hll-bg: #174652; $solarized-dark-hll-bg: #174652;
$solarized-dark-over-bg: #9f9ab5; $solarized-dark-over-bg: #9f9ab5;
$solarized-dark-expanded-bg: #010d10;
$solarized-dark-c: #586e75; $solarized-dark-c: #586e75;
$solarized-dark-err: #93a1a1; $solarized-dark-err: #93a1a1;
$solarized-dark-g: #93a1a1; $solarized-dark-g: #93a1a1;
...@@ -164,15 +165,15 @@ $solarized-dark-il: #2aa198; ...@@ -164,15 +165,15 @@ $solarized-dark-il: #2aa198;
&.diff-expanded + .line_holder:not(.diff-expanded) { &.diff-expanded + .line_holder:not(.diff-expanded) {
> .diff-line-num, > .diff-line-num,
> .line_content { > .line_content {
border-top: 1px solid #000; border-top: 1px solid $black;
} }
} }
&.diff-expanded { &.diff-expanded {
> .diff-line-num, > .diff-line-num,
> .line_content { > .line_content {
background: #010d10; background: $solarized-dark-expanded-bg;
border-color: #010d10; border-color: $solarized-dark-expanded-bg;
} }
} }
} }
......
...@@ -19,6 +19,8 @@ $solarized-light-line-color-old: #ad9186; ...@@ -19,6 +19,8 @@ $solarized-light-line-color-old: #ad9186;
$solarized-light-highlight: #eee8d5; $solarized-light-highlight: #eee8d5;
$solarized-light-hll-bg: #ddd8c5; $solarized-light-hll-bg: #ddd8c5;
$solarized-light-over-bg: #ded7fc; $solarized-light-over-bg: #ded7fc;
$solarized-light-expanded-border: #d2cdbd;
$solarized-light-expanded-bg: #ece6d4;
$solarized-light-c: #93a1a1; $solarized-light-c: #93a1a1;
$solarized-light-err: #586e75; $solarized-light-err: #586e75;
$solarized-light-g: #586e75; $solarized-light-g: #586e75;
...@@ -171,15 +173,15 @@ $solarized-light-il: #2aa198; ...@@ -171,15 +173,15 @@ $solarized-light-il: #2aa198;
&.diff-expanded + .line_holder:not(.diff-expanded) { &.diff-expanded + .line_holder:not(.diff-expanded) {
> .diff-line-num, > .diff-line-num,
> .line_content { > .line_content {
border-top: 1px solid #d2cdbd; border-top: 1px solid $solarized-light-expanded-border;
} }
} }
&.diff-expanded { &.diff-expanded {
> .diff-line-num, > .diff-line-num,
> .line_content { > .line_content {
background: #ece6d4; background: $solarized-light-expanded-bg;
border-color: #ece6d4; border-color: $solarized-light-expanded-bg;
} }
} }
} }
......
...@@ -8,6 +8,8 @@ $white-highlight: #fafe3d; ...@@ -8,6 +8,8 @@ $white-highlight: #fafe3d;
$white-pre-hll-bg: #f8eec7; $white-pre-hll-bg: #f8eec7;
$white-hll-bg: #f8f8f8; $white-hll-bg: #f8f8f8;
$white-over-bg: #ded7fc; $white-over-bg: #ded7fc;
$white-expanded-border: #e0e0e0;
$white-expanded-bg: #f7f7f7;
$white-c: #998; $white-c: #998;
$white-err: #a61717; $white-err: #a61717;
$white-err-bg: #e3d2d2; $white-err-bg: #e3d2d2;
...@@ -144,15 +146,15 @@ $white-gc-bg: #eaf2f5; ...@@ -144,15 +146,15 @@ $white-gc-bg: #eaf2f5;
&.diff-expanded + .line_holder:not(.diff-expanded) { &.diff-expanded + .line_holder:not(.diff-expanded) {
> .diff-line-num, > .diff-line-num,
> .line_content { > .line_content {
border-top: 1px solid #e0e0e0; border-top: 1px solid $white-expanded-border;
} }
} }
&.diff-expanded { &.diff-expanded {
> .diff-line-num, > .diff-line-num,
> .line_content { > .line_content {
background: #f7f7f7; background: $white-expanded-bg;
border-color: #f7f7f7; border-color: $white-expanded-bg;
} }
} }
......
...@@ -133,8 +133,13 @@ ...@@ -133,8 +133,13 @@
width: 35px; width: 35px;
font-weight: normal; font-weight: normal;
&:hover { &[disabled] {
text-decoration: underline; cursor: default;
&:hover,
&:active {
text-decoration: none;
}
} }
} }
} }
......
...@@ -13,16 +13,16 @@ ...@@ -13,16 +13,16 @@
- case diff_view - case diff_view
- when :inline - when :inline
%td.old_line.diff-line-num{ data: { linenumber: line_old } } %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 } } %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 = line_content
- when :parallel - when :parallel
%td.old_line.diff-line-num{ data: { linenumber: line_old } } %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 = line_content
%td.new_line.diff-line-num{ data: { linenumber: line_new } } %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 = line_content
- if @form.unfold? && @form.bottom? && @form.to < @blob.lines.size - if @form.unfold? && @form.bottom? && @form.to < @blob.lines.size
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment