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
e1aaddd8
Commit
e1aaddd8
authored
Mar 13, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
improve styling of diff viewer
parent
12f4b633
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
56 additions
and
14 deletions
+56
-14
app/assets/stylesheets/pages/repo.scss
app/assets/stylesheets/pages/repo.scss
+54
-12
ee/app/assets/javascripts/ide/lib/themes/gl_theme.js
ee/app/assets/javascripts/ide/lib/themes/gl_theme.js
+2
-2
No files found.
app/assets/stylesheets/pages/repo.scss
View file @
e1aaddd8
...
...
@@ -230,22 +230,64 @@
min-height
:
auto
;
}
.monaco-diff-editor.vs
.diffOverview
{
background-color
:
$white-light
;
border-left
:
1px
solid
$white-dark
;
cursor
:
pointer
;
}
.monaco-diff-editor.vs
.diffViewport
{
.monaco-editor
.lines-content
.cigr
{
display
:
none
;
}
.monaco-diff-editor
.char-insert
{
background-color
:
$line-added-dark
;
}
.monaco-diff-editor.vs
{
.diagonal-fill
{
display
:
none
!
important
;
}
.diffOverview
{
background-color
:
$white-light
;
border-left
:
1px
solid
$white-dark
;
cursor
:
move
;
}
.diffViewport
{
display
:
none
;
}
.char-insert
{
background-color
:
$line-added-dark
;
}
.char-delete
{
background-color
:
$line-removed-dark
;
}
.line-numbers
{
color
:
$black-transparent
;
}
.view-overlays
{
.line-insert
{
background-color
:
$line-added
;
}
.line-delete
{
background-color
:
$line-removed
;
}
}
.monaco-diff-editor
.char-delete
{
background-color
:
$line-removed-dark
;
.margin
{
background-color
:
$gray-light
;
border-right
:
1px
solid
$white-normal
;
.line-insert
{
border-right
:
1px
solid
$line-added-dark
;
}
.line-delete
{
border-right
:
1px
solid
$line-removed-dark
;
}
}
.margin-view-overlays
.insert-sign
,
.margin-view-overlays
.delete-sign
{
opacity
:
.3
;
}
}
}
...
...
ee/app/assets/javascripts/ide/lib/themes/gl_theme.js
View file @
e1aaddd8
...
...
@@ -6,8 +6,8 @@ export default {
rules
:
[],
colors
:
{
'
editorLineNumber.foreground
'
:
'
#CCCCCC
'
,
'
diffEditor.insertedTextBackground
'
:
'
#
ecfdf0
'
,
'
diffEditor.removedTextBackground
'
:
'
#f
be9eb
'
,
'
diffEditor.insertedTextBackground
'
:
'
#
ddfbe6
'
,
'
diffEditor.removedTextBackground
'
:
'
#f
9d7dc
'
,
},
},
};
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