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
5341b16f
Commit
5341b16f
authored
May 18, 2016
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reuse existing SCSS variables
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
6daec9e6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
6 deletions
+14
-6
app/assets/stylesheets/framework/typography.scss
app/assets/stylesheets/framework/typography.scss
+2
-2
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+0
-2
lib/gitlab/diff/inline_diff_marker.rb
lib/gitlab/diff/inline_diff_marker.rb
+12
-2
No files found.
app/assets/stylesheets/framework/typography.scss
View file @
5341b16f
...
...
@@ -271,9 +271,9 @@ h1, h2, h3, h4 {
}
.idiff.deletion
{
background
:
$
gl-idiff-deletion
;
background
:
$
line-removed-dark
;
}
.idiff.addition
{
background
:
$
gl-idiff-addition
;
background
:
$
line-added-dark
;
}
app/assets/stylesheets/framework/variables.scss
View file @
5341b16f
...
...
@@ -178,8 +178,6 @@ $table-border-gray: #f0f0f0;
$line-target-blue
:
#eaf3fc
;
$line-select-yellow
:
#fcf8e7
;
$line-select-yellow-dark
:
#f0e2bd
;
$gl-idiff-deletion
:
#f8cbcb
;
$gl-idiff-addition
:
#a6f3a6
;
/*
* Fonts
...
...
lib/gitlab/diff/inline_diff_marker.rb
View file @
5341b16f
...
...
@@ -28,8 +28,18 @@ module Gitlab
# Mark each range
marker_ranges
.
each_with_index
do
|
range
,
index
|
before_content
=
markdown
?
"{
#{
MARKDOWN_SYMBOLS
[
mode
]
}
"
:
"<span class='
#{
html_class_names
(
marker_ranges
,
mode
,
index
)
}
'>"
after_content
=
markdown
?
"
#{
MARKDOWN_SYMBOLS
[
mode
]
}
}"
:
"</span>"
before_content
=
if
markdown
"{
#{
MARKDOWN_SYMBOLS
[
mode
]
}
"
else
"<span class='
#{
html_class_names
(
marker_ranges
,
mode
,
index
)
}
'>"
end
after_content
=
if
markdown
"
#{
MARKDOWN_SYMBOLS
[
mode
]
}
}"
else
"</span>"
end
offset
=
insert_around_range
(
rich_line
,
range
,
before_content
,
after_content
,
offset
)
end
...
...
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