Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F14036213
D15442.id37219.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
12 KB
Referenced Files
None
Subscribers
None
D15442.id37219.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' => 'd3b3a609',
+ 'core.pkg.css' => '9566d4d1',
'core.pkg.js' => '7d8faf57',
'darkconsole.pkg.js' => 'e7393ebb',
'differential.pkg.css' => '2de124c9',
@@ -149,13 +149,13 @@
'rsrc/css/phui/phui-pager.css' => 'bea33d23',
'rsrc/css/phui/phui-pinboard-view.css' => '2495140e',
'rsrc/css/phui/phui-profile-menu.css' => '7e92a89a',
- 'rsrc/css/phui/phui-property-list-view.css' => '27b2849e',
+ 'rsrc/css/phui/phui-property-list-view.css' => 'b12e801c',
'rsrc/css/phui/phui-remarkup-preview.css' => '1a8f2591',
'rsrc/css/phui/phui-segment-bar-view.css' => '46342871',
'rsrc/css/phui/phui-spacing.css' => '042804d6',
'rsrc/css/phui/phui-status.css' => '37309046',
'rsrc/css/phui/phui-tag-view.css' => '6bbd83e2',
- 'rsrc/css/phui/phui-timeline-view.css' => '2efceff8',
+ 'rsrc/css/phui/phui-timeline-view.css' => 'd7cca980',
'rsrc/css/phui/phui-two-column-view.css' => '38871c98',
'rsrc/css/phui/workboards/phui-workboard-color.css' => 'ac6fe6a7',
'rsrc/css/phui/workboards/phui-workboard.css' => 'e6d89647',
@@ -273,6 +273,7 @@
'rsrc/image/checker_dark.png' => 'd8e65881',
'rsrc/image/checker_light.png' => 'a0155918',
'rsrc/image/checker_lighter.png' => 'd5da91b6',
+ 'rsrc/image/d5d8e1.png' => '0c2a1497',
'rsrc/image/darkload.gif' => '1ffd3ec6',
'rsrc/image/divot.png' => '94dded62',
'rsrc/image/examples/hero.png' => '979a86ae',
@@ -837,14 +838,14 @@
'phui-pager-css' => 'bea33d23',
'phui-pinboard-view-css' => '2495140e',
'phui-profile-menu-css' => '7e92a89a',
- 'phui-property-list-view-css' => '27b2849e',
+ 'phui-property-list-view-css' => 'b12e801c',
'phui-remarkup-preview-css' => '1a8f2591',
'phui-segment-bar-view-css' => '46342871',
'phui-spacing-css' => '042804d6',
'phui-status-list-view-css' => '37309046',
'phui-tag-view-css' => '6bbd83e2',
'phui-theme-css' => '027ba77e',
- 'phui-timeline-view-css' => '2efceff8',
+ 'phui-timeline-view-css' => 'd7cca980',
'phui-two-column-view-css' => '38871c98',
'phui-workboard-color-css' => 'ac6fe6a7',
'phui-workboard-view-css' => 'e6d89647',
diff --git a/src/applications/celerity/postprocessor/CelerityDefaultPostprocessor.php b/src/applications/celerity/postprocessor/CelerityDefaultPostprocessor.php
--- a/src/applications/celerity/postprocessor/CelerityDefaultPostprocessor.php
+++ b/src/applications/celerity/postprocessor/CelerityDefaultPostprocessor.php
@@ -71,6 +71,7 @@
'hoverselectedgrey' => '#bbc4ca',
'hoverselectedblue' => '#e6e9ee',
'borderinset' => 'inset 0 0 0 1px rgba(55,55,55,.15)',
+ 'timeline' => '#d5d8e1',
// Alphas
'alphawhite' => '255,255,255',
diff --git a/src/applications/metamta/contentsource/PhabricatorContentSourceView.php b/src/applications/metamta/contentsource/PhabricatorContentSourceView.php
--- a/src/applications/metamta/contentsource/PhabricatorContentSourceView.php
+++ b/src/applications/metamta/contentsource/PhabricatorContentSourceView.php
@@ -9,6 +9,13 @@
return $this;
}
+ public function getSourceName() {
+ $map = PhabricatorContentSource::getSourceNameMap();
+ $source = $this->contentSource->getSource();
+ return idx($map, $source, null);
+
+ }
+
public function render() {
require_celerity_resource('phabricator-content-source-view-css');
diff --git a/src/view/phui/PHUITimelineEventView.php b/src/view/phui/PHUITimelineEventView.php
--- a/src/view/phui/PHUITimelineEventView.php
+++ b/src/view/phui/PHUITimelineEventView.php
@@ -236,7 +236,7 @@
}
$icon = id(new PHUIIconView())
- ->setIcon($this->icon.' white')
+ ->setIcon($this->icon)
->addClass('phui-timeline-icon');
$icon = phutil_tag(
@@ -504,11 +504,12 @@
}
$source = $this->getContentSource();
+ $content_source = null;
if ($source) {
- $extra[] = id(new PhabricatorContentSourceView())
+ $content_source = id(new PhabricatorContentSourceView())
->setContentSource($source)
- ->setUser($this->getUser())
- ->render();
+ ->setUser($this->getUser());
+ $content_source = pht('Via %s', $content_source->getSourceName());
}
$date_created = null;
@@ -528,6 +529,7 @@
$this->getUser());
if ($this->anchor) {
Javelin::initBehavior('phabricator-watch-anchor');
+ Javelin::initBehavior('phabricator-tooltips');
$anchor = id(new PhabricatorAnchorView())
->setAnchorName($this->anchor)
@@ -535,10 +537,14 @@
$date = array(
$anchor,
- phutil_tag(
+ javelin_tag(
'a',
array(
'href' => '#'.$this->anchor,
+ 'sigil' => 'has-tooltip',
+ 'meta' => array(
+ 'tip' => $content_source,
+ ),
),
$date),
);
diff --git a/webroot/rsrc/css/phui/phui-property-list-view.css b/webroot/rsrc/css/phui/phui-property-list-view.css
--- a/webroot/rsrc/css/phui/phui-property-list-view.css
+++ b/webroot/rsrc/css/phui/phui-property-list-view.css
@@ -125,7 +125,7 @@
}
.phui-property-list-text-content {
- padding: 12px 4px;
+ padding: 16px 4px;
overflow: hidden;
}
diff --git a/webroot/rsrc/css/phui/phui-timeline-view.css b/webroot/rsrc/css/phui/phui-timeline-view.css
--- a/webroot/rsrc/css/phui/phui-timeline-view.css
+++ b/webroot/rsrc/css/phui/phui-timeline-view.css
@@ -4,7 +4,7 @@
.phui-timeline-view {
padding: 0 16px;
- background-image: url('/rsrc/image/BFCFDA.png');
+ background-image: url('/rsrc/image/d5d8e1.png');
background-repeat: repeat-y;
background-position: 94px;
}
@@ -23,8 +23,8 @@
}
.phui-timeline-major-event .phui-timeline-group {
- border-left: 1px solid {$lightblueborder};
- border-right: 1px solid {$lightblueborder};
+ border-left: 1px solid {$timeline};
+ border-right: 1px solid {$timeline};
border-radius: 3px;
}
@@ -50,7 +50,7 @@
}
.device-desktop .phui-timeline-wedge {
- border-bottom: 1px solid {$lightblueborder};
+ border-bottom: 1px solid {$timeline};
position: absolute;
width: 12px;
}
@@ -61,25 +61,25 @@
}
.phui-timeline-major-event .phui-timeline-content {
- border-top: 1px solid {$lightblueborder};
- border-bottom: 1px solid {$lightblueborder};
+ border-top: 1px solid {$timeline};
+ border-bottom: 1px solid {$timeline};
border-radius: 3px;
}
.phui-timeline-title {
- line-height: 22px;
+ line-height: 24px;
min-height: 19px;
position: relative;
- color: {$bluetext};
+ color: {$greytext};
}
.phui-timeline-minor-event .phui-timeline-title {
- padding: 4px 8px 4px 33px;
+ padding: 2px 8px 4px 33px;
}
.phui-timeline-title a {
font-weight: bold;
- color: {$darkbluetext};
+ color: {$darkgreytext};
}
.device-desktop .phui-timeline-wedge {
@@ -100,7 +100,6 @@
background-repeat: no-repeat;
position: absolute;
border-radius: 3px;
- box-shadow: {$borderinset};
background-size: 100%;
display: block;
}
@@ -120,13 +119,19 @@
}
.phui-timeline-major-event .phui-timeline-title {
- background: {$lightbluebackground};
+ background: {$lightgreybackground};
min-height: 22px;
border-top-right-radius: 3px;
+ border-top-left-radius: 3px;
}
-.phui-timeline-title + .phui-timeline-title {
+.phui-timeline-major-event .phui-timeline-title + .phui-timeline-title {
border-radius: 0;
+ padding-top: 0;
+}
+
+.phui-timeline-title + .phui-timeline-title .phui-timeline-icon {
+ margin-top: 5px;
}
.phui-timeline-title {
@@ -136,7 +141,7 @@
}
.phui-timeline-title-with-icon {
- padding-left: 38px;
+ padding-left: 32px;
}
.phui-timeline-title-with-menu {
@@ -170,9 +175,10 @@
.phui-timeline-major-event .phui-timeline-content
.phui-timeline-core-content {
- padding: 16px 12px;
+ padding: 16px;
line-height: 18px;
background: #fff;
+ border-top: 1px solid rgba({$alphablue},.1);
border-bottom-left-radius: 3px;
border-bottom-right-radius: 3px;
}
@@ -203,25 +209,19 @@
border-width: 0;
}
-.phui-timeline-spacer.phui-timeline-spacer-bold {
- border-bottom: 4px solid {$lightblueborder};
- margin: 0;
-}
-
-.phui-timeline-spacer-bold + .phui-timeline-spacer {
- background-color: #ebecee;
-}
-
.phui-timeline-icon-fill {
position: absolute;
- width: 32px;
- height: 32px;
- background-color: {$lightblueborder};
+ width: 34px;
+ height: 34px;
top: 0;
left: 0;
text-align: center;
}
+.phui-timeline-icon {
+ color: {$sh-blueicon};
+}
+
.phui-icon-view.phui-timeline-icon:before {
font-size: 15px;
}
@@ -230,10 +230,11 @@
height: 28px;
width: 28px;
border-radius: 3px;
+ background-color: #E6E9F1;
}
.phui-timeline-icon-fill .phui-timeline-icon {
- margin-top: 8px;
+ margin-top: 9px;
}
.phui-timeline-minor-event .phui-timeline-icon-fill .phui-timeline-icon {
@@ -242,13 +243,15 @@
.phui-timeline-extra,
.phui-timeline-extra .phabricator-content-source-view {
- font-size: {$smallestfontsize};
+ font-size: {$smallerfontsize};
font-weight: normal;
- color: {$lightbluetext};
+ color: {$lightgreytext};
+ margin-left: 8px;
}
.phui-timeline-title .phui-timeline-extra a {
font-weight: normal;
+ color: {$lightgreytext};
}
.device-desktop .phui-timeline-extra {
@@ -267,44 +270,76 @@
margin: 0;
}
-.phui-timeline-icon-fill-red {
- background-color: {$red};
+.phui-timeline-icon-fill-red .phui-icon-view {
+ color: {$red};
+}
+
+.phui-timeline-minor-event .phui-timeline-icon-fill-red {
+ background-color: {$lightred};
+}
+
+.phui-timeline-icon-fill-orange .phui-icon-view {
+ color: {$orange};
+}
+
+.phui-timeline-minor-event .phui-timeline-icon-fill-orange {
+ background-color: {$lightorange};
+}
+
+.phui-timeline-icon-fill-yellow .phui-icon-view {
+ color: {$sh-yellowicon};
+}
+
+.phui-timeline-minor-event .phui-timeline-icon-fill-yellow {
+ background-color: {$sh-yellowbackground};
+}
+
+.phui-timeline-icon-fill-green .phui-icon-view {
+ color: {$green};
}
-.phui-timeline-icon-fill-orange {
- background-color: {$orange};
+.phui-timeline-minor-event .phui-timeline-icon-fill-green {
+ background-color: {$lightgreen};
}
-.phui-timeline-icon-fill-yellow {
- background-color: {$yellow};
+.phui-timeline-icon-fill-sky .phui-icon-view {
+ color: {$sky};
}
-.phui-timeline-icon-fill-green {
- background-color: {$green};
+.phui-timeline-minor-event .phui-timeline-icon-fill-sky {
+ background-color: {$lightsky};
}
-.phui-timeline-icon-fill-sky {
- background-color: {$sky};
+.phui-timeline-icon-fill-blue .phui-icon-view {
+ color: {$blue};
}
-.phui-timeline-icon-fill-blue {
- background-color: {$blue};
+.phui-timeline-minor-event .phui-timeline-icon-fill-blue {
+ background-color: {$lightblue};
}
-.phui-timeline-icon-fill-indigo {
- background-color: {$indigo};
+.phui-timeline-icon-fill-indigo .phui-icon-view {
+ color: {$indigo};
}
-.phui-timeline-icon-fill-violet {
- background-color: {$violet};
+.phui-timeline-minor-event .phui-timeline-icon-fill-indigo {
+ background-color: {$lightindigo};
}
-.phui-timeline-icon-fill-grey {
- background-color: #888;
+.phui-timeline-icon-fill-violet .phui-icon-view {
+ color: {$violet};
}
-.phui-timeline-icon-fill-black {
- background-color: #333;
+.phui-timeline-minor-event .phui-timeline-icon-fill-violet {
+ background-color: {$lightviolet};
+}
+
+.phui-timeline-icon-fill-grey .phui-icon-view {
+ color: #888;
+}
+
+.phui-timeline-icon-fill-black .phui-icon-view {
+ color: #333;
}
.phui-timeline-shell.anchor-target {
@@ -343,7 +378,7 @@
.phui-timeline-title .phui-timeline-extra-information a {
font-weight: normal;
- color: {$bluetext};
+ color: {$greytext};
}
.phui-timeline-comment-actions .phui-icon-view {
@@ -359,11 +394,11 @@
right: 3px;
top: 6px;
width: 28px;
- height: 22px;
+ height: 24px;
text-align: center;
line-height: 22px;
- font-size: 15px;
- border-left: 1px solid {$lightblueborder};
+ font-size: 16px;
+ border-left: 1px solid {$thinblueborder};
}
.phui-timeline-menu:focus {
@@ -379,11 +414,13 @@
}
.device-desktop a.phui-timeline-menu:hover .phui-icon-view {
- color: {$darkgreytext};
+ color: {$sky};
}
.phui-timeline-menu.phuix-dropdown-open {
- background: {$hovergrey};
+ background: rgba({$alphablue},0.1);
+ border: none;
+ border-radius: 3px;
}
.phui-timeline-view + .phui-object-box {
diff --git a/webroot/rsrc/image/d5d8e1.png b/webroot/rsrc/image/d5d8e1.png
new file mode 100644
index 0000000000000000000000000000000000000000..352aeb61dc89c07e2ae3e42da39a7fe24f3bf21b
GIT binary patch
literal 70
zc%17D@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}1TpU9<W+v~bdi=1SfnyPK-<C$}
QsXz$^Pgg&ebxsLQ0LM!ZNdN!<
literal 0
Hc$@<O00001
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Mon, Nov 11, 9:09 AM (2 d, 20 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6753608
Default Alt Text
D15442.id37219.diff (12 KB)
Attached To
Mode
D15442: Polish up timeline for PHIUTwoColumnView
Attached
Detach File
Event Timeline
Log In to Comment