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
d76878b9
Commit
d76878b9
authored
Apr 07, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Diff touch ups
parent
6ee20697
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
11 deletions
+8
-11
white.scss
app/assets/stylesheets/highlight/white.scss
+1
-1
diff.scss
app/assets/stylesheets/pages/diff.scss
+5
-0
note_form.scss
app/assets/stylesheets/pages/note_form.scss
+0
-9
_diffs.html.haml
app/views/projects/diffs/_diffs.html.haml
+1
-1
diff_comments.feature
features/project/commits/diff_comments.feature
+1
-0
No files found.
app/assets/stylesheets/highlight/white.scss
View file @
d76878b9
...
...
@@ -6,7 +6,7 @@
}
.diff-line-num
,
.diff-line-num
a
{
color
:
#8f8f8f
;
color
:
$black-transparent
;
}
// Code itself
...
...
app/assets/stylesheets/pages/diff.scss
View file @
d76878b9
...
...
@@ -11,6 +11,7 @@
padding
:
10px
16px
;
color
:
#555
;
z-index
:
10
;
border-radius
:
3px
3px
0
0
;
.diff-title
{
font-family
:
$monospace_font
;
...
...
@@ -333,6 +334,10 @@
}
}
.files-changed
{
border-bottom
:
none
;
}
// Mobile
@media
(
max-width
:
480px
)
{
.diff-title
{
...
...
app/assets/stylesheets/pages/note_form.scss
View file @
d76878b9
...
...
@@ -182,12 +182,3 @@
float
:
left
;
}
}
.note-reply-field
{
background-color
:
$background-color
;
&
:focus
{
box-shadow
:
none
;
border-color
:
$border-color
;
}
}
app/views/projects/diffs/_diffs.html.haml
View file @
d76878b9
...
...
@@ -3,7 +3,7 @@
-
diff_files
=
safe_diff_files
(
diffs
,
diff_refs
)
.content-block.oneline-block
.content-block.oneline-block
.files-changed
.inline-parallel-buttons
.btn-group
=
inline_diff_btn
...
...
features/project/commits/diff_comments.feature
View file @
d76878b9
...
...
@@ -60,6 +60,7 @@ Feature: Project Commits Diff Comments
Scenario
:
I
have a reply button in discussions
Given
I leave a diff comment like
"Typo, please fix"
Then
I should see a discussion reply button
@javascript
Scenario
:
I
can preview with text
Given
I open a diff comment form
...
...
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