From 13464cc568039f489c466a669c0ac5bded446bc4 Mon Sep 17 00:00:00 2001 From: Chad Little Date: Thu, 9 May 2013 16:09:29 -0700 Subject: [PATCH] Clean up inline edit ui Summary: Fixes the button spacing issue (doesn't seem related to forms?) and moves fonts and sizes over to Helvetica. Test Plan: Submit many inline comments. Reviewers: epriestley, btrahan Reviewed By: epriestley CC: aran, Korvin Differential Revision: https://secure.phabricator.com/D5882 --- src/__celerity_resource_map__.php | 32 +++++++++---------- .../DifferentialInlineCommentEditView.php | 2 +- .../differential/changeset-view.css | 22 ++++++------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php index 1f0434bbb0..15a590e516 100644 --- a/src/__celerity_resource_map__.php +++ b/src/__celerity_resource_map__.php @@ -949,7 +949,7 @@ celerity_register_resource_map(array( ), 'differential-changeset-view-css' => array( - 'uri' => '/res/ea694162/rsrc/css/application/differential/changeset-view.css', + 'uri' => '/res/8ee213f4/rsrc/css/application/differential/changeset-view.css', 'type' => 'css', 'requires' => array( @@ -4111,7 +4111,7 @@ celerity_register_resource_map(array( 'uri' => '/res/pkg/4ccfeb47/darkconsole.pkg.js', 'type' => 'js', ), - '19d2a41f' => + 'dd27a69b' => array( 'name' => 'differential.pkg.css', 'symbols' => @@ -4130,7 +4130,7 @@ celerity_register_resource_map(array( 11 => 'differential-local-commits-view-css', 12 => 'inline-comment-summary-css', ), - 'uri' => '/res/pkg/19d2a41f/differential.pkg.css', + 'uri' => '/res/pkg/dd27a69b/differential.pkg.css', 'type' => 'css', ), '27c55b30' => @@ -4254,21 +4254,21 @@ celerity_register_resource_map(array( 'aphront-tokenizer-control-css' => '56e0b740', 'aphront-tooltip-css' => '56e0b740', 'aphront-typeahead-control-css' => '56e0b740', - 'differential-changeset-view-css' => '19d2a41f', - 'differential-core-view-css' => '19d2a41f', + 'differential-changeset-view-css' => 'dd27a69b', + 'differential-core-view-css' => 'dd27a69b', 'differential-inline-comment-editor' => '27c55b30', - 'differential-local-commits-view-css' => '19d2a41f', - 'differential-results-table-css' => '19d2a41f', - 'differential-revision-add-comment-css' => '19d2a41f', - 'differential-revision-comment-css' => '19d2a41f', - 'differential-revision-comment-list-css' => '19d2a41f', - 'differential-revision-history-css' => '19d2a41f', - 'differential-revision-list-css' => '19d2a41f', - 'differential-table-of-contents-css' => '19d2a41f', + 'differential-local-commits-view-css' => 'dd27a69b', + 'differential-results-table-css' => 'dd27a69b', + 'differential-revision-add-comment-css' => 'dd27a69b', + 'differential-revision-comment-css' => 'dd27a69b', + 'differential-revision-comment-list-css' => 'dd27a69b', + 'differential-revision-history-css' => 'dd27a69b', + 'differential-revision-list-css' => 'dd27a69b', + 'differential-table-of-contents-css' => 'dd27a69b', 'diffusion-commit-view-css' => 'c8ce2d88', 'diffusion-icons-css' => 'c8ce2d88', 'global-drag-and-drop-css' => '56e0b740', - 'inline-comment-summary-css' => '19d2a41f', + 'inline-comment-summary-css' => 'dd27a69b', 'javelin-aphlict' => '26980a1c', 'javelin-behavior' => '7d174323', 'javelin-behavior-aphlict-dropdown' => '26980a1c', @@ -4343,7 +4343,7 @@ celerity_register_resource_map(array( 'maniphest-task-summary-css' => '6b1fccc6', 'maniphest-transaction-detail-css' => '6b1fccc6', 'phabricator-busy' => '26980a1c', - 'phabricator-content-source-view-css' => '19d2a41f', + 'phabricator-content-source-view-css' => 'dd27a69b', 'phabricator-core-buttons-css' => '56e0b740', 'phabricator-core-css' => '56e0b740', 'phabricator-crumbs-view-css' => '56e0b740', @@ -4365,7 +4365,7 @@ celerity_register_resource_map(array( 'phabricator-notification-css' => '56e0b740', 'phabricator-notification-menu-css' => '56e0b740', 'phabricator-object-item-list-view-css' => '56e0b740', - 'phabricator-object-selector-css' => '19d2a41f', + 'phabricator-object-selector-css' => 'dd27a69b', 'phabricator-phtize' => '26980a1c', 'phabricator-prefab' => '26980a1c', 'phabricator-project-tag-css' => '6b1fccc6', diff --git a/src/applications/differential/view/DifferentialInlineCommentEditView.php b/src/applications/differential/view/DifferentialInlineCommentEditView.php index 03328191a9..672d945e4e 100644 --- a/src/applications/differential/view/DifferentialInlineCommentEditView.php +++ b/src/applications/differential/view/DifferentialInlineCommentEditView.php @@ -125,7 +125,7 @@ final class DifferentialInlineCommentEditView extends AphrontView { $this->renderChildren()); $edit = phutil_tag( - 'edit', + 'div', array( 'class' => 'differential-inline-comment-edit-buttons', ), diff --git a/webroot/rsrc/css/application/differential/changeset-view.css b/webroot/rsrc/css/application/differential/changeset-view.css index 65e0fd3163..d28cd047b5 100644 --- a/webroot/rsrc/css/application/differential/changeset-view.css +++ b/webroot/rsrc/css/application/differential/changeset-view.css @@ -174,8 +174,8 @@ td.cov-X { .differential-diff td.show-more, .differential-diff td.differential-shield { - font-family: "Verdana"; - font-size: 11px; + font-family: "Helvetica Neue", "Arial", sans-serif; + font-size: 12px; white-space: normal; } @@ -211,8 +211,8 @@ td.cov-X { .differential-meta-notice { border: 1px solid #ffdd99; background: #ffeeaa; - font-family: "Verdana"; - font-size: 11px; + font-family: "Helvetica Neue", "Arial", sans-serif; + font-size: 12px; padding: 1em; margin: 0 0 6px 0; } @@ -236,8 +236,8 @@ td.cov-X { .differential-inline-comment-edit { background: #f9f9f1; border: 1px solid #aaaa88; - font-family: Verdana; - font-size: 11px; + font-family: "Helvetica Neue", "Arial", sans-serif; + font-size: 12px; margin: 6px 0px; padding: 8px 10px; width: 100%; @@ -290,7 +290,7 @@ td.cov-X { .differential-inline-comment-edit-textarea { - width: 99%; + width: 100%; height: 12em; } @@ -355,7 +355,7 @@ td.cov-X { text-align: center; background: #ffeeaa; margin: 3px 0 1px; - font: 11px "Verdana"; + font: 12px; color: 444444; } @@ -364,11 +364,12 @@ td.cov-X { } .differential-inline-comment-edit { - padding: 8px 18px 8px 12px; + padding: 10px; } .differential-inline-comment-edit-buttons { - padding: 2px 0px; + padding: 5px 0 0 0; + } .differential-inline-comment-edit-buttons button { @@ -379,7 +380,6 @@ td.cov-X { .differential-inline-comment-edit-title { font-weight: bold; color: #333333; - border-bottom: 1px solid #ccccaa; padding-bottom: 2px; margin-bottom: 6px; }