diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 0a7bec4047..11c5817c0c 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -79,7 +79,7 @@ return array( 'rsrc/css/application/paste/paste.css' => 'aa1767d1', 'rsrc/css/application/people/people-profile.css' => 'ba7b2762', 'rsrc/css/application/phame/phame.css' => '19ecc703', - 'rsrc/css/application/pholio/pholio-edit.css' => '90616955', + 'rsrc/css/application/pholio/pholio-edit.css' => '3ad9d1ee', 'rsrc/css/application/pholio/pholio-inline-comments.css' => '3d5a5590', 'rsrc/css/application/pholio/pholio.css' => 'e94312dd', 'rsrc/css/application/phortune/phortune-credit-card-form.css' => 'b25b4beb', @@ -749,7 +749,7 @@ return array( 'phabricator-zindex-css' => 'efb673ac', 'phame-css' => '19ecc703', 'pholio-css' => 'e94312dd', - 'pholio-edit-css' => '90616955', + 'pholio-edit-css' => '3ad9d1ee', 'pholio-inline-comments-css' => '3d5a5590', 'phortune-credit-card-form' => '2290aeef', 'phortune-credit-card-form-css' => 'b25b4beb', diff --git a/src/applications/pholio/controller/PholioMockEditController.php b/src/applications/pholio/controller/PholioMockEditController.php index 0261979fa0..d6e1cccf1e 100644 --- a/src/applications/pholio/controller/PholioMockEditController.php +++ b/src/applications/pholio/controller/PholioMockEditController.php @@ -57,7 +57,7 @@ final class PholioMockEditController extends PholioController { } $e_name = true; - $e_images = true; + $e_images = count($mock_images) ? null : true; $errors = array(); $posted_mock_images = array(); diff --git a/webroot/rsrc/css/application/pholio/pholio-edit.css b/webroot/rsrc/css/application/pholio/pholio-edit.css index 1faf06028c..3a91f0256d 100644 --- a/webroot/rsrc/css/application/pholio/pholio-edit.css +++ b/webroot/rsrc/css/application/pholio/pholio-edit.css @@ -24,6 +24,10 @@ overflow: hidden; } +.device .pholio-thumb-box { + width: 100%; +} + .device-desktop .pholio-thumb-box { /* Provide room for the draggable grip. */ margin-left: 12px; @@ -44,6 +48,10 @@ padding: 8px; } +.device .pholio-thumb-frame { + width: 100%; +} + .pholio-thumb-title { padding: 4px 8px; font-weight: bold; @@ -102,6 +110,11 @@ color: {$greytext}; } +.device .pholio-edit-drop { + /* For now, no uploading from devices. */ + display: none; +} + .pholio-uploaded-image.pholio-drop-active, .pholio-edit-drop.pholio-drop-active { border-style: solid;