deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed firefox css bug with issues table

Browse source
This commit is contained in:
randx 2012-07-28 05:43:34 +03:00
parent 058b71edf3
commit e8261313a7
3 changed files with 42 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
app/assets/stylesheets/sections/issues.scss
View file

@ -51,25 +51,51 @@
input.check_all_issues { input.check_all_issues {
float:left; float:left;
padding: 8px 0; padding: 0;
margin: 14px 0; margin:0;
margin-right: 10px; margin-right: 10px;
position: relative;
top: 8px;
height: 22px;
}
.issues_content {
.title {
height: 40px;
}
} }
#issues-table-holder { #issues-table-holder {
.issues_filters {
form {
padding:0;
margin:0;
margin-top:7px
}
}
.issues_bulk_update { .issues_bulk_update {
padding: 0 5px;
margin: 0; margin: 0;
form { form {
padding:0;
margin:0; margin:0;
padding-bottom:5px; margin-top:7px
} }
.update_selected_issues { .update_selected_issues {
position:relative; position:relative;
top:-2px; top:-2px;
margin-left:3px; margin-left:4px;
float:left;
} }
.update_issues_text {
padding:3px;
line-height: 18px;
float:left;
}
}
}
} #update_status {
width:100px;
} }

1
app/views/issues/_show.html.haml
View file

@ -1,4 +1,5 @@
%li.wll{ :id => dom_id(issue), :class => issue_css_classes(issue), :url => project_issue_path(issue.project, issue) } %li.wll{ :id => dom_id(issue), :class => issue_css_classes(issue), :url => project_issue_path(issue.project, issue) }
- if controller.controller_name == 'issues'
.issue_check .issue_check
= check_box_tag dom_id(issue,"selected"), nil, false, 'data-id' => issue.id, :class => "selected_issue", :disabled => !can?(current_user, :modify_issue, issue) = check_box_tag dom_id(issue,"selected"), nil, false, 'data-id' => issue.id, :class => "selected_issue", :disabled => !can?(current_user, :modify_issue, issue)
.right .right

4
app/views/issues/index.html.haml
View file

@ -22,8 +22,8 @@
.issues_bulk_update.hide .issues_bulk_update.hide
= form_tag bulk_update_project_issues_path(@project), :method => :post do = form_tag bulk_update_project_issues_path(@project), :method => :post do
%span Update selected issues with %span.update_issues_text Update selected issues with  
  .left
= select_tag('update[status]', options_for_select(['open', 'closed']), :prompt => "Status") = select_tag('update[status]', options_for_select(['open', 'closed']), :prompt => "Status")
= select_tag('update[assignee_id]', options_from_collection_for_select(@project.users.all, "id", "name", params[:assignee_id]), :prompt => "Assignee") = select_tag('update[assignee_id]', options_from_collection_for_select(@project.users.all, "id", "name", params[:assignee_id]), :prompt => "Assignee")
= select_tag('update[milestone_id]', options_from_collection_for_select(@project.milestones.order("id desc").all, "id", "title", params[:milestone_id]), :prompt => "Milestone") = select_tag('update[milestone_id]', options_from_collection_for_select(@project.milestones.order("id desc").all, "id", "title", params[:milestone_id]), :prompt => "Milestone")