diff --git a/app/assets/stylesheets/design/main.scss b/app/assets/stylesheets/design/main.scss index d2742971c..840e4c987 100644 --- a/app/assets/stylesheets/design/main.scss +++ b/app/assets/stylesheets/design/main.scss @@ -1674,49 +1674,48 @@ table.tablesorter.tracker td.td0{ padding-right: 0px; } +table.tablesorter.tracker .td3-pull { + min-width: 130px; +} + table.tablesorter.tracker td.td3{ - min-width: 110px; padding-top: 10px; + .code { + height: 23px; + width: 15px; + background: #FFF; + color: #009fe3; + border: 1px solid #83d1f2; + font-size: 16px; + padding: 5px 0px 0px 5px; + margin-right: 3px; + cursor: pointer; + } + .avatar { + margin-right: 8px; + cursor: pointer; + } + .answers { + height: 28px; + background: #FFF; + color: #009fe3; + border: 1px solid #83d1f2; + font-size: 16px; + cursor: pointer; + .pic { + float: left; + margin: 2px; + margin-top: 6px; + } + .count { + float: left; + margin: 4px 5px 0px 2px; + } + } } -table.tablesorter.tracker td.td3 div.code { - height: 23px; - width: 15px; - background: #FFF; - color: #009fe3; - border: 1px solid #83d1f2; - font-size: 16px; - padding: 5px 0px 0px 5px; +.tablesorter.tracker .td3 > a { float: left; - margin-right: 3px; - cursor: pointer; -} - -table.tablesorter.tracker td.td3 div.avatar { - float: left; - margin-right: 8px; - cursor: pointer; -} - -table.tablesorter.tracker td.td3 div.answers { - height: 28px; - background: #FFF; - color: #009fe3; - border: 1px solid #83d1f2; - font-size: 16px; - float: left; - cursor: pointer; -} - -table.tablesorter.tracker td.td3 div.answers div.pic { - float: left; - margin: 2px; - margin-top: 6px; -} - -table.tablesorter.tracker td.td3 div.answers div.count { - float: left; - margin: 4px 5px 0px 2px; } table.tablesorter.tracker div.smalltext { diff --git a/app/views/projects/issues/_issue.html.haml b/app/views/projects/issues/_issue.html.haml index 3d2d0025e..2795d61c2 100644 --- a/app/views/projects/issues/_issue.html.haml +++ b/app/views/projects/issues/_issue.html.haml @@ -1,4 +1,4 @@ --path = polymorphic_path [@project, issue.pull_request ? issue.pull_request : issue] +- path = polymorphic_path [@project, issue.pull_request ? issue.pull_request : issue] %tr#row1{:name => "row", :class => issue.labels.map(&:name).compact} %td.td0 @@ -15,14 +15,11 @@ .left.nomargin .label.selected.tracker.left .labeltext.selected{:style => "background: ##{label.color};"}=label.name - %td.td3 - -if issue.pull_request + %td.td3{:class => (issue.pull_request ? 'td3-pull' : '')} + - if issue.pull_request %a{:href => path} .code # - .avatar - =link_to image_tag(avatar_url(issue.assignee), :alt => 'avatar'), user_path(issue.assignee) if issue.assignee - %a{:href => "#{path}#block-list"} - .answers - .pic= image_tag 'answers.png' - .count=issue.comments.count - .both + = link_to image_tag(avatar_url(issue.assignee), :alt => 'avatar', :class => 'avatar'), user_path(issue.assignee) if issue.assignee + %a.answers{:href => "#{path}#block-list"} + = image_tag 'answers.png', :class => 'pic' + .count= issue.comments.count \ No newline at end of file