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

Dmitriy Zaporozhets
2 parents b79d4c9b 042ec53c
Showing 4 changed files with 12 additions and 9 deletions Show diff stats
app/assets/stylesheets/sections/notes.scss
app/views/projects/commits/_commit.html.haml
app/views/projects/notes/_form.html.haml
app/views/shared/_merge_requests.html.haml
@@ -130,6 +130,7 @@ ul.notes {
     &.notes_line {
       text-align: center;
       padding: 10px 0;
+      background: #eee;
     }
     &.notes_line2 {
       text-align: center;
@@ -275,10 +276,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 +325,7 @@ ul.notes {
   padding: 0 5px;
  
   .note-form-option {
-    margin-top: 10px;
+    margin-top: 8px;
     margin-left: 30px;
     @extend .pull-left;
   }
@@ -366,4 +366,4 @@ ul.notes {
  
 .parallel-comment {
   padding: 6px;
-}
 \ No newline at end of file
+}
@@ -7,7 +7,7 @@
     .notes_count
       - notes = project.notes.for_commit_id(commit.id)
       - if notes.any?
-        %span.badge.badge-info
+        %span.label.label-gray
           %i.icon-comment
           = notes.count
  
@@ -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: "javascript:;", 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: "javascript:;" }
       %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 ...
       &nbsp;
@@ -4,6 +4,7 @@
       - project = group[0]
       .title
         = link_to_project project
+        = link_to 'show all', project_merge_requests_path(project), class: 'pull-right'
       %ul.well-list.mr-list
         - group[1].each do |merge_request|
           = render 'projects/merge_requests/merge_request', merge_request: merge_request
...	...	@@ -130,6 +130,7 @@ ul.notes {
130	130	&.notes_line {
131	131	text-align: center;
132	132	padding: 10px 0;
	133	+ background: #eee;
133	134	}
134	135	&.notes_line2 {
135	136	text-align: center;
...	...	@@ -275,10 +276,9 @@ ul.notes {
275	276
276	277	// preview/edit buttons
277	278	> a {
278		- font-size: 24px;
279		- padding: 4px;
280	279	position: absolute;
281		- right: 10px;
	280	+ right: 5px;
	281	+ top: 116px;
282	282	}
283	283	.note_preview {
284	284	background: #f5f5f5;
...	...	@@ -325,7 +325,7 @@ ul.notes {
325	325	padding: 0 5px;
326	326
327	327	.note-form-option {
328		- margin-top: 10px;
	328	+ margin-top: 8px;
329	329	margin-left: 30px;
330	330	@extend .pull-left;
331	331	}
...	...	@@ -366,4 +366,4 @@ ul.notes {
366	366
367	367	.parallel-comment {
368	368	padding: 6px;
369		-}
370	369	\ No newline at end of file
	370	+}
...	...
...	...	@@ -7,7 +7,7 @@
7	7	.notes_count
8	8	- notes = project.notes.for_commit_id(commit.id)
9	9	- if notes.any?
10		- %span.badge.badge-info
	10	+ %span.label.label-gray
11	11	%i.icon-comment
12	12	= notes.count
13	13
...	...
...	...	@@ -7,10 +7,12 @@
7	7	= f.hidden_field :noteable_type
8	8
9	9	.note_text_and_preview.js-toggler-container
10		- %a.js-note-preview-button.js-toggler-target.turn-off{ href: "javascript:;", title: "Preview", data: {url: preview_project_notes_path(@project)} }
	10	+ %a.btn.btn-primary.js-note-preview-button.js-toggler-target.turn-off{ href: "javascript:;", data: {url: preview_project_notes_path(@project)} }
11	11	%i.icon-eye-open
12		- %a.js-note-edit-button.js-toggler-target.turn-off{ href: "javascript:;", title: "Edit" }
	12	+ Preview
	13	+ %a.btn.btn-primary.js-note-edit-button.js-toggler-target.turn-off{ href: "javascript:;" }
13	14	%i.icon-edit
	15	+ Write
14	16
15	17	= f.text_area :note, size: 255, class: 'note_text js-note-text js-gfm-input turn-on'
16	18	.note_preview.js-note-preview.turn-off
...	...	@@ -27,7 +29,7 @@
27	29	%a.btn.grouped.js-close-discussion-note-form Cancel
28	30
29	31	.note-form-option
30		- %a.choose-btn.btn.btn-small.js-choose-note-attachment-button
	32	+ %a.choose-btn.btn.js-choose-note-attachment-button
31	33	%i.icon-paper-clip
32	34	%span Choose File ...
33	35
...	...
...	...	@@ -4,6 +4,7 @@
4	4	- project = group[0]
5	5	.title
6	6	= link_to_project project
	7	+ = link_to 'show all', project_merge_requests_path(project), class: 'pull-right'
7	8	%ul.well-list.mr-list
8	9	- group[1].each do \|merge_request\|
9	10	= render 'projects/merge_requests/merge_request', merge_request: merge_request
...	...