Commit 9aaf478f authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'improve/preview_button' of /home/git/repositories/gitlab/gitlabhq

parents b79d4c9b 042ec53c
...@@ -130,6 +130,7 @@ ul.notes { ...@@ -130,6 +130,7 @@ ul.notes {
&.notes_line { &.notes_line {
text-align: center; text-align: center;
padding: 10px 0; padding: 10px 0;
background: #eee;
} }
&.notes_line2 { &.notes_line2 {
text-align: center; text-align: center;
...@@ -275,10 +276,9 @@ ul.notes { ...@@ -275,10 +276,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 +325,7 @@ ul.notes { ...@@ -325,7 +325,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 +366,4 @@ ul.notes { ...@@ -366,4 +366,4 @@ ul.notes {
.parallel-comment { .parallel-comment {
padding: 6px; padding: 6px;
} }
\ No newline at end of file
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
.notes_count .notes_count
- notes = project.notes.for_commit_id(commit.id) - notes = project.notes.for_commit_id(commit.id)
- if notes.any? - if notes.any?
%span.badge.badge-info %span.label.label-gray
%i.icon-comment %i.icon-comment
= notes.count = notes.count
......
...@@ -7,10 +7,12 @@ ...@@ -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: "javascript:;", 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: "javascript:;" }
%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 @@ ...@@ -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 ...
   
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
- project = group[0] - project = group[0]
.title .title
= link_to_project project = link_to_project project
= link_to 'show all', project_merge_requests_path(project), class: 'pull-right'
%ul.well-list.mr-list %ul.well-list.mr-list
- group[1].each do |merge_request| - group[1].each do |merge_request|
= render 'projects/merge_requests/merge_request', merge_request: merge_request = render 'projects/merge_requests/merge_request', merge_request: merge_request
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment