From 7c609229a943e7abfbacdf3e965549aca1b2c706 Mon Sep 17 00:00:00 2001 From: Chad Little Date: Tue, 24 Feb 2015 09:41:37 -0800 Subject: [PATCH] Fix Maniphest Reports scrolling issues Summary: Fixes T7099, also picked some new colors. Raphael can bind the graph to a dom element, which resolved the scrolling issue. Test Plan: Tested scrolling on my laptop, desktop. Seems resolved. Reviewers: epriestley, btrahan Reviewed By: btrahan Subscribers: Korvin, epriestley Maniphest Tasks: T7099 Differential Revision: https://secure.phabricator.com/D11879 --- resources/celerity/map.php | 28 +++++++++---------- .../rsrc/css/application/maniphest/report.css | 15 ++++------ .../maniphest/behavior-line-chart.js | 4 +-- 3 files changed, 22 insertions(+), 25 deletions(-) diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 274d381076..a18b4868e7 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,7 +7,7 @@ */ return array( 'names' => array( - 'core.pkg.css' => '552f7834', + 'core.pkg.css' => '0b9ca9d2', 'core.pkg.js' => '23d653bb', 'darkconsole.pkg.js' => '8ab24e01', 'differential.pkg.css' => '380f07e5', @@ -72,7 +72,7 @@ return array( 'rsrc/css/application/herald/herald.css' => '826075fa', 'rsrc/css/application/home/home.css' => 'e34bf140', 'rsrc/css/application/maniphest/batch-editor.css' => '8f380ebc', - 'rsrc/css/application/maniphest/report.css' => '6fc16517', + 'rsrc/css/application/maniphest/report.css' => 'd8ed71ad', 'rsrc/css/application/maniphest/task-edit.css' => '8e23031b', 'rsrc/css/application/maniphest/task-summary.css' => 'ab2fc691', 'rsrc/css/application/objectselector/object-selector.css' => '029a133d', @@ -127,7 +127,7 @@ return array( 'rsrc/css/phui/phui-button.css' => 'ffe12633', 'rsrc/css/phui/phui-crumbs-view.css' => '594d719e', 'rsrc/css/phui/phui-document.css' => '8240b0b1', - 'rsrc/css/phui/phui-error-view.css' => 'ad042fdd', + 'rsrc/css/phui/phui-error-view.css' => '41518665', 'rsrc/css/phui/phui-feed-story.css' => 'c9f3a0b5', 'rsrc/css/phui/phui-fontkit.css' => '9b345998', 'rsrc/css/phui/phui-form-view.css' => '8b78a986', @@ -138,7 +138,7 @@ return array( 'rsrc/css/phui/phui-info-panel.css' => '27ea50a1', 'rsrc/css/phui/phui-list.css' => '53deb25c', 'rsrc/css/phui/phui-object-box.css' => 'b8b7fd78', - 'rsrc/css/phui/phui-object-item-list-view.css' => '86e05b7c', + 'rsrc/css/phui/phui-object-item-list-view.css' => '12cfa14f', 'rsrc/css/phui/phui-pinboard-view.css' => '3dd4a269', 'rsrc/css/phui/phui-property-list-view.css' => '51480060', 'rsrc/css/phui/phui-remarkup-preview.css' => '19ad512b', @@ -391,7 +391,7 @@ return array( 'rsrc/js/application/herald/herald-rule-editor.js' => '7ebaeed3', 'rsrc/js/application/maniphest/behavior-batch-editor.js' => 'f24f3253', 'rsrc/js/application/maniphest/behavior-batch-selector.js' => '7b98d7c5', - 'rsrc/js/application/maniphest/behavior-line-chart.js' => 'b07b009f', + 'rsrc/js/application/maniphest/behavior-line-chart.js' => '88f0c5b3', 'rsrc/js/application/maniphest/behavior-list-edit.js' => 'a9f88de2', 'rsrc/js/application/maniphest/behavior-subpriorityeditor.js' => '84845b5b', 'rsrc/js/application/maniphest/behavior-transaction-controls.js' => '44168bad', @@ -596,7 +596,7 @@ return array( 'javelin-behavior-konami' => '5bc2cb21', 'javelin-behavior-launch-icon-composer' => '48086888', 'javelin-behavior-lightbox-attachments' => 'f8ba29d7', - 'javelin-behavior-line-chart' => 'b07b009f', + 'javelin-behavior-line-chart' => '88f0c5b3', 'javelin-behavior-load-blame' => '42126667', 'javelin-behavior-maniphest-batch-editor' => 'f24f3253', 'javelin-behavior-maniphest-batch-selector' => '7b98d7c5', @@ -701,7 +701,7 @@ return array( 'javelin-workflow' => '84d6aea0', 'lightbox-attachment-css' => '7acac05d', 'maniphest-batch-editor' => '8f380ebc', - 'maniphest-report-css' => '6fc16517', + 'maniphest-report-css' => 'd8ed71ad', 'maniphest-task-edit-css' => '8e23031b', 'maniphest-task-summary-css' => 'ab2fc691', 'multirow-row-manager' => 'b5d57730', @@ -780,7 +780,7 @@ return array( 'phui-calendar-month-css' => 'a92e47d2', 'phui-crumbs-view-css' => '594d719e', 'phui-document-view-css' => '8240b0b1', - 'phui-error-view-css' => 'ad042fdd', + 'phui-error-view-css' => '41518665', 'phui-feed-story-css' => 'c9f3a0b5', 'phui-font-icon-base-css' => '3dad2ae3', 'phui-fontkit-css' => '9b345998', @@ -792,7 +792,7 @@ return array( 'phui-info-panel-css' => '27ea50a1', 'phui-list-view-css' => '53deb25c', 'phui-object-box-css' => 'b8b7fd78', - 'phui-object-item-list-view-css' => '86e05b7c', + 'phui-object-item-list-view-css' => '12cfa14f', 'phui-pinboard-view-css' => '3dd4a269', 'phui-property-list-view-css' => '51480060', 'phui-remarkup-preview-css' => '19ad512b', @@ -1491,6 +1491,11 @@ return array( 'javelin-stratcom', 'javelin-dom', ), + '88f0c5b3' => array( + 'javelin-behavior', + 'javelin-dom', + 'javelin-vector', + ), '8a41885b' => array( 'javelin-install', 'javelin-dom', @@ -1638,11 +1643,6 @@ return array( 'javelin-util', 'phabricator-prefab', ), - 'b07b009f' => array( - 'javelin-behavior', - 'javelin-dom', - 'javelin-vector', - ), 'b1f0ccee' => array( 'javelin-install', 'javelin-dom', diff --git a/webroot/rsrc/css/application/maniphest/report.css b/webroot/rsrc/css/application/maniphest/report.css index 0da5632217..0209eba181 100644 --- a/webroot/rsrc/css/application/maniphest/report.css +++ b/webroot/rsrc/css/application/maniphest/report.css @@ -4,26 +4,23 @@ table.aphront-table-view tr.aggregate, table.aphront-table-view tr.alt-aggregate { - background: #bb5577; + font-size: 13px; + font-weight: bold; } table.aphront-table-view tr.month, table.aphront-table-view tr.alt-month { - background: #ee77aa; -} - -table.aphront-table-view tr.week, -table.aphront-table-view tr.alt-week { - background: #ffccdd; + background: {$backdrop}; + font-weight: bold; } span.red { - color: #aa0000; + color: {$red}; font-weight: bold; } span.green { - color: #00aa00; + color: {$green}; font-weight: bold; } diff --git a/webroot/rsrc/js/application/maniphest/behavior-line-chart.js b/webroot/rsrc/js/application/maniphest/behavior-line-chart.js index 058e5db174..6e66b19d2c 100644 --- a/webroot/rsrc/js/application/maniphest/behavior-line-chart.js +++ b/webroot/rsrc/js/application/maniphest/behavior-line-chart.js @@ -13,7 +13,7 @@ JX.behavior('line-chart', function(config) { var mx = 60; var my = 30; - var r = Raphael(p.x, p.y, d.x, d.y); + var r = new Raphael(h, d.x, d.y); var l = r.linechart( mx, my, @@ -25,7 +25,7 @@ JX.behavior('line-chart', function(config) { axis: '0 0 1 1', shade: true, gutter: 1, - colors: config.colors || ['#d06'] + colors: config.colors || ['#2980b9'] }); function format(value, type) {