From e8261313a71fb69adeedc15e15fb572282ceaf06 Mon Sep 17 00:00:00 2001 From: randx Date: Sat, 28 Jul 2012 05:43:34 +0300 Subject: [PATCH] Fixed firefox css bug with issues table --- app/assets/stylesheets/sections/issues.scss | 38 +++++++++++++++++---- app/views/issues/_show.html.haml | 5 +-- app/views/issues/index.html.haml | 14 ++++---- 3 files changed, 42 insertions(+), 15 deletions(-) diff --git a/app/assets/stylesheets/sections/issues.scss b/app/assets/stylesheets/sections/issues.scss index 82f180c5..1b61ec3f 100644 --- a/app/assets/stylesheets/sections/issues.scss +++ b/app/assets/stylesheets/sections/issues.scss @@ -51,25 +51,51 @@ input.check_all_issues { float:left; - padding: 8px 0; - margin: 14px 0; + padding: 0; + margin:0; margin-right: 10px; + position: relative; + top: 8px; + height: 22px; +} + +.issues_content { + .title { + height: 40px; + } } #issues-table-holder { + .issues_filters { + form { + padding:0; + margin:0; + margin-top:7px + } + } + .issues_bulk_update { - padding: 0 5px; margin: 0; form { + padding:0; margin:0; - padding-bottom:5px; + margin-top:7px } .update_selected_issues { position:relative; top:-2px; - margin-left:3px; + margin-left:4px; + float:left; } - + .update_issues_text { + padding:3px; + line-height: 18px; + float:left; + } } } + +#update_status { + width:100px; +} diff --git a/app/views/issues/_show.html.haml b/app/views/issues/_show.html.haml index 574777be..37f17370 100644 --- a/app/views/issues/_show.html.haml +++ b/app/views/issues/_show.html.haml @@ -1,6 +1,7 @@ %li.wll{ :id => dom_id(issue), :class => issue_css_classes(issue), :url => project_issue_path(issue.project, issue) } - .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) + - if controller.controller_name == 'issues' + .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) .right - issue.labels.each do |label| %span.label.label-issue.grouped diff --git a/app/views/issues/index.html.haml b/app/views/issues/index.html.haml index f033536e..27eff501 100644 --- a/app/views/issues/index.html.haml +++ b/app/views/issues/index.html.haml @@ -22,13 +22,13 @@ .issues_bulk_update.hide = form_tag bulk_update_project_issues_path(@project), :method => :post do - %span Update selected issues with -   - = 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[milestone_id]', options_from_collection_for_select(@project.milestones.order("id desc").all, "id", "title", params[:milestone_id]), :prompt => "Milestone") - = hidden_field_tag 'update[issues_ids]', [] - = hidden_field_tag :f, params[:f] + %span.update_issues_text Update selected issues with   + .left + = 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[milestone_id]', options_from_collection_for_select(@project.milestones.order("id desc").all, "id", "title", params[:milestone_id]), :prompt => "Milestone") + = hidden_field_tag 'update[issues_ids]', [] + = hidden_field_tag :f, params[:f] = button_tag "Save", :class => "btn update_selected_issues" .issues_filters .left