Download as
Browse Code »

Commit e8261313a71fb69adeedc15e15fb572282ceaf06

Authored by randx
1 parent 058b71ed
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fixed firefox css bug with issues table

Showing 3 changed files with 42 additions and 15 deletions   Show diff stats
app/assets/stylesheets/sections/issues.scss
  Diff comments   View file @e826131
... ... @@ -51,25 +51,51 @@
51 51  
52 52 input.check_all_issues {
53 53 float:left;
54   - padding: 8px 0;
55   - margin: 14px 0;
  54 + padding: 0;
  55 + margin:0;
56 56 margin-right: 10px;
  57 + position: relative;
  58 + top: 8px;
  59 + height: 22px;
  60 +}
  61 +
  62 +.issues_content {
  63 + .title {
  64 + height: 40px;
  65 + }
57 66 }
58 67  
59 68 #issues-table-holder {
  69 + .issues_filters {
  70 + form {
  71 + padding:0;
  72 + margin:0;
  73 + margin-top:7px
  74 + }
  75 + }
  76 +
60 77 .issues_bulk_update {
61   - padding: 0 5px;
62 78 margin: 0;
63 79 form {
  80 + padding:0;
64 81 margin:0;
65   - padding-bottom:5px;
  82 + margin-top:7px
66 83 }
67 84 .update_selected_issues {
68 85 position:relative;
69 86 top:-2px;
70   - margin-left:3px;
  87 + margin-left:4px;
  88 + float:left;
71 89 }
72   -
73 90  
  91 + .update_issues_text {
  92 + padding:3px;
  93 + line-height: 18px;
  94 + float:left;
  95 + }
74 96 }
75 97 }
  98 +
  99 +#update_status {
  100 + width:100px;
  101 +}
... ...
app/views/issues/_show.html.haml
  Diff comments   View file @e826131
1 1 %li.wll{ :id => dom_id(issue), :class => issue_css_classes(issue), :url => project_issue_path(issue.project, issue) }
2   - .issue_check
3   - = check_box_tag dom_id(issue,"selected"), nil, false, 'data-id' => issue.id, :class => "selected_issue", :disabled => !can?(current_user, :modify_issue, issue)
  2 + - if controller.controller_name == 'issues'
  3 + .issue_check
  4 + = check_box_tag dom_id(issue,"selected"), nil, false, 'data-id' => issue.id, :class => "selected_issue", :disabled => !can?(current_user, :modify_issue, issue)
4 5 .right
5 6 - issue.labels.each do |label|
6 7 %span.label.label-issue.grouped
... ...
app/views/issues/index.html.haml
  Diff comments   View file @e826131
... ... @@ -22,13 +22,13 @@
22 22  
23 23 .issues_bulk_update.hide
24 24 = form_tag bulk_update_project_issues_path(@project), :method => :post do
25   - %span Update selected issues with
26   -  
27   - = select_tag('update[status]', options_for_select(['open', 'closed']), :prompt => "Status")
28   - = select_tag('update[assignee_id]', options_from_collection_for_select(@project.users.all, "id", "name", params[:assignee_id]), :prompt => "Assignee")
29   - = select_tag('update[milestone_id]', options_from_collection_for_select(@project.milestones.order("id desc").all, "id", "title", params[:milestone_id]), :prompt => "Milestone")
30   - = hidden_field_tag 'update[issues_ids]', []
31   - = hidden_field_tag :f, params[:f]
  25 + %span.update_issues_text Update selected issues with  
  26 + .left
  27 + = select_tag('update[status]', options_for_select(['open', 'closed']), :prompt => "Status")
  28 + = select_tag('update[assignee_id]', options_from_collection_for_select(@project.users.all, "id", "name", params[:assignee_id]), :prompt => "Assignee")
  29 + = select_tag('update[milestone_id]', options_from_collection_for_select(@project.milestones.order("id desc").all, "id", "title", params[:milestone_id]), :prompt => "Milestone")
  30 + = hidden_field_tag 'update[issues_ids]', []
  31 + = hidden_field_tag :f, params[:f]
32 32 = button_tag "Save", :class => "btn update_selected_issues"
33 33 .issues_filters
34 34 .left
... ...