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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
d3fed349
Commit
d3fed349
authored
Jan 24, 2019
by
khm
Committed by
Fatih Acet
Jan 24, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove red/green colors from diff view of no-color syntax theme
parent
664567a8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
16 deletions
+17
-16
app/assets/stylesheets/highlight/none.scss
app/assets/stylesheets/highlight/none.scss
+12
-16
changelogs/unreleased/remove-diff-coloring.yml
changelogs/unreleased/remove-diff-coloring.yml
+5
-0
No files found.
app/assets/stylesheets/highlight/none.scss
View file @
d3fed349
...
...
@@ -38,7 +38,7 @@
$none-over-bg
:
#ded7fc
;
$none-expanded-border
:
#e0e0e0
;
$none-expanded-bg
:
#
f7f7f7
;
$none-expanded-bg
:
#
e0e0e0
;
.line_holder
{
...
...
@@ -50,18 +50,12 @@
.diff-line-num
{
&
.old
{
background-color
:
$line-number-old
;
border-color
:
$line-removed-dark
;
a
{
color
:
scale-color
(
$line-number-old
,
$red
:
-30%
,
$green
:
-30%
,
$blue
:
-30%
);
}
}
&
.new
{
background-color
:
$line-number-new
;
border-color
:
$line-added-dark
;
a
{
color
:
scale-color
(
$line-number-new
,
$red
:
-30%
,
$green
:
-30%
,
$blue
:
-30%
);
}
...
...
@@ -78,8 +72,8 @@
}
&
.hll
:not
(
.empty-cell
)
{
background-color
:
$
line-number-selec
t
;
border-color
:
$
line-select-yellow-dark
;
background-color
:
$
white-ligh
t
;
border-color
:
$
white-normal
;
}
}
...
...
@@ -101,26 +95,28 @@
.line_content
{
&
.old
{
background-color
:
$
line-removed
;
background-color
:
$
white-normal
;
&
:
:
before
{
color
:
scale-color
(
$line-number-old
,
$red
:
-30%
,
$green
:
-30%
,
$blue
:
-30%
)
;
color
:
$gl-text-color
;
}
span
.idiff
{
background-color
:
$line-removed-dark
;
background-color
:
$white-normal
;
text-decoration
:
underline
;
}
}
&
.new
{
background-color
:
$
line-added
;
background-color
:
$
white-normal
;
&
:
:
before
{
color
:
scale-color
(
$line-number-new
,
$red
:
-30%
,
$green
:
-30%
,
$blue
:
-30%
)
;
color
:
$gl-text-color
;
}
span
.idiff
{
background-color
:
$line-added-dark
;
background-color
:
$white-normal
;
text-decoration
:
underline
;
}
}
...
...
@@ -129,7 +125,7 @@
}
&
.hll
:not
(
.empty-cell
)
{
background-color
:
$
line-select-yellow
;
background-color
:
$
white-normal
;
}
}
}
...
...
changelogs/unreleased/remove-diff-coloring.yml
0 → 100644
View file @
d3fed349
---
title
:
'
remove
red/green
colors
from
diff
view
of
no-color
syntax
theme'
merge_request
:
24582
author
:
khm
type
:
changed
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