@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.

[Redesign] Remove PHUIActionHeaderView

Summary: This adds minor functionality to PHUIHeaderView (icons, tags) that were previously on in ActionHeader. This allows us to remove the PHUIActionHeaderView outright in favor of just one Header class.

Test Plan: Tested each callsite, workboards, hovercards, conpherence.

Reviewers: btrahan, epriestley

Reviewed By: epriestley

Subscribers: Korvin, epriestley

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

+157 -674
+19 -22
resources/celerity/map.php
··· 7 7 */ 8 8 return array( 9 9 'names' => array( 10 - 'core.pkg.css' => '6a6be483', 10 + 'core.pkg.css' => 'a1c3a5c8', 11 11 'core.pkg.js' => 'f3e08b38', 12 12 'darkconsole.pkg.js' => 'e7393ebb', 13 13 'differential.pkg.css' => 'bb338e4b', ··· 51 51 'rsrc/css/application/conpherence/notification.css' => '919974b6', 52 52 'rsrc/css/application/conpherence/transaction.css' => '42a457f6', 53 53 'rsrc/css/application/conpherence/update.css' => '1099a660', 54 - 'rsrc/css/application/conpherence/widget-pane.css' => '2af42ebe', 54 + 'rsrc/css/application/conpherence/widget-pane.css' => '93938744', 55 55 'rsrc/css/application/contentsource/content-source-view.css' => '4b8b05d4', 56 56 'rsrc/css/application/countdown/timer.css' => '86b7b0a0', 57 57 'rsrc/css/application/dashboard/dashboard.css' => 'eb458607', ··· 68 68 'rsrc/css/application/diffusion/diffusion-icons.css' => '9c5828da', 69 69 'rsrc/css/application/diffusion/diffusion-readme.css' => '2106ea08', 70 70 'rsrc/css/application/diffusion/diffusion-source.css' => '66fdf661', 71 - 'rsrc/css/application/feed/feed.css' => 'f1aa8c11', 71 + 'rsrc/css/application/feed/feed.css' => 'b490a135', 72 72 'rsrc/css/application/files/global-drag-and-drop.css' => '697324ad', 73 73 'rsrc/css/application/flag/flag.css' => '5337623f', 74 74 'rsrc/css/application/harbormaster/harbormaster.css' => '49d64eb4', ··· 116 116 'rsrc/css/font/font-source-sans-pro.css' => '8906c07b', 117 117 'rsrc/css/font/phui-font-icon-base.css' => '3dad2ae3', 118 118 'rsrc/css/layout/phabricator-filetree-view.css' => 'fccf9f82', 119 - 'rsrc/css/layout/phabricator-hovercard-view.css' => '44394670', 119 + 'rsrc/css/layout/phabricator-hovercard-view.css' => 'b7a82459', 120 120 'rsrc/css/layout/phabricator-side-menu-view.css' => 'a440478a', 121 121 'rsrc/css/layout/phabricator-source-code-view.css' => '2ceee894', 122 122 'rsrc/css/phui/calendar/phui-calendar-day.css' => '38891735', 123 123 'rsrc/css/phui/calendar/phui-calendar-list.css' => 'c1d0ca59', 124 124 'rsrc/css/phui/calendar/phui-calendar-month.css' => '75e6a2ee', 125 125 'rsrc/css/phui/calendar/phui-calendar.css' => '8675968e', 126 - 'rsrc/css/phui/phui-action-header-view.css' => 'd1cb5f81', 127 126 'rsrc/css/phui/phui-action-list.css' => '4f4d09f2', 128 127 'rsrc/css/phui/phui-action-panel.css' => '3ee9afd5', 129 128 'rsrc/css/phui/phui-box.css' => 'a5bb366d', 130 129 'rsrc/css/phui/phui-button.css' => 'b995182d', 131 130 'rsrc/css/phui/phui-crumbs-view.css' => 'aeff7a21', 132 - 'rsrc/css/phui/phui-document.css' => '7b564cf6', 131 + 'rsrc/css/phui/phui-document.css' => '08059961', 133 132 'rsrc/css/phui/phui-feed-story.css' => 'c9f3a0b5', 134 133 'rsrc/css/phui/phui-fontkit.css' => '1e71371a', 135 134 'rsrc/css/phui/phui-form-view.css' => 'e1abbe8e', 136 135 'rsrc/css/phui/phui-form.css' => 'f535f938', 137 - 'rsrc/css/phui/phui-header-view.css' => '036ca2aa', 136 + 'rsrc/css/phui/phui-header-view.css' => '2ad5de97', 138 137 'rsrc/css/phui/phui-icon.css' => '88ba9081', 139 138 'rsrc/css/phui/phui-image-mask.css' => '5a8b09c8', 140 139 'rsrc/css/phui/phui-info-panel.css' => '27ea50a1', 141 140 'rsrc/css/phui/phui-info-view.css' => '33595731', 142 141 'rsrc/css/phui/phui-list.css' => '2e25ebfb', 143 - 'rsrc/css/phui/phui-object-box.css' => '8d9239e5', 144 - 'rsrc/css/phui/phui-object-item-list-view.css' => '80c3d6fe', 142 + 'rsrc/css/phui/phui-object-box.css' => '23e36d6b', 143 + 'rsrc/css/phui/phui-object-item-list-view.css' => '4f72249b', 145 144 'rsrc/css/phui/phui-pinboard-view.css' => 'eaab2b1b', 146 145 'rsrc/css/phui/phui-property-list-view.css' => 'd2d143ea', 147 146 'rsrc/css/phui/phui-remarkup-preview.css' => '19ad512b', ··· 150 149 'rsrc/css/phui/phui-tag-view.css' => '402691cc', 151 150 'rsrc/css/phui/phui-text.css' => 'cf019f54', 152 151 'rsrc/css/phui/phui-timeline-view.css' => 'a85542c8', 153 - 'rsrc/css/phui/phui-workboard-view.css' => '3279cbbf', 154 - 'rsrc/css/phui/phui-workpanel-view.css' => 'e495a5cc', 152 + 'rsrc/css/phui/phui-workboard-view.css' => '38446bc3', 153 + 'rsrc/css/phui/phui-workpanel-view.css' => '266038ce', 155 154 'rsrc/css/sprite-gradient.css' => '4bdb98a7', 156 155 'rsrc/css/sprite-login.css' => 'a3526809', 157 156 'rsrc/css/sprite-main-header.css' => '28d01b0b', ··· 502 501 'conpherence-thread-manager' => 'b7342ddb', 503 502 'conpherence-transaction-css' => '42a457f6', 504 503 'conpherence-update-css' => '1099a660', 505 - 'conpherence-widget-pane-css' => '2af42ebe', 504 + 'conpherence-widget-pane-css' => '93938744', 506 505 'differential-changeset-view-css' => 'e19cfd6e', 507 506 'differential-core-view-css' => '7ac3cabc', 508 507 'differential-inline-comment-editor' => 'd4c87bf4', ··· 706 705 'phabricator-drag-and-drop-file-upload' => '07de8873', 707 706 'phabricator-draggable-list' => 'a16ec1c6', 708 707 'phabricator-fatal-config-template-css' => '8e6c6fcd', 709 - 'phabricator-feed-css' => 'f1aa8c11', 708 + 'phabricator-feed-css' => 'b490a135', 710 709 'phabricator-file-upload' => '477359c8', 711 710 'phabricator-filetree-view-css' => 'fccf9f82', 712 711 'phabricator-flag-css' => '5337623f', 713 712 'phabricator-hovercard' => '14ac66f5', 714 - 'phabricator-hovercard-view-css' => '44394670', 713 + 'phabricator-hovercard-view-css' => 'b7a82459', 715 714 'phabricator-keyboard-shortcut' => '1ae869f2', 716 715 'phabricator-keyboard-shortcut-manager' => 'c1700f6f', 717 716 'phabricator-main-menu-view' => 'ac574fc3', ··· 754 753 'phortune-css' => '9149f103', 755 754 'phrequent-css' => 'ffc185ad', 756 755 'phriction-document-css' => '0d16bc9a', 757 - 'phui-action-header-view-css' => 'd1cb5f81', 758 756 'phui-action-panel-css' => '3ee9afd5', 759 757 'phui-box-css' => 'a5bb366d', 760 758 'phui-button-css' => 'b995182d', ··· 763 761 'phui-calendar-list-css' => 'c1d0ca59', 764 762 'phui-calendar-month-css' => '75e6a2ee', 765 763 'phui-crumbs-view-css' => 'aeff7a21', 766 - 'phui-document-view-css' => '7b564cf6', 764 + 'phui-document-view-css' => '08059961', 767 765 'phui-feed-story-css' => 'c9f3a0b5', 768 766 'phui-font-icon-base-css' => '3dad2ae3', 769 767 'phui-fontkit-css' => '1e71371a', 770 768 'phui-form-css' => 'f535f938', 771 769 'phui-form-view-css' => 'e1abbe8e', 772 - 'phui-header-view-css' => '036ca2aa', 770 + 'phui-header-view-css' => '2ad5de97', 773 771 'phui-icon-view-css' => '88ba9081', 774 772 'phui-image-mask-css' => '5a8b09c8', 775 773 'phui-info-panel-css' => '27ea50a1', 776 774 'phui-info-view-css' => '33595731', 777 775 'phui-inline-comment-view-css' => '2174771a', 778 776 'phui-list-view-css' => '2e25ebfb', 779 - 'phui-object-box-css' => '8d9239e5', 780 - 'phui-object-item-list-view-css' => '80c3d6fe', 777 + 'phui-object-box-css' => '23e36d6b', 778 + 'phui-object-item-list-view-css' => '4f72249b', 781 779 'phui-pinboard-view-css' => 'eaab2b1b', 782 780 'phui-property-list-view-css' => 'd2d143ea', 783 781 'phui-remarkup-preview-css' => '19ad512b', ··· 786 784 'phui-tag-view-css' => '402691cc', 787 785 'phui-text-css' => 'cf019f54', 788 786 'phui-timeline-view-css' => 'a85542c8', 789 - 'phui-workboard-view-css' => '3279cbbf', 790 - 'phui-workpanel-view-css' => 'e495a5cc', 787 + 'phui-workboard-view-css' => '38446bc3', 788 + 'phui-workpanel-view-css' => '266038ce', 791 789 'phuix-action-list-view' => 'b5c256b8', 792 790 'phuix-action-view' => '8cf6d262', 793 791 'phuix-dropdown-menu' => 'bd4c8dca', ··· 2075 2073 'phabricator-feed-css', 2076 2074 'phabricator-dashboard-css', 2077 2075 'aphront-multi-column-view-css', 2078 - 'phui-action-header-view-css', 2079 2076 'conpherence-durable-column-view', 2080 2077 ), 2081 2078 'core.pkg.js' => array(
-1
resources/celerity/packages.php
··· 139 139 'phabricator-feed-css', 140 140 'phabricator-dashboard-css', 141 141 'aphront-multi-column-view-css', 142 - 'phui-action-header-view-css', 143 142 'conpherence-durable-column-view', 144 143 ), 145 144 'differential.pkg.css' => array(
-4
src/__phutil_library_map__.php
··· 1154 1154 'PHIDLookupConduitAPIMethod' => 'applications/phid/conduit/PHIDLookupConduitAPIMethod.php', 1155 1155 'PHIDQueryConduitAPIMethod' => 'applications/phid/conduit/PHIDQueryConduitAPIMethod.php', 1156 1156 'PHUI' => 'view/phui/PHUI.php', 1157 - 'PHUIActionHeaderExample' => 'applications/uiexample/examples/PHUIActionHeaderExample.php', 1158 - 'PHUIActionHeaderView' => 'view/phui/PHUIActionHeaderView.php', 1159 1157 'PHUIActionPanelExample' => 'applications/uiexample/examples/PHUIActionPanelExample.php', 1160 1158 'PHUIActionPanelView' => 'view/phui/PHUIActionPanelView.php', 1161 1159 'PHUIBoxExample' => 'applications/uiexample/examples/PHUIBoxExample.php', ··· 4484 4482 'PHIDInfoConduitAPIMethod' => 'PHIDConduitAPIMethod', 4485 4483 'PHIDLookupConduitAPIMethod' => 'PHIDConduitAPIMethod', 4486 4484 'PHIDQueryConduitAPIMethod' => 'PHIDConduitAPIMethod', 4487 - 'PHUIActionHeaderExample' => 'PhabricatorUIExample', 4488 - 'PHUIActionHeaderView' => 'AphrontView', 4489 4485 'PHUIActionPanelExample' => 'PhabricatorUIExample', 4490 4486 'PHUIActionPanelView' => 'AphrontTagView', 4491 4487 'PHUIBoxExample' => 'PhabricatorUIExample',
+11 -6
src/applications/conpherence/controller/ConpherenceWidgetController.php
··· 68 68 ->setHref($this->getWidgetURI()) 69 69 ->setMetadata(array('widget' => null)) 70 70 ->addSigil('conpherence-widget-adder'); 71 + $header = javelin_tag( 72 + 'a', 73 + array( 74 + 'href' => '#', 75 + 'sigil' => 'widgets-selector', 76 + ), 77 + pht('Participants')); 78 + 71 79 $widgets[] = phutil_tag( 72 80 'div', 73 81 array( 74 82 'class' => 'widgets-header', 75 83 ), 76 - id(new PHUIActionHeaderView()) 77 - ->setHeaderTitle(pht('Participants')) 78 - ->setHeaderHref('#') 79 - ->setDropdown(true) 80 - ->addAction($new_icon) 81 - ->addHeaderSigil('widgets-selector')); 84 + id(new PHUIHeaderView()) 85 + ->setHeader($header) 86 + ->addActionIcon($new_icon)); 82 87 $user = $this->getRequest()->getUser(); 83 88 // now the widget bodies 84 89 $widgets[] = javelin_tag(
+1 -1
src/applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php
··· 161 161 case self::HEADER_MODE_NORMAL: 162 162 default: 163 163 $header = id(new PHUIHeaderView()) 164 - ->setHeaderTitle($title); 164 + ->setHeader($title); 165 165 break; 166 166 } 167 167 $icon = id(new PHUIIconView())
+2 -2
src/applications/feed/builder/PhabricatorFeedBuilder.php
··· 57 57 phutil_tag_div('phabricator-feed-story-date-separator')); 58 58 } 59 59 $last_date = $date; 60 - $header = new PHUIActionHeaderView(); 61 - $header->setHeaderTitle($date); 60 + $header = new PHUIHeaderView(); 61 + $header->setHeader($date); 62 62 63 63 $null_view->appendChild($header); 64 64 }
+7 -3
src/applications/project/controller/PhabricatorProjectBoardViewController.php
··· 362 362 $project->getName()); 363 363 364 364 $header = id(new PHUIHeaderView()) 365 - ->setHeader(pht('%s Workboard', $header_link)) 365 + ->setHeader($header_link) 366 366 ->setUser($viewer) 367 367 ->setNoBackground(true) 368 368 ->addActionLink($sort_menu) ··· 370 370 ->addActionLink($manage_menu) 371 371 ->setPolicyObject($project); 372 372 373 + $header_box = id(new PHUIBoxView()) 374 + ->appendChild($header) 375 + ->addClass('project-board-header'); 376 + 373 377 $board_box = id(new PHUIBoxView()) 374 378 ->appendChild($board) 375 379 ->addClass('project-board-wrapper'); 376 380 377 381 $nav = $this->buildIconNavView($project); 378 - $nav->appendChild($header); 382 + $nav->appendChild($header_box); 379 383 $nav->appendChild($board_box); 380 384 381 385 return $this->buildApplicationPage( ··· 674 678 } 675 679 676 680 $column_button = id(new PHUIIconView()) 677 - ->setIconFont('fa-caret-down') 681 + ->setIconFont('fa-gear') 678 682 ->setHref('#') 679 683 ->addSigil('boards-dropdown-menu') 680 684 ->setMetadata(
-11
src/applications/project/storage/PhabricatorProjectColumn.php
··· 101 101 102 102 if ($this->isHidden()) { 103 103 $icon = 'fa-eye-slash'; 104 - $text = pht('Hidden'); 105 - } 106 - 107 - if ($icon) { 108 - return id(new PHUIIconView()) 109 - ->setIconFont($icon) 110 - ->addSigil('has-tooltip') 111 - ->setMetadata( 112 - array( 113 - 'tip' => $text, 114 - )); 115 104 } 116 105 117 106 return null;
-270
src/applications/uiexample/examples/PHUIActionHeaderExample.php
··· 1 - <?php 2 - 3 - final class PHUIActionHeaderExample extends PhabricatorUIExample { 4 - 5 - public function getName() { 6 - return 'Action Headers'; 7 - } 8 - 9 - public function getDescription() { 10 - return 'Various header layouts with and without icons'; 11 - } 12 - 13 - public function renderExample() { 14 - 15 - /* Colors */ 16 - $title1 = id(new PHUIHeaderView()) 17 - ->setHeader(pht('Header Plain')); 18 - 19 - $header1 = id(new PHUIActionHeaderView()) 20 - ->setHeaderTitle('Colorless'); 21 - 22 - $header2 = id(new PHUIActionHeaderView()) 23 - ->setHeaderTitle('Light Grey') 24 - ->setHeaderColor(PHUIActionHeaderView::HEADER_GREY); 25 - 26 - $header3 = id(new PHUIActionHeaderView()) 27 - ->setHeaderTitle('Light Blue') 28 - ->setHeaderColor(PHUIActionHeaderView::HEADER_LIGHTBLUE); 29 - 30 - $header4 = id(new PHUIActionHeaderView()) 31 - ->setHeaderTitle('Light Green') 32 - ->setHeaderColor(PHUIActionHeaderView::HEADER_LIGHTGREEN); 33 - 34 - $header5 = id(new PHUIActionHeaderView()) 35 - ->setHeaderTitle('Light Red') 36 - ->setHeaderColor(PHUIActionHeaderView::HEADER_LIGHTRED); 37 - 38 - $header6 = id(new PHUIActionHeaderView()) 39 - ->setHeaderTitle('Light Violet') 40 - ->setHeaderColor(PHUIActionHeaderView::HEADER_LIGHTVIOLET); 41 - 42 - $layout1 = id(new AphrontMultiColumnView()) 43 - ->addColumn($header1) 44 - ->addColumn($header2) 45 - ->addColumn($header3) 46 - ->addColumn($header4) 47 - ->addColumn($header5) 48 - ->addColumn($header6) 49 - ->setFluidLayout(true) 50 - ->setGutter(AphrontMultiColumnView::GUTTER_SMALL); 51 - 52 - $wrap1 = id(new PHUIBoxView()) 53 - ->appendChild($layout1) 54 - ->addMargin(PHUI::MARGIN_LARGE); 55 - 56 - /* Policy Icons */ 57 - $title2 = id(new PHUIHeaderView()) 58 - ->setHeader(pht('With Icons')); 59 - 60 - $header1 = id(new PHUIActionHeaderView()) 61 - ->setHeaderTitle('Quack') 62 - ->setHeaderIcon( 63 - id(new PHUIIconView()) 64 - ->setIconFont('fa-coffee')); 65 - 66 - $header2 = id(new PHUIActionHeaderView()) 67 - ->setHeaderTitle('Moo') 68 - ->setHeaderColor(PHUIActionHeaderView::HEADER_GREY) 69 - ->setHeaderIcon( 70 - id(new PHUIIconView()) 71 - ->setIconFont('fa-magic')); 72 - 73 - $header3 = id(new PHUIActionHeaderView()) 74 - ->setHeaderTitle('Woof') 75 - ->setHeaderColor(PHUIActionHeaderView::HEADER_LIGHTBLUE) 76 - ->setHeaderIcon( 77 - id(new PHUIIconView()) 78 - ->setIconFont('fa-fighter-jet')); 79 - 80 - $header4 = id(new PHUIActionHeaderView()) 81 - ->setHeaderTitle('Buzz') 82 - ->setHeaderColor(PHUIActionHeaderView::HEADER_LIGHTGREEN) 83 - ->setHeaderIcon( 84 - id(new PHUIIconView()) 85 - ->setIconFont('fa-child')); 86 - 87 - $header5 = id(new PHUIActionHeaderView()) 88 - ->setHeaderTitle('Fizz') 89 - ->setHeaderColor(PHUIActionHeaderView::HEADER_LIGHTRED) 90 - ->setHeaderIcon( 91 - id(new PHUIIconView()) 92 - ->setIconFont('fa-car')); 93 - 94 - $header6 = id(new PHUIActionHeaderView()) 95 - ->setHeaderTitle('Blarp') 96 - ->setHeaderColor(PHUIActionHeaderView::HEADER_LIGHTVIOLET) 97 - ->setHeaderIcon( 98 - id(new PHUIIconView()) 99 - ->setIconFont('fa-truck')); 100 - 101 - $layout2 = id(new AphrontMultiColumnView()) 102 - ->addColumn($header1) 103 - ->addColumn($header2) 104 - ->addColumn($header3) 105 - ->addColumn($header4) 106 - ->addColumn($header5) 107 - ->addColumn($header6) 108 - ->setFluidLayout(true) 109 - ->setGutter(AphrontMultiColumnView::GUTTER_SMALL); 110 - 111 - $wrap2 = id(new PHUIBoxView()) 112 - ->appendChild($layout2) 113 - ->addMargin(PHUI::MARGIN_LARGE); 114 - 115 - 116 - /* Action Icons */ 117 - $title3 = id(new PHUIHeaderView()) 118 - ->setHeader(pht('With Action Icons')); 119 - 120 - $action1 = new PHUIIconView(); 121 - $action1->setIconFont('fa-cog'); 122 - $action1->setHref('#'); 123 - 124 - $action2 = new PHUIIconView(); 125 - $action2->setIconFont('fa-heart'); 126 - $action2->setHref('#'); 127 - 128 - $action3 = new PHUIIconView(); 129 - $action3->setIconFont('fa-tag'); 130 - $action3->setHref('#'); 131 - 132 - $action4 = new PHUIIconView(); 133 - $action4->setIconFont('fa-plus'); 134 - $action4->setHref('#'); 135 - 136 - $action5 = new PHUIIconView(); 137 - $action5->setIconFont('fa-search'); 138 - $action5->setHref('#'); 139 - 140 - $action6 = new PHUIIconView(); 141 - $action6->setIconFont('fa-arrows'); 142 - $action6->setHref('#'); 143 - 144 - $header1 = id(new PHUIActionHeaderView()) 145 - ->setHeaderTitle('Company') 146 - ->setHeaderHref('http://example.com/') 147 - ->addAction($action1); 148 - 149 - $header2 = id(new PHUIActionHeaderView()) 150 - ->setHeaderTitle('Public') 151 - ->setHeaderHref('http://example.com/') 152 - ->setHeaderColor(PHUIActionHeaderView::HEADER_GREY) 153 - ->addAction($action1); 154 - 155 - $header3 = id(new PHUIActionHeaderView()) 156 - ->setHeaderTitle('Restricted') 157 - ->setHeaderHref('http://example.com/') 158 - ->setHeaderColor(PHUIActionHeaderView::HEADER_LIGHTBLUE) 159 - ->addAction($action2); 160 - 161 - $header4 = id(new PHUIActionHeaderView()) 162 - ->setHeaderTitle('Company') 163 - ->setHeaderHref('http://example.com/') 164 - ->setHeaderColor(PHUIActionHeaderView::HEADER_LIGHTGREEN) 165 - ->addAction($action3); 166 - 167 - $header5 = id(new PHUIActionHeaderView()) 168 - ->setHeaderTitle('Public') 169 - ->setHeaderHref('http://example.com/') 170 - ->setHeaderColor(PHUIActionHeaderView::HEADER_LIGHTRED) 171 - ->addAction($action4) 172 - ->addAction($action5); 173 - 174 - $header6 = id(new PHUIActionHeaderView()) 175 - ->setHeaderTitle('Restricted') 176 - ->setHeaderHref('http://example.com/') 177 - ->setHeaderColor(PHUIActionHeaderView::HEADER_LIGHTVIOLET) 178 - ->addAction($action6); 179 - 180 - $layout3 = id(new AphrontMultiColumnView()) 181 - ->addColumn($header1) 182 - ->addColumn($header2) 183 - ->addColumn($header3) 184 - ->addColumn($header4) 185 - ->addColumn($header5) 186 - ->addColumn($header6) 187 - ->setFluidLayout(true) 188 - ->setGutter(AphrontMultiColumnView::GUTTER_SMALL); 189 - 190 - $wrap3 = id(new PHUIBoxView()) 191 - ->appendChild($layout3) 192 - ->addMargin(PHUI::MARGIN_LARGE); 193 - 194 - /* Action Icons */ 195 - $title4 = id(new PHUIHeaderView()) 196 - ->setHeader(pht('With Tags')); 197 - 198 - $tag1 = id(new PHUITagView()) 199 - ->setType(PHUITagView::TYPE_STATE) 200 - ->setBackgroundColor(PHUITagView::COLOR_RED) 201 - ->setName('Open'); 202 - 203 - $tag2 = id(new PHUITagView()) 204 - ->setType(PHUITagView::TYPE_STATE) 205 - ->setBackgroundColor(PHUITagView::COLOR_BLUE) 206 - ->setName('Closed'); 207 - 208 - $action1 = new PHUIIconView(); 209 - $action1->setIconFont('fa-flag'); 210 - $action1->setHref('#'); 211 - 212 - $header1 = id(new PHUIActionHeaderView()) 213 - ->setHeaderTitle('Company') 214 - ->setTag($tag2); 215 - 216 - $header2 = id(new PHUIActionHeaderView()) 217 - ->setHeaderTitle('Public') 218 - ->setHeaderColor(PHUIActionHeaderView::HEADER_GREY) 219 - ->addAction($action1) 220 - ->setTag($tag1); 221 - 222 - $header3 = id(new PHUIActionHeaderView()) 223 - ->setHeaderTitle('Restricted') 224 - ->setHeaderColor(PHUIActionHeaderView::HEADER_LIGHTBLUE) 225 - ->setTag($tag2); 226 - 227 - $header4 = id(new PHUIActionHeaderView()) 228 - ->setHeaderTitle('Company') 229 - ->setHeaderColor(PHUIActionHeaderView::HEADER_LIGHTGREEN) 230 - ->setTag($tag1); 231 - 232 - $header5 = id(new PHUIActionHeaderView()) 233 - ->setHeaderTitle('Public') 234 - ->setHeaderColor(PHUIActionHeaderView::HEADER_LIGHTRED) 235 - ->setTag($tag2); 236 - 237 - $header6 = id(new PHUIActionHeaderView()) 238 - ->setHeaderTitle('Restricted') 239 - ->setHeaderColor(PHUIActionHeaderView::HEADER_LIGHTVIOLET) 240 - ->setTag($tag1); 241 - 242 - $layout4 = id(new AphrontMultiColumnView()) 243 - ->addColumn($header1) 244 - ->addColumn($header2) 245 - ->addColumn($header3) 246 - ->addColumn($header4) 247 - ->addColumn($header5) 248 - ->addColumn($header6) 249 - ->setFluidLayout(true) 250 - ->setGutter(AphrontMultiColumnView::GUTTER_SMALL); 251 - 252 - $wrap4 = id(new PHUIBoxView()) 253 - ->appendChild($layout4) 254 - ->addMargin(PHUI::MARGIN_LARGE); 255 - 256 - return phutil_tag( 257 - 'div', 258 - array(), 259 - array( 260 - $title1, 261 - $wrap1, 262 - $title2, 263 - $wrap2, 264 - $title3, 265 - $wrap3, 266 - $title4, 267 - $wrap4, 268 - )); 269 - } 270 - }
+2 -9
src/view/AphrontDialogView.php
··· 12 12 private $class; 13 13 private $renderAsForm = true; 14 14 private $formID; 15 - private $headerColor = PHUIActionHeaderView::HEADER_WHITE; 16 15 private $footers = array(); 17 16 private $isStandalone; 18 17 private $method = 'POST'; ··· 128 127 129 128 public function setWidth($width) { 130 129 $this->width = $width; 131 - return $this; 132 - } 133 - 134 - public function setHeaderColor($color) { 135 - $this->headerColor = $color; 136 130 return $this; 137 131 } 138 132 ··· 300 294 ); 301 295 } 302 296 303 - $header = new PHUIActionHeaderView(); 304 - $header->setHeaderTitle($this->title); 305 - $header->setHeaderColor($this->headerColor); 297 + $header = new PHUIHeaderView(); 298 + $header->setHeader($this->title); 306 299 307 300 $footer = null; 308 301 if ($this->footers) {
-181
src/view/phui/PHUIActionHeaderView.php
··· 1 - <?php 2 - 3 - final class PHUIActionHeaderView extends AphrontView { 4 - 5 - const HEADER_GREY = 'grey'; 6 - const HEADER_DARK_GREY = 'dark-grey'; 7 - const HEADER_LIGHTGREEN = 'lightgreen'; 8 - const HEADER_LIGHTRED = 'lightred'; 9 - const HEADER_LIGHTVIOLET = 'lightviolet'; 10 - const HEADER_LIGHTBLUE ='lightblue'; 11 - const HEADER_WHITE = 'white'; 12 - 13 - private $headerTitle; 14 - private $headerSubtitle; 15 - private $headerHref; 16 - private $headerIcon; 17 - private $headerSigils = array(); 18 - private $actions = array(); 19 - private $headerColor; 20 - private $tag = null; 21 - private $dropdown; 22 - 23 - public function setDropdown($dropdown) { 24 - $this->dropdown = $dropdown; 25 - return $this; 26 - } 27 - 28 - public function addAction(PHUIIconView $action) { 29 - $this->actions[] = $action; 30 - return $this; 31 - } 32 - 33 - public function setTag(PHUITagView $tag) { 34 - $this->tag = $tag; 35 - return $this; 36 - } 37 - 38 - public function setHeaderTitle($header) { 39 - $this->headerTitle = $header; 40 - return $this; 41 - } 42 - 43 - public function setHeaderSubtitle($subtitle) { 44 - $this->headerSubtitle = $subtitle; 45 - return $this; 46 - } 47 - 48 - public function setHeaderHref($href) { 49 - $this->headerHref = $href; 50 - return $this; 51 - } 52 - 53 - public function addHeaderSigil($sigil) { 54 - $this->headerSigils[] = $sigil; 55 - return $this; 56 - } 57 - 58 - public function setHeaderIcon(PHUIIconView $icon) { 59 - $this->headerIcon = $icon; 60 - return $this; 61 - } 62 - 63 - public function setHeaderColor($color) { 64 - $this->headerColor = $color; 65 - return $this; 66 - } 67 - 68 - private function getIconColor() { 69 - switch ($this->headerColor) { 70 - case self::HEADER_GREY: 71 - return 'lightgreytext'; 72 - case self::HEADER_DARK_GREY: 73 - return 'lightgreytext'; 74 - case self::HEADER_LIGHTGREEN: 75 - return 'bluegrey'; 76 - case self::HEADER_LIGHTRED: 77 - return 'bluegrey'; 78 - case self::HEADER_LIGHTVIOLET: 79 - return 'bluegrey'; 80 - case self::HEADER_LIGHTBLUE: 81 - return 'bluegrey'; 82 - } 83 - } 84 - 85 - public function render() { 86 - 87 - require_celerity_resource('phui-action-header-view-css'); 88 - 89 - $classes = array(); 90 - $classes[] = 'phui-action-header'; 91 - 92 - if ($this->headerColor) { 93 - $classes[] = 'sprite-gradient'; 94 - $classes[] = 'gradient-'.$this->headerColor.'-header'; 95 - } 96 - 97 - if ($this->dropdown) { 98 - $classes[] = 'dropdown'; 99 - } 100 - 101 - $action_list = array(); 102 - if (nonempty($this->actions)) { 103 - foreach ($this->actions as $action) { 104 - $action->addClass($this->getIconColor()); 105 - $action_list[] = phutil_tag( 106 - 'li', 107 - array( 108 - 'class' => 'phui-action-header-icon-item', 109 - ), 110 - $action); 111 - } 112 - } 113 - 114 - if ($this->tag) { 115 - $action_list[] = phutil_tag( 116 - 'li', 117 - array( 118 - 'class' => 'phui-action-header-icon-item', 119 - ), 120 - $this->tag); 121 - } 122 - 123 - $header_icon = null; 124 - if ($this->headerIcon) { 125 - $header_icon = $this->headerIcon; 126 - } 127 - 128 - $header_title = $this->headerTitle; 129 - if ($this->headerHref) { 130 - $header_title = javelin_tag( 131 - 'a', 132 - array( 133 - 'class' => 'phui-action-header-link', 134 - 'href' => $this->headerHref, 135 - 'sigil' => implode(' ', $this->headerSigils), 136 - ), 137 - $this->headerTitle); 138 - } 139 - 140 - $header_subtitle = null; 141 - if ($this->headerSubtitle) { 142 - $header_subtitle = phutil_tag( 143 - 'span', 144 - array( 145 - 'class' => 'phui-action-header-subtitle', 146 - ), 147 - $this->headerSubtitle); 148 - } 149 - 150 - $header = phutil_tag( 151 - 'h3', 152 - array( 153 - 'class' => 'phui-action-header-title', 154 - ), 155 - array( 156 - $header_icon, 157 - $header_title, 158 - $header_subtitle, 159 - )); 160 - 161 - $icons = ''; 162 - if (nonempty($action_list)) { 163 - $icons = phutil_tag( 164 - 'ul', 165 - array( 166 - 'class' => 'phui-action-header-icon-list', 167 - ), 168 - $action_list); 169 - } 170 - 171 - return phutil_tag( 172 - 'div', 173 - array( 174 - 'class' => implode(' ', $classes), 175 - ), 176 - array( 177 - $header, 178 - $icons, 179 - )); 180 - } 181 - }
-1
src/view/phui/PHUIDocumentView.php
··· 25 25 } 26 26 27 27 public function setHeader(PHUIHeaderView $header) { 28 - $header->setHeaderColor(PHUIActionHeaderView::HEADER_WHITE); 29 28 $this->header = $header; 30 29 return $this; 31 30 }
+26 -16
src/view/phui/PHUIHeaderView.php
··· 11 11 private $imageURL = null; 12 12 private $subheader; 13 13 private $headerColor; 14 + private $headerIcon; 14 15 private $noBackground; 15 16 private $bleedHeader; 16 17 private $properties = array(); ··· 62 63 63 64 public function setHeaderColor($color) { 64 65 $this->headerColor = $color; 66 + return $this; 67 + } 68 + 69 + public function setHeaderIcon($icon) { 70 + $this->headerIcon = $icon; 65 71 return $this; 66 72 } 67 73 ··· 148 154 } 149 155 150 156 if ($this->headerColor) { 151 - $classes[] = 'sprite-gradient'; 152 - $classes[] = 'gradient-'.$this->headerColor.'-header'; 157 + $classes[] = 'phui-header-'.$this->headerColor; 153 158 } 154 159 155 160 if ($this->properties || $this->policyObject || $this->subheader) { ··· 205 210 $this->buttonBar); 206 211 } 207 212 208 - if ($this->actionIcons) { 213 + if ($this->actionIcons || $this->tags) { 209 214 $action_list = array(); 210 - foreach ($this->actionIcons as $icon) { 215 + if ($this->actionIcons) { 216 + foreach ($this->actionIcons as $icon) { 217 + $action_list[] = phutil_tag( 218 + 'li', 219 + array( 220 + 'class' => 'phui-header-list-icon', 221 + ), 222 + $icon); 223 + } 224 + } 225 + if ($this->tags) { 211 226 $action_list[] = phutil_tag( 212 227 'li', 213 228 array( 214 - 'class' => 'phui-header-list-icon', 229 + 'class' => 'phui-header-list-icon phui-header-tags', 215 230 ), 216 - $icon); 231 + array_interleave(' ', $this->tags)); 217 232 } 218 233 $header[] = phutil_tag( 219 234 'ul', ··· 223 238 $action_list); 224 239 } 225 240 241 + if ($this->headerIcon) { 242 + $icon = id(new PHUIIconView()) 243 + ->setIconFont($this->headerIcon); 244 + $header[] = $icon; 245 + } 226 246 $header[] = $this->header; 227 247 228 248 if ($this->objectName) { ··· 235 255 ), 236 256 $this->objectName), 237 257 ' '); 238 - } 239 - 240 - if ($this->tags) { 241 - $header[] = ' '; 242 - $header[] = phutil_tag( 243 - 'span', 244 - array( 245 - 'class' => 'phui-header-tags', 246 - ), 247 - array_interleave(' ', $this->tags)); 248 258 } 249 259 250 260 if ($this->subheader) {
+1 -6
src/view/phui/PHUIObjectBoxView.php
··· 154 154 155 155 require_celerity_resource('phui-object-box-css'); 156 156 157 - 158 - // TODO: (redesign-2015) For now going to override this by hand instead of hunting 159 - // down all call sites. This is mostly to prove the design will work 160 - // then do the legwork before re-merging to master. 157 + $header_color = null; 161 158 if ($this->headerColor) { 162 159 $header_color = $this->headerColor; 163 - } else { 164 - $header_color = PHUIActionHeaderView::HEADER_WHITE; 165 160 } 166 161 167 162 if ($this->header) {
+6 -6
src/view/phui/PHUIWorkpanelView.php
··· 6 6 private $header; 7 7 private $subheader = null; 8 8 private $footerAction; 9 - private $headerColor = PHUIActionHeaderView::HEADER_GREY; 9 + private $headerColor; 10 10 private $headerActions = array(); 11 11 private $headerTag; 12 12 private $headerIcon; ··· 77 77 $footer_tag); 78 78 } 79 79 80 - $header = id(new PHUIActionHeaderView()) 81 - ->setHeaderTitle($this->header) 82 - ->setHeaderSubtitle($this->subheader) 80 + $header = id(new PHUIHeaderView()) 81 + ->setHeader($this->header) 82 + ->setSubheader($this->subheader) 83 83 ->setHeaderColor($this->headerColor); 84 84 85 85 if ($this->headerIcon) { ··· 87 87 } 88 88 89 89 if ($this->headerTag) { 90 - $header->setTag($this->headerTag); 90 + $header->addTag($this->headerTag); 91 91 } 92 92 93 93 foreach ($this->headerActions as $action) { 94 - $header->addAction($action); 94 + $header->addActionIcon($action); 95 95 } 96 96 97 97 $classes[] = 'phui-workpanel-'.$this->headerColor;
+3 -3
src/view/widget/hovercard/PhabricatorHovercardView.php
··· 73 73 $handle->getTypeName(), 74 74 $this->title ? $this->title : $handle->getName()); 75 75 76 - $header = new PHUIActionHeaderView(); 76 + $header = new PHUIHeaderView(); 77 77 $header->setHeaderColor($this->color); 78 - $header->setHeaderTitle($title); 78 + $header->setHeader($title); 79 79 if ($this->tags) { 80 80 foreach ($this->tags as $tag) { 81 - $header->setTag($tag); 81 + $header->addTag($tag); 82 82 } 83 83 } 84 84
+4 -3
webroot/rsrc/css/application/conpherence/widget-pane.css
··· 46 46 border: 0; 47 47 } 48 48 49 - .conpherence-widget-pane .widgets-header { 50 - border-bottom: 1px solid {$thinblueborder}; 49 + .conpherence-widget-pane .widgets-header .phui-header-view { 50 + padding: 8px; 51 + font-size: 14px; 51 52 } 52 53 53 54 .device .conpherence-widget-pane .widgets-header { ··· 58 59 float: none; 59 60 height: 0px; 60 61 width: 0px; 61 - margin-right: 0px; 62 + margin: 7px 0 0 4px; 62 63 border-top-color: #000; 63 64 } 64 65
+9 -18
webroot/rsrc/css/application/feed/feed.css
··· 12 12 overflow-x: auto; 13 13 } 14 14 15 - .phabricator-feed-frame .phui-action-header-title { 16 - font-size: 16px; 17 - margin-bottom: 5px; 18 - } 19 - 20 15 .device-desktop .phabricator-feed-frame { 21 16 max-width: 600px; 22 17 margin: 16px; 23 - } 24 - 25 - .phabricator-feed-frame .phui-action-header { 26 - padding: 0; 27 18 } 28 19 29 20 .phabricator-feed-story-date-separator { ··· 59 50 max-width: none; 60 51 } 61 52 62 - .dashboard-pane .phabricator-feed-frame .phui-action-header { 63 - background: #f7f7f7; 53 + .dashboard-pane .phabricator-feed-frame .phui-header-shell { 54 + padding: 0; 64 55 } 65 56 66 - .dashboard-pane .phabricator-feed-frame .phui-action-header-title { 57 + .dashboard-pane .phabricator-feed-frame .phui-header-view { 67 58 font-size: 13px; 68 - margin-left: 12px; 59 + margin-left: 4px; 69 60 padding: 8px 0; 70 61 margin-bottom: 0; 71 62 color: {$bluetext}; 72 - font-weight: bold; 63 + font-weight: 500; 73 64 } 74 65 75 66 .dashboard-pane .phabricator-feed-frame .phui-feed-story { 76 67 border: none; 77 68 border-bottom: 1px solid {$thinblueborder}; 78 - margin: 0 8px; 69 + margin: 0; 79 70 } 80 71 81 72 .dashboard-pane .phabricator-feed-frame .phui-feed-story-head { 82 - padding: 12px 0; 73 + padding: 12px 4px; 83 74 } 84 75 85 76 .dashboard-pane .phabricator-feed-frame .phui-feed-story-body { 86 - margin: 12px 0; 77 + margin: 12px 4px; 87 78 } 88 79 89 80 .dashboard-pane .phabricator-feed-frame .phui-feed-story-foot { 90 81 background: #fff; 91 - padding: 12px 0; 82 + padding: 12px 4px; 92 83 } 93 84 94 85 .dashboard-pane .phabricator-feed-frame
+4 -4
webroot/rsrc/css/layout/phabricator-hovercard-view.css
··· 29 29 border-bottom: 1px solid {$thinblueborder}; 30 30 } 31 31 32 - .phabricator-hovercard-head .phui-action-header { 33 - border-top-right-radius: 3px; 34 - border-top-left-radius: 3px; 32 + .phabricator-hovercard-head .phui-header-view { 33 + padding: 8px; 35 34 } 36 35 37 36 .phabricator-hovercard-head .phui-tag-type-state { 38 - color: {$bluetext}; 37 + color: {$darkbluetext}; 39 38 text-shadow: none; 39 + font-weight: normal; 40 40 } 41 41 42 42 .phabricator-hovercard-tags {
-85
webroot/rsrc/css/phui/phui-action-header-view.css
··· 1 - /** 2 - * @provides phui-action-header-view-css 3 - */ 4 - 5 - .phui-action-header { 6 - padding: 0 5px 0 8px; 7 - overflow: hidden; 8 - } 9 - 10 - .phui-action-header-title { 11 - color: #000; 12 - float: left; 13 - font-size: 15px; 14 - font-weight: normal; 15 - line-height: 15px; 16 - padding: 12px 0; 17 - white-space: nowrap; 18 - } 19 - 20 - .gradient-lightblue-header .phui-action-header-title { 21 - color: {$darkbluetext}; 22 - } 23 - 24 - .phui-action-header-icon-list { 25 - float: right; 26 - padding-top: 4px; 27 - } 28 - 29 - .phui-action-header-icon-item { 30 - float: right; 31 - padding-left: 4px; 32 - } 33 - 34 - .phui-action-header-icon-item .phui-icon-view { 35 - display: inline-block; 36 - font-size: 18px; 37 - margin: 4px 0; 38 - height: 18px; 39 - width: 18px; 40 - } 41 - 42 - .phui-action-header-icon-item .phui-tag-view { 43 - margin: 4px 2px 0; 44 - display: inline-block; 45 - } 46 - 47 - .phui-action-header-link { 48 - color: #000; 49 - } 50 - 51 - .phui-action-header.gradient-white-header { 52 - background: #fff; 53 - } 54 - 55 - .phui-action-header.gradient-white-header .phui-action-header-title { 56 - color: {$darkbluetext}; 57 - padding: 12px 0 12px 4px; 58 - } 59 - 60 - .phui-action-header.gradient-white-header 61 - .phui-action-header-icon-list .phui-icon-view { 62 - color: {$lightbluetext}; 63 - } 64 - 65 - .phui-action-header.gradient-white-header 66 - .phui-action-header-icon-list .phui-icon-view:hover { 67 - color: {$darkbluetext}; 68 - } 69 - 70 - .phui-action-header-icon-list .phui-tag-view { 71 - font-weight: normal; 72 - } 73 - 74 - .phui-action-header-title .phui-icon-view { 75 - float: left; 76 - height: 16px; 77 - width: 16px; 78 - margin-right: 4px; 79 - } 80 - 81 - .phui-action-header-title .phui-action-header-subtitle { 82 - margin-left: 4px; 83 - font-weight: normal; 84 - color: {$lightgreytext}; 85 - }
+4
webroot/rsrc/css/phui/phui-document.css
··· 8 8 position: relative; 9 9 } 10 10 11 + .phui-document-view .phui-header-shell { 12 + padding: 0 12px; 13 + } 14 + 11 15 .phui-document-content { 12 16 border-radius: 3px; 13 17 }
+23 -7
webroot/rsrc/css/phui/phui-header-view.css
··· 3 3 */ 4 4 5 5 .phui-header-shell { 6 - border-bottom: 1px solid {$hovergrey}; 6 + border-bottom: 1px solid {$thinblueborder}; 7 7 overflow: hidden; 8 8 } 9 9 ··· 38 38 } 39 39 40 40 .phui-header-view { 41 - padding: 16px; 41 + padding: 12px 4px 16px; 42 42 font-size: 15px; 43 - color: #000; 43 + color: {$darkbluetext}; 44 + font-weight: 500; 44 45 position: relative; 45 46 } 46 47 ··· 123 124 } 124 125 125 126 .phui-header-subheader .phui-header-status-dark { 126 - color: {$indigo}; 127 - text-shadow: 0 1px #fff; 127 + color: {$sh-indigotext}; 128 + background-color: {$sh-indigobackground}; 129 + padding: 2px 8px; 130 + border-radius: 3px; 131 + margin-right: 8px; 128 132 } 129 133 130 134 .phui-header-subheader .phui-header-status-dark .phui-icon-view { ··· 132 136 } 133 137 134 138 .phui-header-subheader .phui-header-status-red { 135 - color: {$red}; 139 + color: {$sh-redtext}; 140 + background-color: {$sh-redbackground}; 141 + padding: 2px 8px; 142 + border-radius: 3px; 143 + margin-right: 8px; 136 144 } 137 145 138 146 .phui-header-subheader .phui-header-status-green { 139 - color: {$green}; 147 + color: {$sh-greentext}; 148 + background-color: {$sh-greenbackground}; 149 + padding: 2px 8px; 150 + border-radius: 3px; 151 + margin-right: 8px; 140 152 } 141 153 142 154 .phui-header-action-links .phui-mobile-menu { ··· 155 167 margin: 0 4px; 156 168 float: right; 157 169 } 170 + 171 + .phui-header-icon-list .phui-header-list-icon .phui-icon-view { 172 + font-size: 15px; 173 + }
+5 -7
webroot/rsrc/css/phui/phui-object-box.css
··· 23 23 24 24 .phui-object-box .phui-header-shell h1 { 25 25 padding: 0 0 8px 0; 26 - font-weight: normal; 27 26 } 28 27 29 28 .phui-object-box .phui-header-shell + .phui-info-view { ··· 39 38 border-bottom: 1px solid {$greenborder}; 40 39 } 41 40 42 - .phui-box-border.phui-object-box-lightgreen .phui-action-header { 41 + .phui-box-border.phui-object-box-lightgreen .phui-header-shell { 43 42 border-bottom: 1px solid {$lightgreenborder}; 44 43 } 45 44 ··· 48 47 border-bottom: 1px solid {$blueborder}; 49 48 } 50 49 51 - .phui-box-border.phui-object-box-lightblue .phui-action-header { 50 + .phui-box-border.phui-object-box-lightblue .phui-header-shell { 52 51 border-bottom: 1px solid {$lightblueborder}; 53 52 } 54 53 ··· 57 56 border-bottom: 1px solid {$redborder}; 58 57 } 59 58 60 - .phui-box-border.phui-object-box-lightred .phui-action-header { 59 + .phui-box-border.phui-object-box-lightred .phui-header-shell { 61 60 border-bottom: 1px solid {$lightredborder}; 62 61 } 63 62 ··· 66 65 border-bottom: 1px solid {$violetborder}; 67 66 } 68 67 69 - .phui-box-border.phui-object-box-lightviolet .phui-action-header { 68 + .phui-box-border.phui-object-box-lightviolet .phui-header-shell { 70 69 border-bottom: 1px solid {$lightvioletborder}; 71 70 } 72 71 ··· 83 82 } 84 83 85 84 .phui-object-box .phui-object-box .phui-header-shell h1 { 86 - background-color: {$lightgreybackground}; 87 - padding: 8px 12px; 85 + padding: 8px 4px; 88 86 font-size: 13px; 89 87 margin: 0; 90 88 color: {$bluetext};
+1 -2
webroot/rsrc/css/phui/phui-object-item-list-view.css
··· 612 612 .dashboard-pane .phui-object-item-list-header { 613 613 font-size: 13px; 614 614 color: {$bluetext}; 615 - background: {$lightgreybackground}; 616 615 border-top: 1px solid {$thinblueborder}; 617 616 border-bottom: 1px solid {$thinblueborder}; 618 - padding: 8px 12px; 617 + padding: 8px 4px; 619 618 font-weight: 500; 620 619 } 621 620
+16 -2
webroot/rsrc/css/phui/phui-workboard-view.css
··· 9 9 .device-desktop .phui-workboard-view-shadow { 10 10 overflow-x: auto; 11 11 position: absolute; 12 - top: 120px; 12 + top: 110px; 13 13 bottom: 0; 14 14 left: 0; 15 15 right: 0; 16 16 } 17 17 18 18 .device-desktop .page-has-warning .phui-workboard-view-shadow { 19 - top: 148px; 19 + top: 138px; 20 20 } 21 21 22 22 .phui-workboard-view-shadow::-webkit-scrollbar { ··· 90 90 margin-left: 8px; 91 91 margin-right: 8px; 92 92 } 93 + 94 + .project-board-header { 95 + margin: 8px 12px; 96 + } 97 + 98 + .project-board-header .phui-header-view { 99 + font-size: 18px; 100 + } 101 + 102 + .project-board-header .phui-header-subheader { 103 + display: inline-block; 104 + margin: 0; 105 + padding: 0 8px; 106 + }
+13 -4
webroot/rsrc/css/phui/phui-workpanel-view.css
··· 2 2 * @provides phui-workpanel-view-css 3 3 */ 4 4 5 - .phui-workpanel-view .phui-action-header { 6 - border: 1px solid #b3b5b6; 5 + .phui-workpanel-view .phui-header-shell { 6 + border: 1px solid {$lightblueborder}; 7 7 border-top-left-radius: 3px; 8 8 border-top-right-radius: 3px; 9 + background-color: #fff; 9 10 } 10 11 11 - .phui-workpanel-view .phui-action-header .phui-action-header-title { 12 - padding: 8px 0; 12 + .phui-workpanel-view .phui-header-shell .phui-header-view { 13 + padding: 8px; 14 + font-size: 14px; 15 + } 16 + 17 + .phui-workpanel-view .phui-header-shell .phui-header-subheader { 18 + padding: 0 4px; 19 + margin: 0; 20 + display: inline-block; 21 + color: {$lightgreytext}; 13 22 } 14 23 15 24 .device-phone .phui-workboard-view {