Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F15450497
D16531.id39781.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
9 KB
Referenced Files
None
Subscribers
None
D16531.id39781.diff
View Options
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(
- 'core.pkg.css' => 'f7796100',
+ 'core.pkg.css' => 'e7d1e589',
'core.pkg.js' => '1d376fa9',
'darkconsole.pkg.js' => 'e7393ebb',
'differential.pkg.css' => '3fb7f532',
@@ -44,13 +44,13 @@
'rsrc/css/application/config/config-template.css' => '8f18fa41',
'rsrc/css/application/config/setup-issue.css' => 'f794cfc3',
'rsrc/css/application/config/unhandled-exception.css' => '4c96257a',
- 'rsrc/css/application/conpherence/durable-column.css' => '86396117',
- 'rsrc/css/application/conpherence/menu.css' => '26283353',
- 'rsrc/css/application/conpherence/message-pane.css' => '8b994132',
+ 'rsrc/css/application/conpherence/durable-column.css' => '194ac487',
+ 'rsrc/css/application/conpherence/menu.css' => '3a0fd18a',
+ 'rsrc/css/application/conpherence/message-pane.css' => '31dc663d',
'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/widget-pane.css' => 'c5b74f9e',
+ 'rsrc/css/application/conpherence/widget-pane.css' => 'c689f6a4',
'rsrc/css/application/contentsource/content-source-view.css' => '4b8b05d4',
'rsrc/css/application/countdown/timer.css' => '16c52f5c',
'rsrc/css/application/daemon/bulk-job.css' => 'df9c1d4a',
@@ -548,14 +548,14 @@
'conduit-api-css' => '7bc725c4',
'config-options-css' => '0ede4c9b',
'config-page-css' => '8798e14f',
- 'conpherence-durable-column-view' => '86396117',
- 'conpherence-menu-css' => '26283353',
- 'conpherence-message-pane-css' => '8b994132',
+ 'conpherence-durable-column-view' => '194ac487',
+ 'conpherence-menu-css' => '3a0fd18a',
+ 'conpherence-message-pane-css' => '31dc663d',
'conpherence-notification-css' => '6cdcc253',
'conpherence-thread-manager' => '01774ab2',
- 'conpherence-transaction-css' => '85d0974c',
+ 'conpherence-transaction-css' => '2c71247c',
'conpherence-update-css' => 'faf6be09',
- 'conpherence-widget-pane-css' => 'c5b74f9e',
+ 'conpherence-widget-pane-css' => 'c689f6a4',
'd3' => 'a11a5ff2',
'differential-changeset-view-css' => '9ef7d354',
'differential-core-view-css' => '5b7b8ff4',
diff --git a/src/applications/conpherence/view/ConpherenceDurableColumnView.php b/src/applications/conpherence/view/ConpherenceDurableColumnView.php
--- a/src/applications/conpherence/view/ConpherenceDurableColumnView.php
+++ b/src/applications/conpherence/view/ConpherenceDurableColumnView.php
@@ -126,7 +126,6 @@
$classes = array();
$classes[] = 'conpherence-durable-column-header';
$classes[] = 'phabricator-main-menu-background';
- $classes[] = 'sprite-main-header';
$loading_mask = phutil_tag(
'div',
diff --git a/src/applications/conpherence/view/ConpherenceTransactionView.php b/src/applications/conpherence/view/ConpherenceTransactionView.php
--- a/src/applications/conpherence/view/ConpherenceTransactionView.php
+++ b/src/applications/conpherence/view/ConpherenceTransactionView.php
@@ -133,16 +133,6 @@
$transaction = $this->getConpherenceTransaction();
$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');
$tip = phabricator_datetime($transaction->getDateCreated(), $viewer);
$label = phabricator_time($transaction->getDateCreated(), $viewer);
@@ -184,8 +174,6 @@
$label);
}
- $info = phutil_implode_html(" \xC2\xB7 ", $info);
-
return phutil_tag(
'span',
array(
diff --git a/webroot/rsrc/css/application/conpherence/durable-column.css b/webroot/rsrc/css/application/conpherence/durable-column.css
--- a/webroot/rsrc/css/application/conpherence/durable-column.css
+++ b/webroot/rsrc/css/application/conpherence/durable-column.css
@@ -251,7 +251,6 @@
.conpherence-durable-column-transactions .conpherence-transaction-detail
.conpherence-transaction-header .conpherence-transaction-info {
color: {$lightbluetext};
- float: none;
font-size: {$smallerfontsize};
}
@@ -266,7 +265,7 @@
.conpherence-durable-column-transactions .conpherence-transaction-detail
.conpherence-transaction-content .phui-link-person {
- color: {$darkbluetext};
+ color: #000;
}
.conpherence-durable-column-transactions
diff --git a/webroot/rsrc/css/application/conpherence/menu.css b/webroot/rsrc/css/application/conpherence/menu.css
--- a/webroot/rsrc/css/application/conpherence/menu.css
+++ b/webroot/rsrc/css/application/conpherence/menu.css
@@ -143,7 +143,6 @@
width: 26px;
height: 26px;
background-size: 26px;
- box-shadow: {$borderinset};
border-radius: 3px;
float: left;
margin-left: 4px;
diff --git a/webroot/rsrc/css/application/conpherence/message-pane.css b/webroot/rsrc/css/application/conpherence/message-pane.css
--- a/webroot/rsrc/css/application/conpherence/message-pane.css
+++ b/webroot/rsrc/css/application/conpherence/message-pane.css
@@ -55,7 +55,7 @@
left: 240px;
right: 240px;
top: 78px;
- bottom: 172px;
+ bottom: 148px;
overflow-x: hidden;
overflow-y: auto;
-webkit-overflow-scrolling: touch;
@@ -86,7 +86,7 @@
.device .conpherence-message-pane .conpherence-messages {
left: 0;
right: 0;
- bottom: 52px;
+ bottom: 44px;
width: 100%;
box-shadow: none;
}
@@ -103,12 +103,10 @@
.conpherence-message-pane .phui-form-view {
border-width: 0;
- background-color: {$lightgreybackground};
- height: 156px;
- padding: 8px;
+ height: 140px;
+ padding: 0 8px 8px;
position: fixed;
bottom: 0;
- border-top: 1px solid {$thinblueborder};
left: 240px;
right: 241px;
}
@@ -139,7 +137,11 @@
}
.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 {
@@ -178,7 +180,6 @@
background-size: 35px;
position: absolute;
top: 5px;
- box-shadow: {$borderinset};
}
.device-phone .conpherence-message-pane .conpherence-transaction-image {
@@ -246,10 +247,12 @@
.conpherence-message-pane .conpherence-edited .conpherence-transaction-content {
color: {$lightgreytext};
- font-size: {$normalfontsize};
+ font-size: {$biggerfontsize};
+ font-style: italic;
margin: 0;
padding: 0;
float: left;
+ line-height: 20px;
}
.conpherence-message-pane .conpherence-edited {
@@ -277,7 +280,7 @@
color: {$darkbluetext};
}
-.device-phone .conpherence-message-pane .conpherence-transaction-info {
+.conpherence-message-pane .conpherence-transaction-info {
display: none;
}
@@ -289,18 +292,6 @@
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 {
padding: 2px 0 8px 0;
}
@@ -310,14 +301,22 @@
}
.conpherence-message-pane .remarkup-assist-textarea {
- height: 100px;
- padding: 6px;
- border-color: {$lightblueborder};
- border-top-color: {$thinblueborder};
+ height: 80px;
+ padding: 8px;
+ border: 2px solid {$lightgreyborder};
+ border-top: 1px solid {$thinblueborder};
box-sizing: border-box;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
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 {
@@ -326,6 +325,9 @@
width: 100%;
height: 34px;
resize: none;
+ border-top: 2px solid {$lightgreyborder};
+ border-top-left-radius: 3px;
+ border-top-right-radius: 3px;
}
.conpherence-message-pane .remarkup-assist-textarea:focus {
@@ -335,8 +337,8 @@
.device .conpherence-message-pane .aphront-form-control-submit {
padding: 0;
position: absolute;
- top: 7px;
- right: 13px;
+ top: -2px;
+ right: 12px;
}
.device .conpherence-message-pane .aphront-form-control-textarea {
diff --git a/webroot/rsrc/css/application/conpherence/transaction.css b/webroot/rsrc/css/application/conpherence/transaction.css
--- a/webroot/rsrc/css/application/conpherence/transaction.css
+++ b/webroot/rsrc/css/application/conpherence/transaction.css
@@ -12,11 +12,14 @@
.conpherence-transaction-header .phui-link-person {
font-weight: bold;
+ font-size: {$biggerfontsize};
+ color: #000;
}
.conpherence-transaction-view.date-marker {
border-top: 1px solid {$thinblueborder};
}
+
.conpherence-transaction-view.date-marker .date {
position: relative;
top: -11px;
diff --git a/webroot/rsrc/css/application/conpherence/widget-pane.css b/webroot/rsrc/css/application/conpherence/widget-pane.css
--- a/webroot/rsrc/css/application/conpherence/widget-pane.css
+++ b/webroot/rsrc/css/application/conpherence/widget-pane.css
@@ -6,7 +6,7 @@
.loading .widgets-loading-mask {
position: fixed;
right: 0px;
- top: 76px;
+ top: 79px;
bottom: 0;
width: 240px;
border-width: 0 0 0 1px;
@@ -81,7 +81,7 @@
}
.device-desktop .conpherence-widget-pane .widgets-body {
- top: 111px;
+ top: 115px;
width: 240px;
}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sat, Mar 29, 4:02 PM (2 w, 3 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7332531
Default Alt Text
D16531.id39781.diff (9 KB)
Attached To
Mode
D16531: Refresh Conpherence UI
Attached
Detach File
Event Timeline
Log In to Comment