mirror of
https://we.phorge.it/source/phorge.git
synced 2024-11-18 12:52:42 +01:00
Clean up random junk in Conpherence
Summary: Fixes T10781. Re-uses sidenav styles from global space, though a little hacky. Fix crumb border, fix nux experience. Fiddle spacing. Test Plan: Use Conpherence as new user, make a room, post some messages. {F1805658} Reviewers: epriestley Reviewed By: epriestley Subscribers: Korvin Maniphest Tasks: T10781 Differential Revision: https://secure.phabricator.com/D16528
This commit is contained in:
parent
b639b38242
commit
05628de90d
7 changed files with 40 additions and 21 deletions
|
@ -45,8 +45,8 @@ return array(
|
||||||
'rsrc/css/application/config/setup-issue.css' => 'f794cfc3',
|
'rsrc/css/application/config/setup-issue.css' => 'f794cfc3',
|
||||||
'rsrc/css/application/config/unhandled-exception.css' => '4c96257a',
|
'rsrc/css/application/config/unhandled-exception.css' => '4c96257a',
|
||||||
'rsrc/css/application/conpherence/durable-column.css' => '86396117',
|
'rsrc/css/application/conpherence/durable-column.css' => '86396117',
|
||||||
'rsrc/css/application/conpherence/menu.css' => '90bdf85c',
|
'rsrc/css/application/conpherence/menu.css' => '26283353',
|
||||||
'rsrc/css/application/conpherence/message-pane.css' => '5c7b7b17',
|
'rsrc/css/application/conpherence/message-pane.css' => '8b994132',
|
||||||
'rsrc/css/application/conpherence/notification.css' => '6cdcc253',
|
'rsrc/css/application/conpherence/notification.css' => '6cdcc253',
|
||||||
'rsrc/css/application/conpherence/transaction.css' => '85d0974c',
|
'rsrc/css/application/conpherence/transaction.css' => '85d0974c',
|
||||||
'rsrc/css/application/conpherence/update.css' => 'faf6be09',
|
'rsrc/css/application/conpherence/update.css' => 'faf6be09',
|
||||||
|
@ -549,8 +549,8 @@ return array(
|
||||||
'config-options-css' => '0ede4c9b',
|
'config-options-css' => '0ede4c9b',
|
||||||
'config-page-css' => '8798e14f',
|
'config-page-css' => '8798e14f',
|
||||||
'conpherence-durable-column-view' => '86396117',
|
'conpherence-durable-column-view' => '86396117',
|
||||||
'conpherence-menu-css' => '90bdf85c',
|
'conpherence-menu-css' => '26283353',
|
||||||
'conpherence-message-pane-css' => '5c7b7b17',
|
'conpherence-message-pane-css' => '8b994132',
|
||||||
'conpherence-notification-css' => '6cdcc253',
|
'conpherence-notification-css' => '6cdcc253',
|
||||||
'conpherence-thread-manager' => '01774ab2',
|
'conpherence-thread-manager' => '01774ab2',
|
||||||
'conpherence-transaction-css' => '85d0974c',
|
'conpherence-transaction-css' => '85d0974c',
|
||||||
|
|
|
@ -36,6 +36,13 @@ abstract class ConpherenceController extends PhabricatorController {
|
||||||
|
|
||||||
protected function buildConpherenceApplicationCrumbs($is_rooms = false) {
|
protected function buildConpherenceApplicationCrumbs($is_rooms = false) {
|
||||||
$crumbs = parent::buildApplicationCrumbs();
|
$crumbs = parent::buildApplicationCrumbs();
|
||||||
|
$crumbs->setBorder(true);
|
||||||
|
|
||||||
|
$crumbs->addAction(
|
||||||
|
id(new PHUIListItemView())
|
||||||
|
->setName(pht('Search'))
|
||||||
|
->setHref($this->getApplicationURI('search/'))
|
||||||
|
->setIcon('fa-search'));
|
||||||
|
|
||||||
if ($is_rooms) {
|
if ($is_rooms) {
|
||||||
$crumbs
|
$crumbs
|
||||||
|
|
|
@ -145,6 +145,13 @@ final class ConpherenceLayoutView extends AphrontView {
|
||||||
'class' => 'text',
|
'class' => 'text',
|
||||||
),
|
),
|
||||||
pht('You are not in any rooms yet.')),
|
pht('You are not in any rooms yet.')),
|
||||||
|
javelin_tag(
|
||||||
|
'a',
|
||||||
|
array(
|
||||||
|
'href' => '/conpherence/search/',
|
||||||
|
'class' => 'button grey mlr',
|
||||||
|
),
|
||||||
|
pht('Join a Room')),
|
||||||
javelin_tag(
|
javelin_tag(
|
||||||
'a',
|
'a',
|
||||||
array(
|
array(
|
||||||
|
|
|
@ -63,9 +63,11 @@ final class ConpherenceMenuItemView extends AphrontTagView {
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function getTagAttributes() {
|
protected function getTagAttributes() {
|
||||||
$classes = array('conpherence-menu-item-view');
|
$classes = array();
|
||||||
|
$classes[] = 'conpherence-menu-item-view';
|
||||||
|
$classes[] = 'phui-list-item-href';
|
||||||
return array(
|
return array(
|
||||||
'class' => $classes,
|
'class' => implode(' ', $classes),
|
||||||
'href' => $this->href,
|
'href' => $this->href,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
@ -31,6 +31,9 @@ final class ConpherenceThreadListView extends AphrontView {
|
||||||
|
|
||||||
$this->addRoomsToMenu($menu, $this->threads, $policy_objects);
|
$this->addRoomsToMenu($menu, $this->threads, $policy_objects);
|
||||||
|
|
||||||
|
$menu = phutil_tag_div('phabricator-side-menu', $menu);
|
||||||
|
$menu = phutil_tag_div('phui-basic-nav', $menu);
|
||||||
|
|
||||||
return $menu;
|
return $menu;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -99,11 +102,6 @@ final class ConpherenceThreadListView extends AphrontView {
|
||||||
$header = $this->renderMenuItemHeader(
|
$header = $this->renderMenuItemHeader(
|
||||||
pht('Rooms'),
|
pht('Rooms'),
|
||||||
'conpherence-room-list-header');
|
'conpherence-room-list-header');
|
||||||
$header->appendChild(
|
|
||||||
id(new PHUIIconView())
|
|
||||||
->setIcon('fa-search')
|
|
||||||
->setHref('/conpherence/search/')
|
|
||||||
->setText(pht('Search')));
|
|
||||||
$menu->addMenuItem($header);
|
$menu->addMenuItem($header);
|
||||||
|
|
||||||
if (empty($rooms)) {
|
if (empty($rooms)) {
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
text-align: center;
|
text-align: center;
|
||||||
position: fixed;
|
position: fixed;
|
||||||
left: 240px;
|
left: 240px;
|
||||||
right: 241px;
|
right: 240px;
|
||||||
top: 76px;
|
top: 76px;
|
||||||
bottom: 0px;
|
bottom: 0px;
|
||||||
min-width: 300px;
|
min-width: 300px;
|
||||||
|
@ -39,10 +39,14 @@
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
top: 0;
|
top: 0;
|
||||||
bottom: 0;
|
bottom: 0;
|
||||||
background: #f7f7f7;
|
background-color: {$page.sidenav};
|
||||||
border-right: 1px solid {$lightblueborder}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.conpherence-menu-pane .phui-basic-nav .phabricator-side-menu
|
||||||
|
.phui-list-item-href {
|
||||||
|
padding: 4px 0 4px 8px;
|
||||||
|
}
|
||||||
|
|
||||||
.conpherence-menu-pane .phui-list-item-view.hidden {
|
.conpherence-menu-pane .phui-list-item-view.hidden {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
@ -69,7 +73,8 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.device-desktop .conpherence-layout .conpherence-menu-pane {
|
.device-desktop .conpherence-layout .conpherence-menu-pane {
|
||||||
width: 240px;
|
width: 232px;
|
||||||
|
padding-right: 8px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.device .conpherence-menu-pane {
|
.device .conpherence-menu-pane {
|
||||||
|
@ -89,7 +94,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.device-desktop .conpherence-content-pane {
|
.device-desktop .conpherence-content-pane {
|
||||||
margin-left: 241px;
|
margin-left: 240px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.conpherence-content-pane {
|
.conpherence-content-pane {
|
||||||
|
|
|
@ -7,8 +7,8 @@
|
||||||
.loading .messages-loading-icon,
|
.loading .messages-loading-icon,
|
||||||
.conpherence-layout .conpherence-no-threads {
|
.conpherence-layout .conpherence-no-threads {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
left: 241px;
|
left: 240px;
|
||||||
right: 241px;
|
right: 240px;
|
||||||
top: 76px;
|
top: 76px;
|
||||||
bottom: 0px;
|
bottom: 0px;
|
||||||
min-width: 300px;
|
min-width: 300px;
|
||||||
|
@ -52,8 +52,8 @@
|
||||||
|
|
||||||
.conpherence-message-pane .conpherence-messages {
|
.conpherence-message-pane .conpherence-messages {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
left: 241px;
|
left: 240px;
|
||||||
right: 241px;
|
right: 240px;
|
||||||
top: 78px;
|
top: 78px;
|
||||||
bottom: 172px;
|
bottom: 172px;
|
||||||
overflow-x: hidden;
|
overflow-x: hidden;
|
||||||
|
@ -109,7 +109,7 @@
|
||||||
position: fixed;
|
position: fixed;
|
||||||
bottom: 0;
|
bottom: 0;
|
||||||
border-top: 1px solid {$thinblueborder};
|
border-top: 1px solid {$thinblueborder};
|
||||||
left: 241px;
|
left: 240px;
|
||||||
right: 241px;
|
right: 241px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue