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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
58634dfb
Commit
58634dfb
authored
Feb 24, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
New class names in notes css
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
71d44746
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
20 deletions
+23
-20
app/assets/javascripts/main.js.coffee
app/assets/javascripts/main.js.coffee
+2
-2
app/assets/stylesheets/sections/notes.scss
app/assets/stylesheets/sections/notes.scss
+21
-18
No files found.
app/assets/javascripts/main.js.coffee
View file @
58634dfb
...
@@ -117,11 +117,11 @@ $ ->
...
@@ -117,11 +117,11 @@ $ ->
# Commit show suppressed diff
# Commit show suppressed diff
$
(
".content"
).
on
"click"
,
".supp_diff_link"
,
->
$
(
".
diff-
content"
).
on
"click"
,
".supp_diff_link"
,
->
$
(
@
).
next
(
'table'
).
show
()
$
(
@
).
next
(
'table'
).
show
()
$
(
@
).
remove
()
$
(
@
).
remove
()
$
(
".content"
).
on
"click"
,
".js-details-expand"
,
->
$
(
".
diff-
content"
).
on
"click"
,
".js-details-expand"
,
->
$
(
@
).
next
(
'.js-details-contain'
).
removeClass
(
"hide"
)
$
(
@
).
next
(
'.js-details-contain'
).
removeClass
(
"hide"
)
$
(
@
).
remove
()
$
(
@
).
remove
()
...
...
app/assets/stylesheets/sections/notes.scss
View file @
58634dfb
...
@@ -47,13 +47,13 @@ ul.notes {
...
@@ -47,13 +47,13 @@ ul.notes {
.discussion-body
{
.discussion-body
{
margin-left
:
50px
;
margin-left
:
50px
;
.file
,
.
diff-
file
,
.discussion-hidden
,
.discussion-hidden
,
.notes
{
.notes
{
@extend
.borders
;
@extend
.borders
;
background-color
:
#F9F9F9
;
background-color
:
#F9F9F9
;
}
}
.file
.notes
{
.
diff-
file
.notes
{
/* reset */
/* reset */
background
:
inherit
;
background
:
inherit
;
border
:
none
;
border
:
none
;
...
@@ -114,7 +114,7 @@ ul.notes {
...
@@ -114,7 +114,7 @@ ul.notes {
}
}
}
}
.file
.notes_holder
{
.
diff-
file
.notes_holder
{
font-size
:
13px
;
font-size
:
13px
;
line-height
:
18px
;
line-height
:
18px
;
font-family
:
"Helvetica Neue"
,
Helvetica
,
Arial
,
sans-serif
;
font-family
:
"Helvetica Neue"
,
Helvetica
,
Arial
,
sans-serif
;
...
@@ -184,7 +184,7 @@ ul.notes {
...
@@ -184,7 +184,7 @@ ul.notes {
}
}
}
}
}
}
.file
.note
.note-actions
{
.
diff-
file
.note
.note-actions
{
right
:
0
;
right
:
0
;
top
:
0
;
top
:
0
;
}
}
...
@@ -195,7 +195,7 @@ ul.notes {
...
@@ -195,7 +195,7 @@ ul.notes {
* Line note button on the side of diffs
* Line note button on the side of diffs
*/
*/
.file
tr
.line_holder
{
.
diff-
file
tr
.line_holder
{
.add-diff-note
{
.add-diff-note
{
background
:
url("diff_note_add.png")
no-repeat
left
0
;
background
:
url("diff_note_add.png")
no-repeat
left
0
;
height
:
22px
;
height
:
22px
;
...
@@ -235,22 +235,25 @@ ul.notes {
...
@@ -235,22 +235,25 @@ ul.notes {
.reply-btn
{
.reply-btn
{
@extend
.btn-primary
;
@extend
.btn-primary
;
}
}
.file
.content
tr
.line_holder
:hover
{
.diff-file
.diff-content
{
&
>
td
.line_content
{
tr
.line_holder
:hover
{
background
:
$hover
!
important
;
&
>
td
.line_content
{
border-color
:
darken
(
$hover
,
10%
)
!
important
;
background
:
$hover
!
important
;
border-color
:
darken
(
$hover
,
10%
)
!
important
;
}
&
>
td
.new_line
,
&
>
td
.old_line
{
background
:
darken
(
$hover
,
4%
)
!
important
;
border-color
:
darken
(
$hover
,
10%
)
!
important
;
}
}
}
&
>
td
.new_line
,
&
>
td
.old_line
{
tr
.line_holder
:hover
>
td
.line_note_link
{
background
:
darken
(
$hover
,
4%
)
!
important
;
opacity
:
1
.0
;
border-color
:
darken
(
$hover
,
10%
)
!
important
;
filter
:
alpha
(
opacity
=
100
)
;
}
}
}
}
.file
.content
tr
.line_holder
:hover
>
td
.line_note_link
{
.diff-file
,
opacity
:
1
.0
;
filter
:
alpha
(
opacity
=
100
);
}
.file
,
.discussion
{
.discussion
{
.new_note
{
.new_note
{
margin
:
0
;
margin
:
0
;
...
...
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