From 83f1140785ab19f33635a9df419174254d28dee7 Mon Sep 17 00:00:00 2001 From: epriestley Date: Thu, 1 Sep 2011 09:35:35 -0700 Subject: [PATCH] Use text, not icons, to indicate content sources Summary: oh god everyone hates this revert revert https://www.facebook.com/photo.php?fbid=787360256660&set=p.787360256660&type=1&theater (I left the icons themselves since I have some plans to do other things with them.) Test Plan: I am not good at designer Reviewers: ola, elynde, bh, ashwin, jungejason, kdelong, zrait, tomo, aran Reviewed By: aran CC: aran, epriestley, tomo Differential Revision: 885 --- src/__celerity_resource_map__.php | 2 +- .../view/PhabricatorContentSourceView.php | 17 ++++++------- .../contentsource/content-source-view.css | 25 ------------------- 3 files changed, 8 insertions(+), 36 deletions(-) diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php index 7ecff1e3cd..c61d7fab4b 100644 --- a/src/__celerity_resource_map__.php +++ b/src/__celerity_resource_map__.php @@ -1180,7 +1180,7 @@ celerity_register_resource_map(array( ), 'phabricator-content-source-view-css' => array( - 'uri' => '/res/7147f14c/rsrc/css/application/contentsource/content-source-view.css', + 'uri' => '/res/361cae20/rsrc/css/application/contentsource/content-source-view.css', 'type' => 'css', 'requires' => array( diff --git a/src/applications/metamta/contentsource/view/PhabricatorContentSourceView.php b/src/applications/metamta/contentsource/view/PhabricatorContentSourceView.php index 02b83c7d68..5018b27eb8 100644 --- a/src/applications/metamta/contentsource/view/PhabricatorContentSourceView.php +++ b/src/applications/metamta/contentsource/view/PhabricatorContentSourceView.php @@ -35,13 +35,12 @@ final class PhabricatorContentSourceView extends AphrontView { public function render() { require_celerity_resource('phabricator-content-source-view-css'); - $type = null; $map = array( - PhabricatorContentSource::SOURCE_WEB => 'web', - PhabricatorContentSource::SOURCE_CONDUIT => 'conduit', - PhabricatorContentSource::SOURCE_EMAIL => 'email', - PhabricatorContentSource::SOURCE_MOBILE => 'mobile', - PhabricatorContentSource::SOURCE_TABLET => 'tablet', + PhabricatorContentSource::SOURCE_WEB => 'Web', + PhabricatorContentSource::SOURCE_CONDUIT => 'Conduit', + PhabricatorContentSource::SOURCE_EMAIL => 'Email', + PhabricatorContentSource::SOURCE_MOBILE => 'Mobile', + PhabricatorContentSource::SOURCE_TABLET => 'Tablet', ); $source = $this->contentSource->getSource(); @@ -51,14 +50,12 @@ final class PhabricatorContentSourceView extends AphrontView { return; } - $type_class = 'phabricator-content-source-'.$type; - return phutil_render_tag( 'span', array( - 'class' => "phabricator-content-source-view {$type_class}", + 'class' => "phabricator-content-source-view", ), - 'Via'); + "Via {$type}"); } } diff --git a/webroot/rsrc/css/application/contentsource/content-source-view.css b/webroot/rsrc/css/application/contentsource/content-source-view.css index 9ab0da3c07..09ee5aac3d 100644 --- a/webroot/rsrc/css/application/contentsource/content-source-view.css +++ b/webroot/rsrc/css/application/contentsource/content-source-view.css @@ -3,30 +3,5 @@ */ .phabricator-content-source-view { - padding: 2px 20px 2px 0; - font-size: 11px; color: #888888; - font-weight: normal; - background: no-repeat right center; - position: relative; -} - -.phabricator-content-source-web { - background-image: url(/rsrc/image/icon/fatcow/source/web.png); -} - -.phabricator-content-source-email { - background-image: url(/rsrc/image/icon/fatcow/source/email.png); -} - -.phabricator-content-source-conduit { - background-image: url(/rsrc/image/icon/fatcow/source/conduit.png); -} - -.phabricator-content-source-mobile { - background-image: url(/rsrc/image/icon/fatcow/source/mobile.png); -} - -.phabricator-content-source-tablet { - background-image: url(/rsrc/image/icon/fatcow/source/tablet.png); }