From 5b15f725bd1fc67a1b0d99de581e47b6eb266674 Mon Sep 17 00:00:00 2001 From: Bob Trahan Date: Thu, 13 Dec 2012 10:46:41 -0800 Subject: [PATCH] differntial and diffusion design tweaks Summary: most awesome is that differential-primary-pane no longer has a place in diffusion. less awesome is fixing the zebra striping on differential "Local Commits" view and making the font size of one of the table headers match the others. Test Plan: looks good! Reviewers: epriestley, chad Reviewed By: epriestley CC: aran, Korvin Differential Revision: https://secure.phabricator.com/D4177 --- .../view/DifferentialLocalCommitsView.php | 11 ++++++++++- .../controller/DiffusionChangeController.php | 5 +---- .../controller/DiffusionCommitController.php | 1 - .../application/differential/local-commits-view.css | 2 +- .../css/application/differential/revision-history.css | 3 ++- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/applications/differential/view/DifferentialLocalCommitsView.php b/src/applications/differential/view/DifferentialLocalCommitsView.php index f709e3aa33..cc90fef0c1 100644 --- a/src/applications/differential/view/DifferentialLocalCommitsView.php +++ b/src/applications/differential/view/DifferentialLocalCommitsView.php @@ -41,7 +41,16 @@ final class DifferentialLocalCommitsView extends AphrontView { } $rows = array(); + $highlight = true; foreach ($local as $commit) { + if ($highlight) { + $class = 'alt'; + $highlight = false; + } else { + $class = ''; + $highlight = true; + } + $row = array(); if (idx($commit, 'commit')) { @@ -106,7 +115,7 @@ final class DifferentialLocalCommitsView extends AphrontView { } $row[] = ''.$date.''; - $rows[] = ''.implode('', $row).''; + $rows[] = ''.implode('', $row).''; } diff --git a/src/applications/diffusion/controller/DiffusionChangeController.php b/src/applications/diffusion/controller/DiffusionChangeController.php index 82e8ec4a6b..2f6b0a39fa 100644 --- a/src/applications/diffusion/controller/DiffusionChangeController.php +++ b/src/applications/diffusion/controller/DiffusionChangeController.php @@ -51,10 +51,7 @@ final class DiffusionChangeController extends DiffusionController { // TODO: This is pretty awkward, unify the CSS between Diffusion and // Differential better. require_celerity_resource('differential-core-view-css'); - $content[] = - '
'. - $changeset_view->render(). - '
'; + $content[] = $changeset_view->render(); $nav = $this->buildSideNav('change', true); $nav->appendChild($content); diff --git a/src/applications/diffusion/controller/DiffusionCommitController.php b/src/applications/diffusion/controller/DiffusionCommitController.php index 0e0735379b..323cb7a564 100644 --- a/src/applications/diffusion/controller/DiffusionCommitController.php +++ b/src/applications/diffusion/controller/DiffusionCommitController.php @@ -301,7 +301,6 @@ final class DiffusionCommitController extends DiffusionController { $main_pane = phutil_render_tag( 'div', array( - 'class' => 'differential-primary-pane', 'id' => $pane_id ), $change_list->render(). diff --git a/webroot/rsrc/css/application/differential/local-commits-view.css b/webroot/rsrc/css/application/differential/local-commits-view.css index e185361209..9a415ac623 100644 --- a/webroot/rsrc/css/application/differential/local-commits-view.css +++ b/webroot/rsrc/css/application/differential/local-commits-view.css @@ -14,7 +14,7 @@ padding: 4px 6px; } -.differential-local-commits-table tr td { +.differential-local-commits-table tr.alt td { background: #dcdcdc; } diff --git a/webroot/rsrc/css/application/differential/revision-history.css b/webroot/rsrc/css/application/differential/revision-history.css index 982ebd8d9b..a95d4bf784 100644 --- a/webroot/rsrc/css/application/differential/revision-history.css +++ b/webroot/rsrc/css/application/differential/revision-history.css @@ -9,8 +9,9 @@ } .differential-revision-history-table th { - padding: 0 .5em; color: #666666; + font-size: 11px; + padding: 0 .5em; } .differential-revision-history-table td {