diff --git a/resources/celerity/map.php b/resources/celerity/map.php --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -24,7 +24,7 @@ 'rsrc/css/aphront/error-view.css' => '9f1d5518', 'rsrc/css/aphront/lightbox-attachment.css' => '7acac05d', 'rsrc/css/aphront/list-filter-view.css' => '2ae43867', - 'rsrc/css/aphront/multi-column.css' => '12f65921', + 'rsrc/css/aphront/multi-column.css' => '667ca7b8', 'rsrc/css/aphront/notification.css' => 'ef2c9b34', 'rsrc/css/aphront/pager-view.css' => '2e3539af', 'rsrc/css/aphront/panel-view.css' => '5846dfa2', @@ -147,7 +147,7 @@ 'rsrc/css/phui/phui-text.css' => '23e9b4b7', 'rsrc/css/phui/phui-timeline-view.css' => '15ff2a9f', 'rsrc/css/phui/phui-workboard-view.css' => '84f2c272', - 'rsrc/css/phui/phui-workpanel-view.css' => '97b69459', + 'rsrc/css/phui/phui-workpanel-view.css' => 'b6ccc22d', 'rsrc/css/sprite-actions.css' => '969ad0e5', 'rsrc/css/sprite-apps-large.css' => '3e3ec4c3', 'rsrc/css/sprite-apps-xlarge.css' => 'db66c878', @@ -495,7 +495,7 @@ 'aphront-dialog-view-css' => 'c01d24b4', 'aphront-error-view-css' => '9f1d5518', 'aphront-list-filter-view-css' => '2ae43867', - 'aphront-multi-column-view-css' => '12f65921', + 'aphront-multi-column-view-css' => '667ca7b8', 'aphront-pager-view-css' => '2e3539af', 'aphront-panel-view-css' => '5846dfa2', 'aphront-request-failure-view-css' => 'da14df31', @@ -776,7 +776,7 @@ 'phui-text-css' => '23e9b4b7', 'phui-timeline-view-css' => '15ff2a9f', 'phui-workboard-view-css' => '84f2c272', - 'phui-workpanel-view-css' => '97b69459', + 'phui-workpanel-view-css' => 'b6ccc22d', 'phuix-action-list-view' => 'b5c256b8', 'phuix-action-view' => '19a0b148', 'phuix-dropdown-menu' => 'bd4c8dca', diff --git a/src/applications/project/controller/PhabricatorProjectBoardViewController.php b/src/applications/project/controller/PhabricatorProjectBoardViewController.php --- a/src/applications/project/controller/PhabricatorProjectBoardViewController.php +++ b/src/applications/project/controller/PhabricatorProjectBoardViewController.php @@ -89,7 +89,6 @@ $board = id(new PHUIWorkboardView()) ->setUser($viewer) - ->setFluidishLayout(true) ->setID($board_id); $this->initBehavior( diff --git a/src/view/layout/AphrontMultiColumnView.php b/src/view/layout/AphrontMultiColumnView.php --- a/src/view/layout/AphrontMultiColumnView.php +++ b/src/view/layout/AphrontMultiColumnView.php @@ -45,8 +45,11 @@ $classes[] = 'aphront-multi-column-inner'; $classes[] = 'grouped'; - if (count($this->columns) > 7) { - throw new Exception("No more than 7 columns per view."); + if ($this->fluidishLayout || $this->fluidLayout) { + // we only support seven columns for now for fluid views; see T4054 + if (count($this->columns) > 7) { + throw new Exception("No more than 7 columns per view."); + } } $classes[] = 'aphront-multi-column-'.count($this->columns).'-up'; diff --git a/webroot/rsrc/css/aphront/multi-column.css b/webroot/rsrc/css/aphront/multi-column.css --- a/webroot/rsrc/css/aphront/multi-column.css +++ b/webroot/rsrc/css/aphront/multi-column.css @@ -28,7 +28,7 @@ } .aphront-multi-column-fixed .aphront-multi-column-column-outer { - width: 300px; + width: 280px; } /* flexible, but with a minimum */ diff --git a/webroot/rsrc/css/phui/phui-workpanel-view.css b/webroot/rsrc/css/phui/phui-workpanel-view.css --- a/webroot/rsrc/css/phui/phui-workpanel-view.css +++ b/webroot/rsrc/css/phui/phui-workpanel-view.css @@ -53,7 +53,7 @@ } .aphront-multi-column-fixed .phui-workpanel-body { - width: 300px; + width: 280px; } .phui-workpanel-body .phui-object-item-list-view {