From 4d0bbd65c2a09d9293d417fc5547a2334bc49c8c Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Sun, 22 Jan 2023 10:43:29 +0100 Subject: [PATCH] Disable more links in various places --- resources/celerity/map.php | 6 +++--- .../controller/DifferentialRevisionViewController.php | 2 +- src/view/phui/PHUICurtainObjectRefView.php | 8 ++++---- src/view/phui/PHUIHeadThingView.php | 4 ++-- webroot/rsrc/css/phui/phui-curtain-object-ref-view.css | 10 +++++++--- 5 files changed, 17 insertions(+), 13 deletions(-) diff --git a/resources/celerity/map.php b/resources/celerity/map.php index ed08bc1d92..d4ebc98ec4 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -9,7 +9,7 @@ return array( 'names' => array( 'conpherence.pkg.css' => '0e3cf785', 'conpherence.pkg.js' => '020aebcf', - 'core.pkg.css' => '0fbedea0', + 'core.pkg.css' => 'f784f26b', 'core.pkg.js' => '74ad315f', 'dark-console.pkg.js' => '187792c2', 'differential.pkg.css' => '32879ab6', @@ -147,7 +147,7 @@ return array( 'rsrc/css/phui/phui-comment-form.css' => '68a2d99a', 'rsrc/css/phui/phui-comment-panel.css' => 'ec4e31c0', 'rsrc/css/phui/phui-crumbs-view.css' => '614f43cf', - 'rsrc/css/phui/phui-curtain-object-ref-view.css' => '12404744', + 'rsrc/css/phui/phui-curtain-object-ref-view.css' => 'b43b7307', 'rsrc/css/phui/phui-curtain-view.css' => '68c5efb6', 'rsrc/css/phui/phui-document-pro.css' => 'b9613a10', 'rsrc/css/phui/phui-document-summary.css' => 'b068eed1', @@ -848,7 +848,7 @@ return array( 'phui-comment-form-css' => '68a2d99a', 'phui-comment-panel-css' => 'ec4e31c0', 'phui-crumbs-view-css' => '614f43cf', - 'phui-curtain-object-ref-view-css' => '12404744', + 'phui-curtain-object-ref-view-css' => 'b43b7307', 'phui-curtain-view-css' => '68c5efb6', 'phui-document-summary-view-css' => 'b068eed1', 'phui-document-view-css' => '52b748a5', diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php index 79b9bd7afb..f885c0350a 100644 --- a/src/applications/differential/controller/DifferentialRevisionViewController.php +++ b/src/applications/differential/controller/DifferentialRevisionViewController.php @@ -711,7 +711,7 @@ final class DifferentialRevisionViewController return id(new PHUIHeadThingView()) ->setImage($image_uri) - ->setImageHref($image_href) + // ->setImageHref($image_href) ->setContent($content); } diff --git a/src/view/phui/PHUICurtainObjectRefView.php b/src/view/phui/PHUICurtainObjectRefView.php index f8a04796ca..70475e2655 100644 --- a/src/view/phui/PHUICurtainObjectRefView.php +++ b/src/view/phui/PHUICurtainObjectRefView.php @@ -135,17 +135,17 @@ final class PHUICurtainObjectRefView if ($image_uri !== null) { $image_view = javelin_tag( - 'a', + 'div', array( 'style' => sprintf('background-image: url(%s)', $image_uri), - 'href' => $target_uri, + // 'href' => $target_uri, 'aural' => false, )); } else if ($icon_view !== null) { $image_view = javelin_tag( - 'a', + 'div', array( - 'href' => $target_uri, + // 'href' => $target_uri, 'class' => 'phui-curtain-object-ref-view-icon-image', 'aural' => false, ), diff --git a/src/view/phui/PHUIHeadThingView.php b/src/view/phui/PHUIHeadThingView.php index 219ed28be0..3651002959 100644 --- a/src/view/phui/PHUIHeadThingView.php +++ b/src/view/phui/PHUIHeadThingView.php @@ -53,11 +53,11 @@ final class PHUIHeadThingView extends AphrontTagView { protected function getTagContent() { $image = javelin_tag( - 'a', + 'span', array( 'class' => 'phui-head-thing-image', 'style' => 'background-image: url('.$this->image.');', - 'href' => $this->imageHref, + // 'href' => $this->imageHref, 'aural' => false, )); diff --git a/webroot/rsrc/css/phui/phui-curtain-object-ref-view.css b/webroot/rsrc/css/phui/phui-curtain-object-ref-view.css index 3becc1ca84..ee5ec22977 100644 --- a/webroot/rsrc/css/phui/phui-curtain-object-ref-view.css +++ b/webroot/rsrc/css/phui/phui-curtain-object-ref-view.css @@ -17,7 +17,8 @@ padding-bottom: 24px; } -.phui-curtain-object-ref-view-image-cell > a { +.phui-curtain-object-ref-view-image-cell > a, +.phui-curtain-object-ref-view-image-cell > div { height: 24px; width: 24px; background-size: 100%; @@ -58,11 +59,14 @@ } .phui-curtain-object-ref-view-with-content > - .phui-curtain-object-ref-view-image-cell > a { + .phui-curtain-object-ref-view-image-cell > a, +.phui-curtain-object-ref-view-with-content > + .phui-curtain-object-ref-view-image-cell > div { margin-top: 4px; } -.phui-curtain-object-ref-view-title-cell > a { +.phui-curtain-object-ref-view-title-cell > a, +.phui-curtain-object-ref-view-title-cell > div { color: {$darkgreytext}; }