revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-18 12:52:42 +01:00
Code Issues Releases Wiki Activity

Refresh Conpherence UI

Browse source 
Summary: Cleans up a number of inconsistencies, makes Conpherence lighter, easier to read, make names larger, darker.

Test Plan: Review Conpherence chat in Main App, Durable Column, Mobile, Tablet

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D16531
This commit is contained in:
Chad Little 2016-09-09 11:08:53 -07:00
parent fe9f16ad0d
commit be54620b17
8 changed files with 47 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
resources/celerity/map.php
View file

@ -7,7 +7,7 @@
*/ */
return array( return array(
'names' => array( 'names' => array(
'core.pkg.css' => 'f7796100', 'core.pkg.css' => 'e7d1e589',
'core.pkg.js' => '1d376fa9', 'core.pkg.js' => '1d376fa9',
'darkconsole.pkg.js' => 'e7393ebb', 'darkconsole.pkg.js' => 'e7393ebb',
'differential.pkg.css' => '3fb7f532', 'differential.pkg.css' => '3fb7f532',
@ -44,13 +44,13 @@ return array(
'rsrc/css/application/config/config-template.css' => '8f18fa41', 'rsrc/css/application/config/config-template.css' => '8f18fa41',
'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' => '194ac487',
'rsrc/css/application/conpherence/menu.css' => '26283353', 'rsrc/css/application/conpherence/menu.css' => '3a0fd18a',
'rsrc/css/application/conpherence/message-pane.css' => '8b994132', 'rsrc/css/application/conpherence/message-pane.css' => '31dc663d',
'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' => '2c71247c',
'rsrc/css/application/conpherence/update.css' => 'faf6be09', 'rsrc/css/application/conpherence/update.css' => 'faf6be09',
'rsrc/css/application/conpherence/widget-pane.css' => 'c5b74f9e', 'rsrc/css/application/conpherence/widget-pane.css' => 'c689f6a4',
'rsrc/css/application/contentsource/content-source-view.css' => '4b8b05d4', 'rsrc/css/application/contentsource/content-source-view.css' => '4b8b05d4',
'rsrc/css/application/countdown/timer.css' => '16c52f5c', 'rsrc/css/application/countdown/timer.css' => '16c52f5c',
'rsrc/css/application/daemon/bulk-job.css' => 'df9c1d4a', 'rsrc/css/application/daemon/bulk-job.css' => 'df9c1d4a',
@ -548,14 +548,14 @@ return array(
'conduit-api-css' => '7bc725c4', 'conduit-api-css' => '7bc725c4',
'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' => '194ac487',
'conpherence-menu-css' => '26283353', 'conpherence-menu-css' => '3a0fd18a',
'conpherence-message-pane-css' => '8b994132', 'conpherence-message-pane-css' => '31dc663d',
'conpherence-notification-css' => '6cdcc253', 'conpherence-notification-css' => '6cdcc253',
'conpherence-thread-manager' => '01774ab2', 'conpherence-thread-manager' => '01774ab2',
'conpherence-transaction-css' => '85d0974c', 'conpherence-transaction-css' => '2c71247c',
'conpherence-update-css' => 'faf6be09', 'conpherence-update-css' => 'faf6be09',
'conpherence-widget-pane-css' => 'c5b74f9e', 'conpherence-widget-pane-css' => 'c689f6a4',
'd3' => 'a11a5ff2', 'd3' => 'a11a5ff2',
'differential-changeset-view-css' => '9ef7d354', 'differential-changeset-view-css' => '9ef7d354',
'differential-core-view-css' => '5b7b8ff4', 'differential-core-view-css' => '5b7b8ff4',

1
src/applications/conpherence/view/ConpherenceDurableColumnView.php
View file

@ -126,7 +126,6 @@ final class ConpherenceDurableColumnView extends AphrontTagView {
$classes = array(); $classes = array();
$classes[] = 'conpherence-durable-column-header'; $classes[] = 'conpherence-durable-column-header';
$classes[] = 'phabricator-main-menu-background'; $classes[] = 'phabricator-main-menu-background';
$classes[] = 'sprite-main-header';
$loading_mask = phutil_tag( $loading_mask = phutil_tag(
'div', 'div',

12
src/applications/conpherence/view/ConpherenceTransactionView.php
View file

@ -133,16 +133,6 @@ final class ConpherenceTransactionView extends AphrontView {
$transaction = $this->getConpherenceTransaction(); $transaction = $this->getConpherenceTransaction();
$info = array(); $info = array();
if ($this->getFullDisplay() && $transaction->getContentSource()) {
$content_source = id(new PhabricatorContentSourceView())
->setContentSource($transaction->getContentSource())
->setUser($viewer)
->render();
if ($content_source) {
$info[] = $content_source;
}
}
Javelin::initBehavior('phabricator-tooltips'); Javelin::initBehavior('phabricator-tooltips');
$tip = phabricator_datetime($transaction->getDateCreated(), $viewer); $tip = phabricator_datetime($transaction->getDateCreated(), $viewer);
$label = phabricator_time($transaction->getDateCreated(), $viewer); $label = phabricator_time($transaction->getDateCreated(), $viewer);
@ -184,8 +174,6 @@ final class ConpherenceTransactionView extends AphrontView {
$label); $label);
} }
$info = phutil_implode_html(" \xC2\xB7 ", $info);
return phutil_tag( return phutil_tag(
'span', 'span',
array( array(

3
webroot/rsrc/css/application/conpherence/durable-column.css
View file

@ -251,7 +251,6 @@
.conpherence-durable-column-transactions .conpherence-transaction-detail .conpherence-durable-column-transactions .conpherence-transaction-detail
.conpherence-transaction-header .conpherence-transaction-info { .conpherence-transaction-header .conpherence-transaction-info {
color: {$lightbluetext}; color: {$lightbluetext};
float: none;
font-size: {$smallerfontsize}; font-size: {$smallerfontsize};
} }
@ -266,7 +265,7 @@
.conpherence-durable-column-transactions .conpherence-transaction-detail .conpherence-durable-column-transactions .conpherence-transaction-detail
.conpherence-transaction-content .phui-link-person { .conpherence-transaction-content .phui-link-person {
color: {$darkbluetext}; color: #000;
} }
.conpherence-durable-column-transactions .conpherence-durable-column-transactions

1
webroot/rsrc/css/application/conpherence/menu.css
View file

@ -143,7 +143,6 @@
width: 26px; width: 26px;
height: 26px; height: 26px;
background-size: 26px; background-size: 26px;
box-shadow: {$borderinset};
border-radius: 3px; border-radius: 3px;
float: left; float: left;
margin-left: 4px; margin-left: 4px;

58
webroot/rsrc/css/application/conpherence/message-pane.css
View file

@ -55,7 +55,7 @@
left: 240px; left: 240px;
right: 240px; right: 240px;
top: 78px; top: 78px;
bottom: 172px; bottom: 148px;
overflow-x: hidden; overflow-x: hidden;
overflow-y: auto; overflow-y: auto;
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
@ -86,7 +86,7 @@
.device .conpherence-message-pane .conpherence-messages { .device .conpherence-message-pane .conpherence-messages {
left: 0; left: 0;
right: 0; right: 0;
bottom: 52px; bottom: 44px;
width: 100%; width: 100%;
box-shadow: none; box-shadow: none;
} }
@ -103,12 +103,10 @@
.conpherence-message-pane .phui-form-view { .conpherence-message-pane .phui-form-view {
border-width: 0; border-width: 0;
background-color: {$lightgreybackground}; height: 140px;
height: 156px; padding: 0 8px 8px;
padding: 8px;
position: fixed; position: fixed;
bottom: 0; bottom: 0;
border-top: 1px solid {$thinblueborder};
left: 240px; left: 240px;
right: 241px; right: 241px;
} }
@ -139,7 +137,11 @@
} }
.conpherence-message-pane .remarkup-assist-bar { .conpherence-message-pane .remarkup-assist-bar {
border-color: {$lightblueborder}; border: 2px solid {$lightgreyborder};
border-bottom: none;
border-top-left-radius: 3px;
border-top-right-radius: 3px;
background-color: #f7f7f7;
} }
.device .conpherence-message-pane .remarkup-assist-bar { .device .conpherence-message-pane .remarkup-assist-bar {
@ -178,7 +180,6 @@
background-size: 35px; background-size: 35px;
position: absolute; position: absolute;
top: 5px; top: 5px;
box-shadow: {$borderinset};
} }
.device-phone .conpherence-message-pane .conpherence-transaction-image { .device-phone .conpherence-message-pane .conpherence-transaction-image {
@ -246,10 +247,12 @@
.conpherence-message-pane .conpherence-edited .conpherence-transaction-content { .conpherence-message-pane .conpherence-edited .conpherence-transaction-content {
color: {$lightgreytext}; color: {$lightgreytext};
font-size: {$normalfontsize}; font-size: {$biggerfontsize};
font-style: italic;
margin: 0; margin: 0;
padding: 0; padding: 0;
float: left; float: left;
line-height: 20px;
} }
.conpherence-message-pane .conpherence-edited { .conpherence-message-pane .conpherence-edited {
@ -277,7 +280,7 @@
color: {$darkbluetext}; color: {$darkbluetext};
} }
.device-phone .conpherence-message-pane .conpherence-transaction-info { .conpherence-message-pane .conpherence-transaction-info {
display: none; display: none;
} }
@ -289,18 +292,6 @@
font-size: {$smallerfontsize}; font-size: {$smallerfontsize};
} }
.conpherence-message-pane .conpherence-transaction-info {
float: right;
}
.conpherence-message-pane .conpherence-transaction-header,
.conpherence-message-pane .conpherence-transaction-info,
.conpherence-message-pane .anchor-link,
.conpherence-message-pane .conpherence-transaction-content {
background: none;
padding: 0;
}
.conpherence-message-pane .conpherence-transaction-content { .conpherence-message-pane .conpherence-transaction-content {
padding: 2px 0 8px 0; padding: 2px 0 8px 0;
} }
@ -310,14 +301,22 @@
} }
.conpherence-message-pane .remarkup-assist-textarea { .conpherence-message-pane .remarkup-assist-textarea {
height: 100px; height: 80px;
padding: 6px; padding: 8px;
border-color: {$lightblueborder}; border: 2px solid {$lightgreyborder};
border-top-color: {$thinblueborder}; border-top: 1px solid {$thinblueborder};
box-sizing: border-box; box-sizing: border-box;
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
resize: none; resize: none;
outline: none;
box-shadow: none;
border-bottom-left-radius: 3px;
border-bottom-right-radius: 3px;
}
.conpherence-message-pane .remarkup-assist-textarea:focus {
border-color: {$lightblueborder};
} }
.device .conpherence-message-pane .remarkup-assist-textarea { .device .conpherence-message-pane .remarkup-assist-textarea {
@ -326,6 +325,9 @@
width: 100%; width: 100%;
height: 34px; height: 34px;
resize: none; resize: none;
border-top: 2px solid {$lightgreyborder};
border-top-left-radius: 3px;
border-top-right-radius: 3px;
} }
.conpherence-message-pane .remarkup-assist-textarea:focus { .conpherence-message-pane .remarkup-assist-textarea:focus {
@ -335,8 +337,8 @@
.device .conpherence-message-pane .aphront-form-control-submit { .device .conpherence-message-pane .aphront-form-control-submit {
padding: 0; padding: 0;
position: absolute; position: absolute;
top: 7px; top: -2px;
right: 13px; right: 12px;
} }
.device .conpherence-message-pane .aphront-form-control-textarea { .device .conpherence-message-pane .aphront-form-control-textarea {

3
webroot/rsrc/css/application/conpherence/transaction.css
View file

@ -12,11 +12,14 @@
.conpherence-transaction-header .phui-link-person { .conpherence-transaction-header .phui-link-person {
font-weight: bold; font-weight: bold;
font-size: {$biggerfontsize};
color: #000;
} }
.conpherence-transaction-view.date-marker { .conpherence-transaction-view.date-marker {
border-top: 1px solid {$thinblueborder}; border-top: 1px solid {$thinblueborder};
} }
.conpherence-transaction-view.date-marker .date { .conpherence-transaction-view.date-marker .date {
position: relative; position: relative;
top: -11px; top: -11px;

4
webroot/rsrc/css/application/conpherence/widget-pane.css
View file

@ -6,7 +6,7 @@
.loading .widgets-loading-mask { .loading .widgets-loading-mask {
position: fixed; position: fixed;
right: 0px; right: 0px;
top: 76px; top: 79px;
bottom: 0; bottom: 0;
width: 240px; width: 240px;
border-width: 0 0 0 1px; border-width: 0 0 0 1px;
@ -81,7 +81,7 @@
} }
.device-desktop .conpherence-widget-pane .widgets-body { .device-desktop .conpherence-widget-pane .widgets-body {
top: 111px; top: 115px;
width: 240px; width: 240px;
} }