Fixed specs. Some css fixes

5 files changed, 22 insertions, 21 deletions

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 1fabe3b7ffc..03a1e7082a8 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1092,13 +1092,12 @@ p.time {
     position: absolute;
     right:14px;
     top:7px;
-    height: 30px;
   }
 
   div.attachments {
     position:relative;
     width: 350px;
-    height: 30px;
+    height: 36px;
     overflow:hidden;
     margin:0 0 5px !important;
   }
diff --git a/app/views/issues/_form.html.haml b/app/views/issues/_form.html.haml
index 6d44eb090b0..543bab1f7c0 100644
--- a/app/views/issues/_form.html.haml
+++ b/app/views/issues/_form.html.haml
@@ -15,7 +15,7 @@
     .clearfix
       = f.label :description, "Issue Details"
       .input
-        = f.text_area :description, :maxlength => 2000, :class => "xxlarge"
+        = f.text_area :description, :maxlength => 2000, :class => "xxlarge", :rows => 10
         %p.hint Markdown is enabled.
 
     .clearfix
diff --git a/app/views/issues/show.html.haml b/app/views/issues/show.html.haml
index ac91955df3b..6201852d5d7 100644
--- a/app/views/issues/show.html.haml
+++ b/app/views/issues/show.html.haml
@@ -44,7 +44,7 @@
         %strong.author= link_to_issue_assignee(@issue)
       
     %div
-      - if @issue.description
+      - if @issue.description.present?
         %hr
         = markdown @issue.description
 
diff --git a/app/views/merge_requests/show.html.haml b/app/views/merge_requests/show.html.haml
index 792ee9de50c..4f1d49b8002 100644
--- a/app/views/merge_requests/show.html.haml
+++ b/app/views/merge_requests/show.html.haml
@@ -30,22 +30,12 @@
 
 .merge_request_box
   .merge_request_status_holder
-    - if @merge_request.closed
-      %h5
+    %h5
+      - if @merge_request.closed
         .alert-message.error.status_info Closed
-        - if @merge_request.merged?
-          %span
-            Merged by #{@merge_request.merge_event.author_name} 
-            %small #{time_ago_in_words(@merge_request.merge_event.created_at)} ago.
-        - elsif @merge_request.closed_event
-          %span
-            Closed by #{@merge_request.closed_event.author_name} 
-            %small #{time_ago_in_words(@merge_request.closed_event.created_at)} ago.
-        %br
-    - else 
-      %h5
+      - else 
         .alert-message.success.status_info Open
-        = @merge_request.title
+      = @merge_request.title
 
 
   %div
@@ -57,7 +47,19 @@
       %cite.cgray and currently assigned to 
       = image_tag gravatar_icon(@merge_request.assignee_email), :width => 16, :class => "lil_av"
       %strong.author= link_to_merge_request_assignee(@merge_request)
-      
+
+
+  - if @merge_request.closed
+    %hr
+    - if @merge_request.merged?
+      %span
+        Merged by #{@merge_request.merge_event.author_name} 
+        %small #{time_ago_in_words(@merge_request.merge_event.created_at)} ago.
+    - elsif @merge_request.closed_event
+      %span
+        Closed by #{@merge_request.closed_event.author_name} 
+        %small #{time_ago_in_words(@merge_request.closed_event.created_at)} ago.
+    %br
 
 
 = render "merge_requests/commits"
diff --git a/app/views/notes/_form.html.haml b/app/views/notes/_form.html.haml
index 33d36eba86c..0bc35eb03c2 100644
--- a/app/views/notes/_form.html.haml
+++ b/app/views/notes/_form.html.haml
@@ -25,9 +25,9 @@
     .span8
       %h5 Attachment:
       .clearfix
-        .attachments.entry
+        .attachments
           %div.file_name File name...
-          %button.file_upload.btn.primary.small Upload File
+          %button.file_upload.btn.small Upload File
           .input= f.file_field :attachment, :class => "input-file"
         %span Any file less then 10 MB