kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Improve preview/edit links for comment form

Browse source 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
Dmitriy Zaporozhets 2013-11-27 11:14:42 +02:00
parent 44c55307a0
commit b34378c4d7
No known key found for this signature in database
GPG key ID: 2CEAFD2671262EC2
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/assets/stylesheets/sections/notes.scss
View file

@ -275,10 +275,9 @@ ul.notes {
// preview/edit buttons // preview/edit buttons
> a { > a {
font-size: 24px;
padding: 4px;
position: absolute; position: absolute;
right: 10px; right: 5px;
top: 116px;
} }
.note_preview { .note_preview {
background: #f5f5f5; background: #f5f5f5;
@ -325,7 +324,7 @@ ul.notes {
padding: 0 5px; padding: 0 5px;
.note-form-option { .note-form-option {
margin-top: 10px; margin-top: 8px;
margin-left: 30px; margin-left: 30px;
@extend .pull-left; @extend .pull-left;
} }
@ -366,4 +365,4 @@ ul.notes {
.parallel-comment { .parallel-comment {
padding: 6px; padding: 6px;
} }

8
app/views/projects/notes/_form.html.haml
View file

@ -7,10 +7,12 @@
= f.hidden_field :noteable_type = f.hidden_field :noteable_type
.note_text_and_preview.js-toggler-container .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 %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 %i.icon-edit
Write
= f.text_area :note, size: 255, class: 'note_text js-note-text js-gfm-input turn-on' = f.text_area :note, size: 255, class: 'note_text js-note-text js-gfm-input turn-on'
.note_preview.js-note-preview.turn-off .note_preview.js-note-preview.turn-off
@ -27,7 +29,7 @@
%a.btn.grouped.js-close-discussion-note-form Cancel %a.btn.grouped.js-close-discussion-note-form Cancel
.note-form-option .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 %i.icon-paper-clip
%span Choose File ... %span Choose File ...
&nbsp; &nbsp;