From 8bbed7974d62295434f6d1c87b6cd318a46b91d0 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Tue, 6 Dec 2016 21:22:01 -0800
Subject: [PATCH] Fix some form layout issues in settings

Summary: Form inputs with just text or certain selects had extra space. This uses better text centering.

Test Plan: Review forms on all Settings pages, Custom Policy, Herald.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D17005
---
 resources/celerity/map.php                  | 10 +++++-----
 webroot/rsrc/css/phui/phui-comment-form.css |  2 +-
 webroot/rsrc/css/phui/phui-form-view.css    | 10 ++++------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 23f8c3e110..68f15bd71c 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,7 +9,7 @@ return array(
   'names' => array(
     'conpherence.pkg.css' => '0b64e988',
     'conpherence.pkg.js' => '6249a1cf',
-    'core.pkg.css' => '58d21331',
+    'core.pkg.css' => '37566cc9',
     'core.pkg.js' => 'e4260032',
     'darkconsole.pkg.js' => 'e7393ebb',
     'differential.pkg.css' => 'a4ba74b5',
@@ -131,7 +131,7 @@ return array(
     'rsrc/css/phui/phui-button.css' => '4a5fbe3d',
     'rsrc/css/phui/phui-chart.css' => '6bf6f78e',
     'rsrc/css/phui/phui-cms.css' => 'be43c8a8',
-    'rsrc/css/phui/phui-comment-form.css' => '4ecc56ef',
+    'rsrc/css/phui/phui-comment-form.css' => 'c953b75e',
     'rsrc/css/phui/phui-comment-panel.css' => 'f50152ad',
     'rsrc/css/phui/phui-crumbs-view.css' => '195ac419',
     'rsrc/css/phui/phui-curtain-view.css' => '947bf1a4',
@@ -140,7 +140,7 @@ return array(
     'rsrc/css/phui/phui-document.css' => 'c32e8dec',
     'rsrc/css/phui/phui-feed-story.css' => '44a9c8e9',
     'rsrc/css/phui/phui-fontkit.css' => '9cda225e',
-    'rsrc/css/phui/phui-form-view.css' => '3fadd537',
+    'rsrc/css/phui/phui-form-view.css' => 'cd79ff6a',
     'rsrc/css/phui/phui-form.css' => '2342b0e5',
     'rsrc/css/phui/phui-head-thing.css' => 'fd311e5f',
     'rsrc/css/phui/phui-header-view.css' => '6ec8f155',
@@ -844,7 +844,7 @@ return array(
     'phui-calendar-month-css' => '8e10e92c',
     'phui-chart-css' => '6bf6f78e',
     'phui-cms-css' => 'be43c8a8',
-    'phui-comment-form-css' => '4ecc56ef',
+    'phui-comment-form-css' => 'c953b75e',
     'phui-comment-panel-css' => 'f50152ad',
     'phui-crumbs-view-css' => '195ac419',
     'phui-curtain-view-css' => '947bf1a4',
@@ -855,7 +855,7 @@ return array(
     'phui-font-icon-base-css' => '870a7360',
     'phui-fontkit-css' => '9cda225e',
     'phui-form-css' => '2342b0e5',
-    'phui-form-view-css' => '3fadd537',
+    'phui-form-view-css' => 'cd79ff6a',
     'phui-head-thing-view-css' => 'fd311e5f',
     'phui-header-view-css' => '6ec8f155',
     'phui-hovercard' => '1bd28176',
diff --git a/webroot/rsrc/css/phui/phui-comment-form.css b/webroot/rsrc/css/phui/phui-comment-form.css
index 505ea17359..b529c83d9c 100644
--- a/webroot/rsrc/css/phui/phui-comment-form.css
+++ b/webroot/rsrc/css/phui/phui-comment-form.css
@@ -107,7 +107,7 @@ body.device .phui-box.phui-object-box.phui-comment-form-view {
 .phui-comment-form-view .phui-comment-action-bar {
   border-bottom: 1px solid {$thinblueborder};
   background-color: rgba(239, 243, 252, .75);
-  padding: 2px 12px 4px 12px;
+  padding: 4px 12px 4px 12px;
   margin-bottom: 16px;
 }
 
diff --git a/webroot/rsrc/css/phui/phui-form-view.css b/webroot/rsrc/css/phui/phui-form-view.css
index 37cf8dfeed..50517fc137 100644
--- a/webroot/rsrc/css/phui/phui-form-view.css
+++ b/webroot/rsrc/css/phui/phui-form-view.css
@@ -154,10 +154,6 @@
   height: 24em;
 }
 
-.aphront-form-control-select .aphront-form-input {
-  padding-top: 2px;
-}
-
 .phui-form-view .aphront-form-caption {
   font-size: {$smallerfontsize};
   color: {$bluetext};
@@ -198,12 +194,14 @@
   margin: .5em 2em;
 }
 
-.aphront-form-control-static .aphront-form-input,
 .aphront-form-control-markup .aphront-form-input {
-  padding-top: 6px;
   font-size: {$normalfontsize};
 }
 
+.aphront-form-control-static .aphront-form-input {
+  line-height: 28px;
+}
+
 .aphront-form-control-togglebuttons .aphront-form-input {
   padding: 2px 0 0 0;
 }