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
b34378c4
Commit
b34378c4
authored
11 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve preview/edit links for comment form
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
44c55307
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
8 deletions
+9
-8
app/assets/stylesheets/sections/notes.scss
app/assets/stylesheets/sections/notes.scss
+4
-5
app/views/projects/notes/_form.html.haml
app/views/projects/notes/_form.html.haml
+5
-3
No files found.
app/assets/stylesheets/sections/notes.scss
View file @
b34378c4
...
...
@@ -275,10 +275,9 @@ ul.notes {
// preview/edit buttons
>
a
{
font-size
:
24px
;
padding
:
4px
;
position
:
absolute
;
right
:
10px
;
right
:
5px
;
top
:
116px
;
}
.note_preview
{
background
:
#f5f5f5
;
...
...
@@ -325,7 +324,7 @@ ul.notes {
padding
:
0
5px
;
.note-form-option
{
margin-top
:
10
px
;
margin-top
:
8
px
;
margin-left
:
30px
;
@extend
.pull-left
;
}
...
...
@@ -366,4 +365,4 @@ ul.notes {
.parallel-comment
{
padding
:
6px
;
}
\ No newline at end of file
}
This diff is collapsed.
Click to expand it.
app/views/projects/notes/_form.html.haml
View file @
b34378c4
...
...
@@ -7,10 +7,12 @@
=
f
.
hidden_field
:noteable_type
.note_text_and_preview.js-toggler-container
%a
.
js-note-preview-button.js-toggler-target.turn-off
{
href:
"javascript:;"
,
title:
"Preview
"
,
data:
{
url:
preview_project_notes_path
(
@project
)}
}
%a
.
btn.btn-primary.js-note-preview-button.js-toggler-target.turn-off
{
href:
"#
"
,
data:
{
url:
preview_project_notes_path
(
@project
)}
}
%i
.icon-eye-open
%a
.js-note-edit-button.js-toggler-target.turn-off
{
href:
"javascript:;"
,
title:
"Edit"
}
Preview
%a
.btn.btn-primary.js-note-edit-button.js-toggler-target.turn-off
{
href:
"#"
}
%i
.icon-edit
Write
=
f
.
text_area
:note
,
size:
255
,
class:
'note_text js-note-text js-gfm-input turn-on'
.note_preview.js-note-preview.turn-off
...
...
@@ -27,7 +29,7 @@
%a
.btn.grouped.js-close-discussion-note-form
Cancel
.note-form-option
%a
.choose-btn.btn.
btn-small.
js-choose-note-attachment-button
%a
.choose-btn.btn.js-choose-note-attachment-button
%i
.icon-paper-clip
%span
Choose File ...
...
...
This diff is collapsed.
Click to expand it.
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