Page MenuHomePhabricator
Files F14006418

D12925.diff
No OneTemporary
Actions

D12925.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
@@ -121,9 +121,9 @@
'rsrc/css/layout/phabricator-side-menu-view.css' => 'c1db9e9c',
'rsrc/css/layout/phabricator-source-code-view.css' => '2ceee894',
'rsrc/css/phui/calendar/phui-calendar-day.css' => 'c0cf782a',
- 'rsrc/css/phui/calendar/phui-calendar-list.css' => '3e713fc7',
- 'rsrc/css/phui/calendar/phui-calendar-month.css' => '017a953b',
- 'rsrc/css/phui/calendar/phui-calendar.css' => '8345be98',
+ 'rsrc/css/phui/calendar/phui-calendar-list.css' => '857a0d83',
+ 'rsrc/css/phui/calendar/phui-calendar-month.css' => '32e3bee4',
+ 'rsrc/css/phui/calendar/phui-calendar.css' => 'ccabe893',
'rsrc/css/phui/phui-action-header-view.css' => '89c497e7',
'rsrc/css/phui/phui-action-list.css' => '4f4d09f2',
'rsrc/css/phui/phui-action-panel.css' => '3ee9afd5',
@@ -760,10 +760,10 @@
'phui-action-panel-css' => '3ee9afd5',
'phui-box-css' => '7b3a2eed',
'phui-button-css' => 'de610129',
- 'phui-calendar-css' => '8345be98',
+ 'phui-calendar-css' => 'ccabe893',
'phui-calendar-day-css' => 'c0cf782a',
- 'phui-calendar-list-css' => '3e713fc7',
- 'phui-calendar-month-css' => '017a953b',
+ 'phui-calendar-list-css' => '857a0d83',
+ 'phui-calendar-month-css' => '32e3bee4',
'phui-crumbs-view-css' => '594d719e',
'phui-document-view-css' => '94d5dcd8',
'phui-feed-story-css' => 'c9f3a0b5',
diff --git a/src/view/phui/calendar/PHUICalendarListView.php b/src/view/phui/calendar/PHUICalendarListView.php
--- a/src/view/phui/calendar/PHUICalendarListView.php
+++ b/src/view/phui/calendar/PHUICalendarListView.php
@@ -72,16 +72,23 @@
$class = $class.' all-day';
}
- $singletons[] = phutil_tag(
- 'li',
+ $content = phutil_tag(
+ 'a',
array(
- 'class' => $class,
- ),
+ 'href' => '/E'.$event->getEventID(),
+ ),
array(
$dot,
$time,
$title,
));
+
+ $singletons[] = phutil_tag(
+ 'li',
+ array(
+ 'class' => $class,
+ ),
+ $content);
}
if (empty($singletons)) {
@@ -147,11 +154,10 @@
$class = 'phui-calendar-item';
$anchor = javelin_tag(
- 'a',
+ 'span',
array(
'sigil' => 'has-tooltip',
'class' => $class,
- 'href' => '/E'.$event->getEventID(),
'meta' => array(
'tip' => $tip,
'size' => 200,
diff --git a/webroot/rsrc/css/phui/calendar/phui-calendar-list.css b/webroot/rsrc/css/phui/calendar/phui-calendar-list.css
--- a/webroot/rsrc/css/phui/calendar/phui-calendar-list.css
+++ b/webroot/rsrc/css/phui/calendar/phui-calendar-list.css
@@ -43,11 +43,15 @@
}
.phui-calendar-list-title {
- width: 200px;
- display: inline-block;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
+ width: 200px;
+ display: inline-block;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+
+.phui-calendar-viewer-invited .phui-calendar-list-title {
+ font-weight: bold;
}
.phui-calendar-list-item .phui-calendar-list-time {
diff --git a/webroot/rsrc/css/phui/calendar/phui-calendar-month.css b/webroot/rsrc/css/phui/calendar/phui-calendar-month.css
--- a/webroot/rsrc/css/phui/calendar/phui-calendar-month.css
+++ b/webroot/rsrc/css/phui/calendar/phui-calendar-month.css
@@ -151,6 +151,7 @@
.phui-calendar-view .phui-calendar-list {
padding: 1px;
+ width: auto;
}
.phui-calendar-list-item.all-day span {
@@ -160,8 +161,6 @@
.phui-calendar-view .phui-calendar-list li.phui-calendar-list-item.all-day {
height: 20px;
- margin: 0;
- padding: 4px 4px 0px 4px;
background-color: {$darkgreybackground};
display: block;
float: none;
@@ -173,21 +172,24 @@
background-color: {$lightgreen};
}
-li.phui-calendar-list-item.all-day:first-child {
- margin-top: 0;
+.phui-calendar-view .phui-calendar-list li {
+ padding: 0px 4px;
}
-.phui-calendar-view .phui-calendar-list li {
- margin: 0 8px;
+.phui-calendar-view .phui-calendar-list li a {
+ display: block;
+ overflow: hidden;
+ position: relative;
}
-.phui-calendar-view .phui-calendar-list li:first-child {
- margin-top: 8px;
+.phui-calendar-view li.phui-calendar-list-item {
+ white-space: nowrap;
+ width: auto;
}
.phui-calendar-view .phui-calendar-list-dot {
position: relative;
- display: inline-block;
+ display: block;
float: left;
width: 3px;
height: 3px;
@@ -198,37 +200,18 @@
display: none;
}
-.phui-calendar-view li.phui-calendar-list-item {
- padding: 0;
-}
-
.phui-calendar-view li.phui-calendar-list-item .phui-calendar-list-title {
- position: relative;
- /*float: right;*/
- display: inline-block;
- width: 120px;
- padding: 0;
- line-height: 18px;
- vertical-align: center;
-}
-
-li.phui-calendar-list-item .phui-calendar-list-title a {
- padding: 0;
- vertical-align: top;
- line-height: 16px;
- overflow: hidden;
+ width: auto;
+ position: absolute;
+ right: 0;
+ left: 60px;
text-overflow: ellipsis;
+ overflow: hidden;
white-space: nowrap;
}
-li.phui-calendar-list-item.all-day .phui-calendar-list-title a{
- color: {$greytext};
- margin: 0;
- padding: 0;
-}
-
-li.phui-calendar-viewer-invited.all-day .phui-calendar-list-title a{
- color: {$green};
+li.all-day {
+ line-height: 18px;
}
.phui-calendar-view li.phui-calendar-list-item .phui-calendar-list-time {
@@ -241,7 +224,3 @@
color: {$lightgreytext};
text-align: left;
}
-
-li.phui-calendar-list-item.all-day .phui-calendar-list-time{
- margin: 0 0 0 4px;
-}
diff --git a/webroot/rsrc/css/phui/calendar/phui-calendar.css b/webroot/rsrc/css/phui/calendar/phui-calendar.css
--- a/webroot/rsrc/css/phui/calendar/phui-calendar.css
+++ b/webroot/rsrc/css/phui/calendar/phui-calendar.css
@@ -8,7 +8,6 @@
.phui-calendar-viewer-invited a {
color: {$green};
- font-weight: bold;
}
.phui-calendar-red a {

File Metadata

Mime Type
text/plain
Expires
Tue, Oct 29, 9:18 AM (2 w, 6 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6721727
Default Alt Text
D12925.diff (5 KB)

Event Timeline

Phabricator · Built by Phacility