From 0cc3cb75597e3624c4ab5113131443e8097173f6 Mon Sep 17 00:00:00 2001 From: epriestley Date: Mon, 30 Jul 2012 11:09:28 -0700 Subject: [PATCH] Remove support for custom logos Summary: - These don't fit anywhere in the new design. - Even if we figure out how to fit them in, 220px logos definitely won't fit on the 320px iPhone screen so anyone who has a custom logo will have to rework them anyway. - Kill it for now, and once we get the new design in and working maybe we can restore it somehow. Test Plan: Loaded local install, no logo. Grepped for config. Reviewers: btrahan, vrana Reviewed By: vrana CC: aran Maniphest Tasks: T1569 Differential Revision: https://secure.phabricator.com/D3101 --- .gitignore | 3 --- conf/default.conf.php | 9 --------- src/view/page/PhabricatorStandardPageView.php | 17 +---------------- .../application/base/standard-page-view.css | 18 ------------------ webroot/rsrc/image/custom/README | 3 --- .../rsrc/image/custom/example_facebook.png | Bin 4826 -> 0 bytes webroot/rsrc/image/custom/example_rainbow.png | Bin 1720 -> 0 bytes .../rsrc/image/custom/example_template.png | Bin 2909 -> 0 bytes 8 files changed, 1 insertion(+), 49 deletions(-) delete mode 100644 webroot/rsrc/image/custom/README delete mode 100644 webroot/rsrc/image/custom/example_facebook.png delete mode 100644 webroot/rsrc/image/custom/example_rainbow.png delete mode 100644 webroot/rsrc/image/custom/example_template.png diff --git a/.gitignore b/.gitignore index 4238818d5b..db3e8a64e2 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,3 @@ # Arcanist scratch directory /.arc - -# Custom Logo File -/webroot/rsrc/image/custom/custom.png diff --git a/conf/default.conf.php b/conf/default.conf.php index 5af1f689ba..7a1fba7add 100644 --- a/conf/default.conf.php +++ b/conf/default.conf.php @@ -56,15 +56,6 @@ return array( 'security.hmac-key' => '[D\t~Y7eNmnQGJ;rnH6aF;m2!vJ8@v8C=Cs:aQS\.Qw', -// -- Customization --------------------------------------------------------- // - - // If you want to use a custom logo (e.g., for your company or organization), - // copy 'webroot/rsrc/image/custom/example_template.png' to - // 'webroot/rsrc/image/custom/custom.png' and set this to the URI you want it - // to link to (like http://www.yourcompany.com/). - 'phabricator.custom.logo' => null, - - // -- Internationalization -------------------------------------------------- // // This allows customizing texts used in Phabricator. The class must extend diff --git a/src/view/page/PhabricatorStandardPageView.php b/src/view/page/PhabricatorStandardPageView.php index cb4a88ac30..42c61787b2 100644 --- a/src/view/page/PhabricatorStandardPageView.php +++ b/src/view/page/PhabricatorStandardPageView.php @@ -381,20 +381,6 @@ final class PhabricatorStandardPageView extends AphrontPageView { $admin_class = 'phabricator-admin-page-view'; } - $custom_logo = null; - $with_custom = null; - $custom_conf = PhabricatorEnv::getEnvConfig('phabricator.custom.logo'); - if ($custom_conf) { - $with_custom = 'phabricator-logo-with-custom'; - $custom_logo = phutil_render_tag( - 'a', - array( - 'class' => 'logo-custom', - 'href' => $custom_conf, - ), - ' '); - } - $notification_indicator = ''; $notification_dropdown = ''; $notification_container = ''; @@ -481,8 +467,7 @@ final class PhabricatorStandardPageView extends AphrontPageView { $header_chrome = ''. ''. - ''. $notification_indicator. diff --git a/webroot/rsrc/css/application/base/standard-page-view.css b/webroot/rsrc/css/application/base/standard-page-view.css index 2861d69357..619f884f88 100644 --- a/webroot/rsrc/css/application/base/standard-page-view.css +++ b/webroot/rsrc/css/application/base/standard-page-view.css @@ -53,10 +53,6 @@ width: 220px; } -.phabricator-logo-with-custom { - width: 440px; -} - .phabricator-logo a { display: block; width: 220px; @@ -65,10 +61,6 @@ margin: 0; } -.phabricator-logo a.logo-custom { - position: absolute; - background: url(/rsrc/image/custom/custom.png) no-repeat 0 0; -} .phabricator-logo a.logo-standard { background: url(/rsrc/image/phabricator_logo.png) no-repeat -220px 0; @@ -78,20 +70,10 @@ background-image: url(/rsrc/image/phabricator_logo_admin.png); } -.phabricator-logo-with-custom a.logo-standard { - padding-left: 220px; - background-position: 0 0; -} - .phabricator-logo a.logo-standard:hover { background-position: -220px -40px; } -.phabricator-logo a.logo-custom:hover, -.phabricator-logo-with-custom a.logo-standard:hover { - background-position: 0 -40px; -} - .phabricator-primary-navigation td { padding-left: 10px; padding-right: 10px; diff --git a/webroot/rsrc/image/custom/README b/webroot/rsrc/image/custom/README deleted file mode 100644 index dbe339a3b7..0000000000 --- a/webroot/rsrc/image/custom/README +++ /dev/null @@ -1,3 +0,0 @@ -To customize your Phabricator install's appearance, create a 220x80 PNG like -the examples in this folder, name it "custom.png" in this folder, and then set -'phabricator.custom.logo' to a link URI. diff --git a/webroot/rsrc/image/custom/example_facebook.png b/webroot/rsrc/image/custom/example_facebook.png deleted file mode 100644 index 02bd95ec9b94c7babd89ee0182593e24866ed565..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4826 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 diff --git a/webroot/rsrc/image/custom/example_rainbow.png b/webroot/rsrc/image/custom/example_rainbow.png deleted file mode 100644 index 1cd8ab464d75a8545225e7b61b46828845a2315e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1720 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 Y4cqG2w4NFO-pe3+YX_@xOP{~~3+ktkFaQ7m