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
b014ec2b
Commit
b014ec2b
authored
Apr 22, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update diff blue & yellow to match design
parent
d5398e96
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
8 deletions
+16
-8
app/assets/stylesheets/framework/timeline.scss
app/assets/stylesheets/framework/timeline.scss
+1
-1
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+4
-0
app/assets/stylesheets/highlight/white.scss
app/assets/stylesheets/highlight/white.scss
+11
-7
No files found.
app/assets/stylesheets/framework/timeline.scss
View file @
b014ec2b
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
border-bottom
:
1px
solid
$border-white-light
;
border-bottom
:
1px
solid
$border-white-light
;
&
:target
{
&
:target
{
background
:
$
row-hover
;
background
:
$
line-target-blue
;
}
}
.avatar
{
.avatar
{
...
...
app/assets/stylesheets/framework/variables.scss
View file @
b014ec2b
...
@@ -168,8 +168,12 @@ $line-removed: #fbe9eb;
...
@@ -168,8 +168,12 @@ $line-removed: #fbe9eb;
$line-removed-dark
:
#fac5cd
;
$line-removed-dark
:
#fac5cd
;
$line-number-old
:
#f9d7dc
;
$line-number-old
:
#f9d7dc
;
$line-number-new
:
#ddfbe6
;
$line-number-new
:
#ddfbe6
;
$line-number-select
:
#fbf2da
;
$match-line
:
#fafafa
;
$match-line
:
#fafafa
;
$table-border-gray
:
#f0f0f0
;
$table-border-gray
:
#f0f0f0
;
$line-target-blue
:
#eaf3fc
;
$line-select-yellow
:
#fcf8e7
;
$line-select-yellow-dark
:
#f0e2bd
;
/*
/*
* Fonts
* Fonts
*/
*/
...
...
app/assets/stylesheets/highlight/white.scss
View file @
b014ec2b
...
@@ -21,11 +21,6 @@
...
@@ -21,11 +21,6 @@
// Diff line
// Diff line
.line_holder
{
.line_holder
{
td
.diff-line-num.hll
:not
(
.empty-cell
),
td
.line_content.hll
:not
(
.empty-cell
)
{
background-color
:
#f8eec7
;
border-color
:
darken
(
#f8eec7
,
15%
);
}
.diff-line-num
{
.diff-line-num
{
&
.old
{
&
.old
{
...
@@ -37,11 +32,16 @@
...
@@ -37,11 +32,16 @@
background-color
:
$line-number-new
;
background-color
:
$line-number-new
;
border-color
:
$line-added-dark
;
border-color
:
$line-added-dark
;
}
}
&
.hll
:not
(
.empty-cell
)
{
background-color
:
$line-number-select
;
border-color
:
$line-select-yellow-dark
;
}
}
}
.line_content
{
.line_content
{
&
.old
{
&
.old
{
background
:
$line-removed
;
background
-color
:
$line-removed
;
span
.idiff
{
span
.idiff
{
background-color
:
$line-removed-dark
;
background-color
:
$line-removed-dark
;
...
@@ -58,7 +58,11 @@
...
@@ -58,7 +58,11 @@
&
.match
{
&
.match
{
color
:
$black-transparent
;
color
:
$black-transparent
;
background
:
$match-line
;
background-color
:
$match-line
;
}
&
.hll
:not
(
.empty-cell
)
{
background-color
:
$line-select-yellow
;
}
}
}
}
}
}
...
...
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