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
05339515
Commit
05339515
authored
Apr 07, 2017
by
Luke "Jared" Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add link to list items
parent
b70d828f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
15 deletions
+28
-15
app/assets/stylesheets/pages/note_form.scss
app/assets/stylesheets/pages/note_form.scss
+13
-2
app/views/projects/notes/_comment_button.html.haml
app/views/projects/notes/_comment_button.html.haml
+15
-13
No files found.
app/assets/stylesheets/pages/note_form.scss
View file @
05339515
...
@@ -333,10 +333,21 @@
...
@@ -333,10 +333,21 @@
}
}
li
{
li
{
white-space
:
nowrap
;
cursor
:
pointer
;
padding-top
:
6px
;
padding-top
:
6px
;
&
>
a
{
margin
:
0
;
padding
:
0
;
color
:
inherit
;
border-radius
:
0
;
&
:hover
,
&
:focus
{
background-color
:
inherit
;
color
:
inherit
;
}
}
&
:hover
,
&
:hover
,
&
:focus
{
&
:focus
{
background-color
:
$dropdown-hover-color
;
background-color
:
$dropdown-hover-color
;
...
...
app/views/projects/notes/_comment_button.html.haml
View file @
05339515
...
@@ -9,20 +9,22 @@
...
@@ -9,20 +9,22 @@
%ul
#resolvable-comment-menu
.dropdown-menu
{
data:
{
dropdown:
true
}
}
%ul
#resolvable-comment-menu
.dropdown-menu
{
data:
{
dropdown:
true
}
}
%li
#comment
.droplab-item-selected
{
data:
{
value:
''
,
'submit-text'
=>
'Comment'
,
'close-text'
=>
"Comment & close #{noteable_name}"
,
'reopen-text'
=>
"Comment & reopen #{noteable_name}"
}
}
%li
#comment
.droplab-item-selected
{
data:
{
value:
''
,
'submit-text'
=>
'Comment'
,
'close-text'
=>
"Comment & close #{noteable_name}"
,
'reopen-text'
=>
"Comment & reopen #{noteable_name}"
}
}
=
icon
(
'check'
)
%a
{
href:
'#'
}
.description
=
icon
(
'check'
)
%strong
Comment
.description
%p
%strong
Comment
Add a general comment to this
#{
noteable_name
}
.
%p
Add a general comment to this
#{
noteable_name
}
.
%li
.divider
%li
.divider
%li
#discussion
{
data:
{
value:
'DiscussionNote'
,
'submit-text'
=>
'Start discussion'
,
'close-text'
=>
"Start discussion & close #{noteable_name}"
,
'reopen-text'
=>
"Start discussion & reopen #{noteable_name}"
}
}
%li
#discussion
{
data:
{
value:
'DiscussionNote'
,
'submit-text'
=>
'Start discussion'
,
'close-text'
=>
"Start discussion & close #{noteable_name}"
,
'reopen-text'
=>
"Start discussion & reopen #{noteable_name}"
}
}
=
icon
(
'check'
)
%a
{
href:
'#'
}
.description
=
icon
(
'check'
)
%strong
Start discussion
.description
%p
%strong
Start discussion
=
succeed
'.'
do
%p
Discuss a specific suggestion or question
=
succeed
'.'
do
-
if
@note
.
noteable
.
supports_resolvable_notes?
Discuss a specific suggestion or question
that needs to be resolved
-
if
@note
.
noteable
.
supports_resolvable_notes?
that needs to be resolved
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