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
c80c1da7
Commit
c80c1da7
authored
Mar 31, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move diff colors to variables
parent
b59d4e86
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
14 deletions
+24
-14
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+11
-1
app/assets/stylesheets/highlight/solarized_light.scss
app/assets/stylesheets/highlight/solarized_light.scss
+2
-2
app/assets/stylesheets/highlight/white.scss
app/assets/stylesheets/highlight/white.scss
+11
-11
No files found.
app/assets/stylesheets/framework/variables.scss
View file @
c80c1da7
...
@@ -108,6 +108,8 @@ $red-light: #e52c5a;
...
@@ -108,6 +108,8 @@ $red-light: #e52c5a;
$red-normal
:
#d22852
;
$red-normal
:
#d22852
;
$red-dark
:
darken
(
$red-normal
,
5%
);
$red-dark
:
darken
(
$red-normal
,
5%
);
$black-transparent
:
rgba
(
0
,
0
,
0
,
0
.3
);
$border-white-light
:
#f1f2f4
;
$border-white-light
:
#f1f2f4
;
$border-white-normal
:
#d6dae2
;
$border-white-normal
:
#d6dae2
;
$border-white-dark
:
#c6cacf
;
$border-white-dark
:
#c6cacf
;
...
@@ -158,7 +160,15 @@ $gl-btn-active-gradient: inset 0 0 4px $gl-btn-active-background;
...
@@ -158,7 +160,15 @@ $gl-btn-active-gradient: inset 0 0 4px $gl-btn-active-background;
*/
*/
$added
:
#63c363
;
$added
:
#63c363
;
$deleted
:
#f77
;
$deleted
:
#f77
;
$line-added
:
#ebfdf0
;
$line-added-dark
:
#a6f3a6
;
$line-removed
:
#ffecec
;
$line-removed-dark
:
#f8cbcb
;
$line-number-old
:
#fdd
;
$line-number-old-border
:
#f1c0c0
;
$line-number-new
:
#dbffdb
;
$line-number-new-border
:
#c1e9c1
;
$match-line
:
#fafafa
;
/*
/*
* Fonts
* Fonts
*/
*/
...
...
app/assets/stylesheets/highlight/solarized_light.scss
View file @
c80c1da7
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
}
}
.diff-line-num
,
.diff-line-num
a
{
.diff-line-num
,
.diff-line-num
a
{
color
:
rgba
(
0
,
0
,
0
,
0
.3
)
;
color
:
$black-transparent
;
}
}
// Code itself
// Code itself
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
}
}
.line_content.match
{
.line_content.match
{
color
:
rgba
(
0
,
0
,
0
,
0
.3
)
;
color
:
$black-transparent
;
background
:
rgba
(
255
,
255
,
255
,
0
.4
);
background
:
rgba
(
255
,
255
,
255
,
0
.4
);
}
}
}
}
...
...
app/assets/stylesheets/highlight/white.scss
View file @
c80c1da7
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
}
}
.diff-line-num
,
.diff-line-num
a
{
.diff-line-num
,
.diff-line-num
a
{
color
:
rgba
(
0
,
0
,
0
,
0
.3
)
;
color
:
$black-transparent
;
}
}
// Code itself
// Code itself
...
@@ -23,36 +23,36 @@
...
@@ -23,36 +23,36 @@
.line_holder
{
.line_holder
{
.diff-line-num
{
.diff-line-num
{
&
.old
{
&
.old
{
background
:
#fd
d
;
background
-color
:
$line-number-ol
d
;
border-color
:
#f1c0c0
;
border-color
:
$line-number-old-border
;
}
}
&
.new
{
&
.new
{
background
:
#dbffdb
;
background
-color
:
$line-number-new
;
border-color
:
#c1e9c1
;
border-color
:
$line-number-new-border
;
}
}
}
}
.line_content
{
.line_content
{
&
.old
{
&
.old
{
background
:
#ffecec
;
background
:
$line-removed
;
span
.idiff
{
span
.idiff
{
background-color
:
#f8cbcb
;
background-color
:
$line-removed-dark
;
}
}
}
}
&
.new
{
&
.new
{
background
:
#eaffea
;
background
-color
:
$line-added
;
span
.idiff
{
span
.idiff
{
background-color
:
#a6f3a6
;
background-color
:
$line-added-dark
;
}
}
}
}
&
.match
{
&
.match
{
color
:
rgba
(
0
,
0
,
0
,
0
.3
)
;
color
:
$black-transparent
;
background
:
#fafafa
;
background
:
$match-line
;
}
}
}
}
}
}
...
...
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