BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
141c6a02
Commit
141c6a02
authored
Feb 03, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #8719 from jvanbaarsen/diff-colors
Made diff colors a little less In Your Face
parents
e9fad8cf
ae5743e9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
10 deletions
+10
-10
diff.scss
app/assets/stylesheets/sections/diff.scss
+10
-10
No files found.
app/assets/stylesheets/sections/diff.scss
View file @
141c6a02
...
...
@@ -40,12 +40,12 @@
font-size
:
$code_font_size
;
.old
{
span
.idiff
{
background-color
:
#
F99
;
background-color
:
#
f8cbcb
;
}
}
.new
{
span
.idiff
{
background-color
:
#
8F8
;
background-color
:
#
a6f3a6
;
}
}
.unfold
{
...
...
@@ -84,7 +84,7 @@
padding
:
0px
;
border
:
none
;
background
:
#F5F5F5
;
color
:
#666
;
color
:
rgba
(
0
,
0
,
0
,
0
.3
)
;
padding
:
0px
5px
;
border-right
:
1px
solid
#ccc
;
text-align
:
right
;
...
...
@@ -96,7 +96,7 @@
float
:
left
;
width
:
35px
;
font-weight
:
normal
;
color
:
#666
;
color
:
rgba
(
0
,
0
,
0
,
0
.3
)
;
&
:hover
{
text-decoration
:
underline
;
}
...
...
@@ -114,13 +114,13 @@
.line_holder
{
&
.old
.old_line
,
&
.old
.new_line
{
background
:
#
FCC
;
border-color
:
#
E7BABA
;
background
:
#
ffdddd
;
border-color
:
#
f1c0c0
;
}
&
.new
.old_line
,
&
.new
.new_line
{
background
:
#
CFC
;
border-color
:
#
B9ECB9
;
background
:
#
dbffdb
;
border-color
:
#
c1e9c1
;
}
}
.line_content
{
...
...
@@ -129,10 +129,10 @@
padding
:
0px
0
.5em
;
border
:
none
;
&
.new
{
background
:
#
CFD
;
background
:
#
eaffea
;
}
&
.old
{
background
:
#
FDD
;
background
:
#
ffecec
;
}
&
.matched
{
color
:
#ccc
;
...
...
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