Move assignee/milestone below description of Issue

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Move assignee/milestone below description of Issue
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets
1 parent 83d35399
Showing 4 changed files with 16 additions and 13 deletions Show diff stats
app/assets/stylesheets/generic/issue_box.scss
app/views/projects/issues/show.html.haml
app/views/projects/merge_requests/show/_mr_box.html.haml
features/steps/project/project_merge_requests.rb
@@ -29,20 +29,21 @@
     line-height: 1.5;
     margin: 0;
     color: #333;
+    padding-bottom: 0;
+    padding: 15px 25px;
   }
  
   .context {
     border: none;
     border-top: 1px solid #eee;
+    padding: 15px 25px;
   }
  
   .description {
-    border-top: 1px solid #eee;
+    padding: 0 25px 15px 25px;
   }
  
   .title, .context, .description {
-    padding: 15px 25px;
-
     .clearfix {
       margin: 0;
     }
@@ -42,15 +42,15 @@
   %h4.title
     = gfm escape_once(@issue.title)
  
-  .context
-    %cite.cgray
-      = render partial: 'issue_context', locals: { issue: @issue }
-
   - if @issue.description.present?
     .description
       .wiki
         = preserve do
           = markdown @issue.description
+  .context
+    %cite.cgray
+      = render partial: 'issue_context', locals: { issue: @issue }
+
  
 - content_for :note_actions do
   - if can?(current_user, :modify_issue, @issue)
@@ -15,16 +15,16 @@
   %h4.title
     = gfm escape_once(@merge_request.title)
  
-  .context
-    %cite.cgray
-      = render partial: 'projects/merge_requests/show/context', locals: { merge_request: @merge_request }
-
   - if @merge_request.description.present?
     .description
       .wiki
         = preserve do
           = markdown @merge_request.description
  
+  .context
+    %cite.cgray
+      = render partial: 'projects/merge_requests/show/context', locals: { merge_request: @merge_request }
+
 - if @merge_request.closed?
   .alert.alert-info
     %span
@@ -55,7 +55,9 @@ class ProjectMergeRequests &lt; Spinach::FeatureSteps
   end
  
   step 'I click link "Close"' do
-    click_link "Close"
+    within '.page-title' do
+      click_link "Close"
+    end
   end
  
   step 'I submit new merge request "Wiki Feature"' do
@@ -163,7 +165,7 @@ class ProjectMergeRequests &lt; Spinach::FeatureSteps
   end
  
   step 'I should see merged request' do
-    within '.page-title' do
+    within '.issue-box' do
       page.should have_content "Merged"
     end
   end
...	...	@@ -29,20 +29,21 @@
29	29	line-height: 1.5;
30	30	margin: 0;
31	31	color: #333;
	32	+ padding-bottom: 0;
	33	+ padding: 15px 25px;
32	34	}
33	35
34	36	.context {
35	37	border: none;
36	38	border-top: 1px solid #eee;
	39	+ padding: 15px 25px;
37	40	}
38	41
39	42	.description {
40		- border-top: 1px solid #eee;
	43	+ padding: 0 25px 15px 25px;
41	44	}
42	45
43	46	.title, .context, .description {
44		- padding: 15px 25px;
45		-
46	47	.clearfix {
47	48	margin: 0;
48	49	}
...	...
...	...	@@ -42,15 +42,15 @@
42	42	%h4.title
43	43	= gfm escape_once(@issue.title)
44	44
45		- .context
46		- %cite.cgray
47		- = render partial: 'issue_context', locals: { issue: @issue }
48		-
49	45	- if @issue.description.present?
50	46	.description
51	47	.wiki
52	48	= preserve do
53	49	= markdown @issue.description
	50	+ .context
	51	+ %cite.cgray
	52	+ = render partial: 'issue_context', locals: { issue: @issue }
	53	+
54	54
55	55	- content_for :note_actions do
56	56	- if can?(current_user, :modify_issue, @issue)
...	...
...	...	@@ -15,16 +15,16 @@
15	15	%h4.title
16	16	= gfm escape_once(@merge_request.title)
17	17
18		- .context
19		- %cite.cgray
20		- = render partial: 'projects/merge_requests/show/context', locals: { merge_request: @merge_request }
21		-
22	18	- if @merge_request.description.present?
23	19	.description
24	20	.wiki
25	21	= preserve do
26	22	= markdown @merge_request.description
27	23
	24	+ .context
	25	+ %cite.cgray
	26	+ = render partial: 'projects/merge_requests/show/context', locals: { merge_request: @merge_request }
	27	+
28	28	- if @merge_request.closed?
29	29	.alert.alert-info
30	30	%span
...	...
...	...	@@ -55,7 +55,9 @@ class ProjectMergeRequests < Spinach::FeatureSteps
55	55	end
56	56
57	57	step 'I click link "Close"' do
58		- click_link "Close"
	58	+ within '.page-title' do
	59	+ click_link "Close"
	60	+ end
59	61	end
60	62
61	63	step 'I submit new merge request "Wiki Feature"' do
...	...	@@ -163,7 +165,7 @@ class ProjectMergeRequests < Spinach::FeatureSteps
163	165	end
164	166
165	167	step 'I should see merged request' do
166		- within '.page-title' do
	168	+ within '.issue-box' do
167	169	page.should have_content "Merged"
168	170	end
169	171	end
...	...