summaryrefslogtreecommitdiff
path: root/app/views/issues
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-01-04 23:35:31 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-01-04 23:35:31 +0200
commitc6298678f5032823130f5b2eb6fc1810cbb01a10 (patch)
tree62f9dc24d979bfdddf7420e239fb6c2a21b0704e /app/views/issues
parent14d0ef8f37b68c0911edfb197581bb7e818b1e50 (diff)
downloadgitlab-ce-c6298678f5032823130f5b2eb6fc1810cbb01a10.tar.gz
use ui-box as for all
Diffstat (limited to 'app/views/issues')
-rw-r--r--app/views/issues/_form.html.haml29
-rw-r--r--app/views/issues/show.html.haml10
2 files changed, 20 insertions, 19 deletions
diff --git a/app/views/issues/_form.html.haml b/app/views/issues/_form.html.haml
index 030f797c088..02b11b53a95 100644
--- a/app/views/issues/_form.html.haml
+++ b/app/views/issues/_form.html.haml
@@ -6,26 +6,27 @@
- @issue.errors.full_messages.each do |msg|
%span= msg
%br
- .issue_form_box
- .issue_title
+ .ui-box.ui-box-show
+ .ui-box-head
.clearfix
= f.label :title do
%strong= "Subject *"
.input
= f.text_field :title, maxlength: 255, class: "xxlarge js-gfm-input", autofocus: true, required: true
- .issue_middle_block
- .issue_assignee
- = f.label :assignee_id do
- %i.icon-user
- Assign to
- .input= f.select(:assignee_id, @project.users.all.collect {|p| [ p.name, p.id ] }, { include_blank: "Select a user" }, {class: 'chosen'})
- .issue_milestone
- = f.label :milestone_id do
- %i.icon-time
- Milestone
- .input= f.select(:milestone_id, @project.milestones.active.all.collect {|p| [ p.title, p.id ] }, { include_blank: "Select milestone" }, {class: 'chosen'})
+ .ui-box-body
+ .clearfix
+ .issue_assignee.pull-left
+ = f.label :assignee_id do
+ %i.icon-user
+ Assign to
+ .input= f.select(:assignee_id, @project.users.all.collect {|p| [ p.name, p.id ] }, { include_blank: "Select a user" }, {class: 'chosen'})
+ .issue_milestone.pull-left
+ = f.label :milestone_id do
+ %i.icon-time
+ Milestone
+ .input= f.select(:milestone_id, @project.milestones.active.all.collect {|p| [ p.title, p.id ] }, { include_blank: "Select milestone" }, {class: 'chosen'})
- .issue_description
+ .ui-box-bottom
.clearfix
= f.label :label_list do
%i.icon-tag
diff --git a/app/views/issues/show.html.haml b/app/views/issues/show.html.haml
index 1d4d6a13c2b..544817192ab 100644
--- a/app/views/issues/show.html.haml
+++ b/app/views/issues/show.html.haml
@@ -24,14 +24,14 @@
&larr; To issues list
-.main_box
- .top_box_content
+.ui-box.ui-box-show
+ .ui-box-head
%h4.box-title
- if @issue.closed
.error.status_info Closed
= gfm escape_once(@issue.title)
- .middle_box_content
+ .ui-box-body
%cite.cgray
Created by #{link_to_member(@project, @issue.author)}
- if @issue.assignee
@@ -44,13 +44,13 @@
.right
- @issue.labels.each do |label|
- %span.label.label-issue
+ %span
%i.icon-tag
= label.name
&nbsp;
- if @issue.description.present?
- .bottom_box_content
+ .ui-box-bottom
= preserve do
= markdown @issue.description