Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
e13dc680
Commit
e13dc680
authored
Feb 24, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Disables interaction with expanded lines
Fixed scss-lint errors
parent
db44e556
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
33 additions
and
21 deletions
+33
-21
app/assets/stylesheets/highlight/dark.scss
app/assets/stylesheets/highlight/dark.scss
+4
-3
app/assets/stylesheets/highlight/monokai.scss
app/assets/stylesheets/highlight/monokai.scss
+4
-3
app/assets/stylesheets/highlight/solarized_dark.scss
app/assets/stylesheets/highlight/solarized_dark.scss
+4
-3
app/assets/stylesheets/highlight/solarized_light.scss
app/assets/stylesheets/highlight/solarized_light.scss
+5
-3
app/assets/stylesheets/highlight/white.scss
app/assets/stylesheets/highlight/white.scss
+5
-3
app/assets/stylesheets/pages/diff.scss
app/assets/stylesheets/pages/diff.scss
+7
-2
app/views/projects/blob/diff.html.haml
app/views/projects/blob/diff.html.haml
+4
-4
No files found.
app/assets/stylesheets/highlight/dark.scss
View file @
e13dc680
...
...
@@ -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
;
}
}
}
...
...
app/assets/stylesheets/highlight/monokai.scss
View file @
e13dc680
...
...
@@ -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
;
}
}
}
...
...
app/assets/stylesheets/highlight/solarized_dark.scss
View file @
e13dc680
...
...
@@ -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
;
}
}
}
...
...
app/assets/stylesheets/highlight/solarized_light.scss
View file @
e13dc680
...
...
@@ -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
;
}
}
}
...
...
app/assets/stylesheets/highlight/white.scss
View file @
e13dc680
...
...
@@ -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
;
}
}
...
...
app/assets/stylesheets/pages/diff.scss
View file @
e13dc680
...
...
@@ -133,8 +133,13 @@
width
:
35px
;
font-weight
:
normal
;
&
:hover
{
text-decoration
:
underline
;
&
[
disabled
]
{
cursor
:
default
;
&
:hover
,
&
:active
{
text-decoration
:
none
;
}
}
}
}
...
...
app/views/projects/blob/diff.html.haml
View file @
e13dc680
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment