Page MenuHomePhabricator

D16666.diff
No OneTemporary

D16666.diff

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -7,7 +7,7 @@
*/
return array(
'names' => array(
- 'conpherence.pkg.css' => 'd2356a2b',
+ 'conpherence.pkg.css' => '3c08b01f',
'conpherence.pkg.js' => '11f3e07e',
'core.pkg.css' => '3fa66cb3',
'core.pkg.js' => '30185d95',
@@ -47,7 +47,7 @@
'rsrc/css/application/config/setup-issue.css' => 'f794cfc3',
'rsrc/css/application/config/unhandled-exception.css' => '4c96257a',
'rsrc/css/application/conpherence/durable-column.css' => '44bcaa19',
- 'rsrc/css/application/conpherence/header-pane.css' => '517de9fe',
+ 'rsrc/css/application/conpherence/header-pane.css' => '6a032d4c',
'rsrc/css/application/conpherence/menu.css' => '4f51db5a',
'rsrc/css/application/conpherence/message-pane.css' => '0d7dff02',
'rsrc/css/application/conpherence/notification.css' => '965db05b',
@@ -619,7 +619,7 @@
'config-options-css' => '0ede4c9b',
'config-page-css' => '8798e14f',
'conpherence-durable-column-view' => '44bcaa19',
- 'conpherence-header-pane-css' => '517de9fe',
+ 'conpherence-header-pane-css' => '6a032d4c',
'conpherence-menu-css' => '4f51db5a',
'conpherence-message-pane-css' => '0d7dff02',
'conpherence-notification-css' => '965db05b',
diff --git a/src/applications/conpherence/controller/ConpherenceController.php b/src/applications/conpherence/controller/ConpherenceController.php
--- a/src/applications/conpherence/controller/ConpherenceController.php
+++ b/src/applications/conpherence/controller/ConpherenceController.php
@@ -59,7 +59,7 @@
$header = id(new PHUIHeaderView())
->setHeader($data['title'])
->setSubheader($data['topic'])
- ->addClass((!$data['topic']) ? 'conpherence-no-topic' : null);
+ ->setImage($data['image']);
$can_edit = PhabricatorPolicyFilter::hasCapability(
$viewer,
diff --git a/webroot/rsrc/css/application/conpherence/header-pane.css b/webroot/rsrc/css/application/conpherence/header-pane.css
--- a/webroot/rsrc/css/application/conpherence/header-pane.css
+++ b/webroot/rsrc/css/application/conpherence/header-pane.css
@@ -2,9 +2,6 @@
* @provides conpherence-header-pane-css
*/
-.conpherence-header-pane {
-}
-
.conpherence-header-pane .phui-header-shell {
padding: 8px 16px 10px;
min-height: 38px;
@@ -23,8 +20,22 @@
margin: 0;
}
-.conpherence-header-pane .phui-header-shell.conpherence-no-topic {
- padding: 15px 16px 5px;
+.conpherence-header-pane .phui-header-col1 {
+ width: 46px;
+ height: 35px;
+}
+
+.conpherence-header-pane .phui-header-image {
+ height: 35px;
+ width: 35px;
+ background-size: 35px;
+ position: absolute;
+ top: 4px;
+ left: 0;
+}
+
+.conpherence-header-pane .phui-header-col2 {
+ height: 40px;
}
.conpherence-header-pane .phui-header-action-list .phui-header-action-item

File Metadata

Mime Type
text/plain
Expires
Sat, May 18, 8:07 AM (2 w, 6 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6285553
Default Alt Text
D16666.diff (2 KB)

Event Timeline