recaptime.dev / phorge
@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.) hq.recaptime.dev/wiki/Phorge
phorge phabricator
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Remove 'setShadow' from PHUIBoxView

Summary: Removes setShadow, uses setBorder instead

Test Plan: Tested multicolumn, feed, search box, many other areas. Things look less 3d.

Reviewers: epriestley, btrahan

Reviewed By: epriestley

CC: Korvin, epriestley, aran

Differential Revision: https://secure.phabricator.com/D8192

Chad Little 1ac28a71 18308680

+40 -60
+4 -4
resources/celerity/map.php
··· 26 26 'rsrc/css/aphront/error-view.css' => '16cd9949', 27 27 'rsrc/css/aphront/lightbox-attachment.css' => '686f8885', 28 28 'rsrc/css/aphront/list-filter-view.css' => 'ef989c67', 29 - 'rsrc/css/aphront/multi-column.css' => '05bbd016', 29 + 'rsrc/css/aphront/multi-column.css' => '6f7573f0', 30 30 'rsrc/css/aphront/notification.css' => '6901121e', 31 31 'rsrc/css/aphront/pager-view.css' => '2e3539af', 32 32 'rsrc/css/aphront/panel-view.css' => '5846dfa2', ··· 126 126 'rsrc/css/layout/phabricator-side-menu-view.css' => '503699d0', 127 127 'rsrc/css/layout/phabricator-source-code-view.css' => '62a99814', 128 128 'rsrc/css/layout/phabricator-timeline-view.css' => 'f4f846c4', 129 - 'rsrc/css/phui/phui-box.css' => '21da4d8c', 129 + 'rsrc/css/phui/phui-box.css' => '6c21bd6a', 130 130 'rsrc/css/phui/phui-button.css' => '8784a966', 131 131 'rsrc/css/phui/phui-document.css' => '143b2ac8', 132 132 'rsrc/css/phui/phui-feed-story.css' => '3a59c2cf', ··· 483 483 'aphront-dialog-view-css' => 'dd9db96c', 484 484 'aphront-error-view-css' => '16cd9949', 485 485 'aphront-list-filter-view-css' => 'ef989c67', 486 - 'aphront-multi-column-view-css' => '05bbd016', 486 + 'aphront-multi-column-view-css' => '6f7573f0', 487 487 'aphront-notes' => '6acadd3f', 488 488 'aphront-pager-view-css' => '2e3539af', 489 489 'aphront-panel-view-css' => '5846dfa2', ··· 737 737 'phortune-credit-card-form-css' => 'b25b4beb', 738 738 'phrequent-css' => 'ffc185ad', 739 739 'phriction-document-css' => 'b0309d8e', 740 - 'phui-box-css' => '21da4d8c', 740 + 'phui-box-css' => '6c21bd6a', 741 741 'phui-button-css' => '8784a966', 742 742 'phui-document-view-css' => '143b2ac8', 743 743 'phui-feed-story-css' => '3a59c2cf',
+1 -1
src/applications/search/controller/PhabricatorApplicationSearchController.php
··· 262 262 $pager_box = id(new PHUIBoxView()) 263 263 ->addPadding(PHUI::PADDING_MEDIUM) 264 264 ->addMargin(PHUI::MARGIN_LARGE) 265 - ->setShadow(true) 265 + ->setBorder(true) 266 266 ->appendChild($pager); 267 267 $nav->appendChild($pager_box); 268 268 }
+1 -1
src/applications/search/controller/PhabricatorSearchController.php
··· 133 133 return id(new PHUIBoxView()) 134 134 ->addMargin(PHUI::MARGIN_LARGE) 135 135 ->addPadding(PHUI::PADDING_LARGE) 136 - ->setShadow(true) 136 + ->setBorder(true) 137 137 ->appendChild($results) 138 138 ->addClass('phabricator-search-result-box'); 139 139 }
+4 -4
src/applications/uiexample/examples/PHUIBoxExample.php
··· 44 44 array( 45 45 id(new PHUIBoxView()) 46 46 ->appendChild($content1) 47 - ->setShadow(true) 47 + ->setBorder(true) 48 48 ->addPadding(PHUI::PADDING_SMALL) 49 49 ->addMargin(PHUI::MARGIN_LARGE_BOTTOM), 50 50 id(new PHUIBoxView()) 51 51 ->appendChild($content2) 52 - ->setShadow(true) 52 + ->setBorder(true) 53 53 ->addPadding(PHUI::PADDING_MEDIUM) 54 54 ->addMargin(PHUI::MARGIN_LARGE_BOTTOM), 55 55 id(new PHUIBoxView()) 56 56 ->appendChild($content3) 57 - ->setShadow(true) 57 + ->setBorder(true) 58 58 ->addPadding(PHUI::PADDING_LARGE) 59 59 ->addMargin(PHUI::MARGIN_LARGE_BOTTOM)); 60 60 ··· 85 85 ->setHeader(pht('Plain Box with space')); 86 86 87 87 $head3 = id(new PHUIHeaderView()) 88 - ->setHeader(pht('Shadow Box with space')); 88 + ->setHeader(pht('Border Box with space')); 89 89 90 90 $head4 = id(new PHUIHeaderView()) 91 91 ->setHeader(pht('PHUIObjectBoxView'));
+6 -6
src/applications/uiexample/examples/PHUIIconExample.php
··· 120 120 ->appendChild($actionview) 121 121 ->addMargin(PHUI::MARGIN_MEDIUM) 122 122 ->addPadding(PHUI::PADDING_SMALL) 123 - ->setShadow(true)); 123 + ->setBorder(true)); 124 124 125 125 $layout2 = 126 126 array( ··· 128 128 ->appendChild(array($person1, $person2, $person3)) 129 129 ->addMargin(PHUI::MARGIN_MEDIUM) 130 130 ->addPadding(PHUI::PADDING_SMALL) 131 - ->setShadow(true)); 131 + ->setBorder(true)); 132 132 133 133 $layout2a = 134 134 array( ··· 136 136 ->appendChild(array($person4, $person5, $person6)) 137 137 ->addMargin(PHUI::MARGIN_MEDIUM) 138 138 ->addPadding(PHUI::PADDING_SMALL) 139 - ->setShadow(true)); 139 + ->setBorder(true)); 140 140 141 141 $layout3 = 142 142 array( ··· 144 144 ->appendChild($tokenview) 145 145 ->addMargin(PHUI::MARGIN_MEDIUM) 146 146 ->addPadding(PHUI::PADDING_SMALL) 147 - ->setShadow(true)); 147 + ->setBorder(true)); 148 148 149 149 $layout4 = 150 150 array( ··· 152 152 ->appendChild(array($card1, $card2, $card3, $card4, $card5)) 153 153 ->addMargin(PHUI::MARGIN_MEDIUM) 154 154 ->addPadding(PHUI::PADDING_MEDIUM) 155 - ->setShadow(true)); 155 + ->setBorder(true)); 156 156 157 157 $layout5 = 158 158 array( ··· 160 160 ->appendChild($loginview) 161 161 ->addMargin(PHUI::MARGIN_MEDIUM) 162 162 ->addPadding(PHUI::PADDING_MEDIUM) 163 - ->setShadow(true)); 163 + ->setBorder(true)); 164 164 165 165 $head1 = id(new PHUIHeaderView()) 166 166 ->setHeader(pht('Action Icons!'));
+5 -5
src/applications/uiexample/examples/PHUIListExample.php
··· 211 211 ->appendChild($unstyled) 212 212 ->addMargin(PHUI::MARGIN_MEDIUM) 213 213 ->addPadding(PHUI::PADDING_SMALL) 214 - ->setShadow(true)); 214 + ->setBorder(true)); 215 215 216 216 $layout2 = 217 217 array( 218 218 id(new PHUIBoxView()) 219 219 ->appendChild($sidenav) 220 220 ->addMargin(PHUI::MARGIN_MEDIUM) 221 - ->setShadow(true)); 221 + ->setBorder(true)); 222 222 223 223 $layout3 = 224 224 array( 225 225 id(new PHUIBoxView()) 226 226 ->appendChild($topnav) 227 227 ->addMargin(PHUI::MARGIN_MEDIUM) 228 - ->setShadow(true)); 228 + ->setBorder(true)); 229 229 230 230 $layout4 = 231 231 array( 232 232 id(new PHUIBoxView()) 233 233 ->appendChild($actionmenu) 234 234 ->addMargin(PHUI::MARGIN_MEDIUM) 235 - ->setShadow(true)); 235 + ->setBorder(true)); 236 236 237 237 $layout5 = 238 238 array( 239 239 id(new PHUIBoxView()) 240 240 ->appendChild($statustabs) 241 241 ->addMargin(PHUI::MARGIN_MEDIUM) 242 - ->setShadow(true)); 242 + ->setBorder(true)); 243 243 244 244 $head1 = id(new PHUIHeaderView()) 245 245 ->setHeader(pht('Unstyled'));
+2 -2
src/applications/uiexample/examples/PHUITextExample.php
··· 70 70 71 71 $layout1 = id(new PHUIBoxView()) 72 72 ->appendChild($content) 73 - ->setShadow(true) 73 + ->setBorder(true) 74 74 ->addPadding(PHUI::PADDING_MEDIUM); 75 75 76 76 $head1 = id(new PHUIHeaderView()) ··· 82 82 83 83 $layout2 = id(new PHUIBoxView()) 84 84 ->appendChild($content2) 85 - ->setShadow(true) 85 + ->setBorder(true) 86 86 ->addPadding(PHUI::PADDING_MEDIUM); 87 87 88 88 $head2 = id(new PHUIHeaderView())
+2 -2
src/applications/uiexample/examples/PhabricatorMultiColumnExample.php
··· 97 97 ->addColumn($friday) 98 98 ->addColumn($saturday) 99 99 ->setFluidLayout(true) 100 - ->setShadow(true); 100 + ->setBorder(true); 101 101 102 102 $shipping = id(new PHUIFormLayoutView()) 103 103 ->setUser($user) ··· 160 160 ->addColumn(hsprintf('<h1>%s</h1>%s', $billing_title, $shipping)) 161 161 ->addColumn(hsprintf('<h1>%s</h1>%s', $cc_title, $cc)) 162 162 ->setFluidLayout(true) 163 - ->setShadow(true); 163 + ->setBorder(true); 164 164 165 165 $wrap1 = phutil_tag( 166 166 'div',
+2 -2
src/applications/uiexample/examples/PhabricatorUIStatusExample.php
··· 48 48 $out[] = id(new PHUIBoxView()) 49 49 ->addMargin(PHUI::MARGIN_LARGE) 50 50 ->addPadding(PHUI::PADDING_LARGE) 51 - ->setShadow(true) 51 + ->setBorder(true) 52 52 ->appendChild($view); 53 53 54 54 ··· 71 71 $out[] = id(new PHUIBoxView()) 72 72 ->addMargin(PHUI::MARGIN_LARGE) 73 73 ->addPadding(PHUI::PADDING_LARGE) 74 - ->setShadow(true) 74 + ->setBorder(true) 75 75 ->appendChild($view); 76 76 77 77 return $out;
+5 -5
src/view/layout/AphrontMultiColumnView.php
··· 10 10 private $fluidLayout = false; 11 11 private $fluidishLayout = false; 12 12 private $gutter; 13 - private $shadow; 13 + private $border; 14 14 15 15 public function addColumn($column) { 16 16 $this->columns[] = $column; ··· 33 33 return $this; 34 34 } 35 35 36 - public function setShadow($shadow) { 37 - $this->shadow = $shadow; 36 + public function setBorder($border) { 37 + $this->border = $border; 38 38 return $this; 39 39 } 40 40 ··· 106 106 ), 107 107 $view); 108 108 109 - if ($this->shadow) { 109 + if ($this->border) { 110 110 $board = id(new PHUIBoxView()) 111 - ->setShadow(true) 111 + ->setBorder(true) 112 112 ->appendChild($board) 113 113 ->addPadding(PHUI::PADDING_MEDIUM_TOP) 114 114 ->addPadding(PHUI::PADDING_MEDIUM_BOTTOM);
-9
src/view/phui/PHUIBoxView.php
··· 4 4 5 5 private $margin = array(); 6 6 private $padding = array(); 7 - private $shadow = false; 8 7 private $border = false; 9 8 10 9 public function addMargin($margin) { ··· 17 16 return $this; 18 17 } 19 18 20 - public function setShadow($shadow) { 21 - $this->shadow = $shadow; 22 - return $this; 23 - } 24 - 25 19 public function setBorder($border) { 26 20 $this->border = $border; 27 21 return $this; ··· 30 24 protected function getTagAttributes() { 31 25 $outer_classes = array(); 32 26 $outer_classes[] = 'phui-box'; 33 - if ($this->shadow) { 34 - $outer_classes[] = 'phui-box-shadow'; 35 - } 36 27 if ($this->border) { 37 28 $outer_classes[] = 'phui-box-border'; 38 29 }
+1 -1
src/view/phui/PHUIFeedStoryView.php
··· 265 265 266 266 return id(new PHUIBoxView()) 267 267 ->addClass(implode(' ', $classes)) 268 - ->setShadow(true) 268 + ->setBorder(true) 269 269 ->addMargin(PHUI::MARGIN_MEDIUM_BOTTOM) 270 270 ->appendChild(array($head, $body, $foot)); 271 271 }
+7 -7
webroot/rsrc/css/aphront/multi-column.css
··· 119 119 vertical-align: top; 120 120 } 121 121 122 - .phui-box-shadow .aphront-multi-column-column-outer { 123 - border-right: 1px solid #e7e7e7; 124 - padding-left: 10px; 125 - padding-right: 10px; 122 + .phui-box-border .aphront-multi-column-column-outer { 123 + border-right: 1px solid {$lightblueborder}; 124 + padding-left: 8px; 125 + padding-right: 8px; 126 126 } 127 127 128 128 .phui-box-shadow .aphront-multi-colum-column-outer-last { ··· 134 134 border: none; 135 135 } 136 136 137 - .device .phui-box-shadow .aphront-multi-column-column-outer { 138 - padding-bottom: 20px; 137 + .device .phui-box-border .aphront-multi-column-column-outer { 138 + padding-bottom: 16px; 139 139 border-bottom: 1px solid #e7e7e7; 140 140 } 141 141 142 - .device .phui-box-shadow .aphront-multi-colum-column-outer-last { 142 + .device .phui-box-border .aphront-multi-colum-column-outer-last { 143 143 border: none; 144 144 padding-bottom: 0; 145 145 }
-11
webroot/rsrc/css/phui/phui-box.css
··· 2 2 * @provides phui-box-css 3 3 */ 4 4 5 - .phui-box-shadow { 6 - border-left: 1px solid #e7e7e7; 7 - border-right: 1px solid #e7e7e7; 8 - border-bottom: 1px solid #c0c5d1; 9 - } 10 - 11 - .phui-box-shadow .phui-box-inner { 12 - background-color: #fff; 13 - box-shadow: 0 1px 2px rgba(0,0,0,0.2); 14 - } 15 - 16 5 .phui-box-border { 17 6 border: 1px solid {$lightblueborder}; 18 7 border-bottom: 1px solid {$blueborder};