diff --git a/resources/celerity/map.php b/resources/celerity/map.php --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -121,8 +121,8 @@ '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' => '3b4a65d8', - 'rsrc/css/phui/calendar/phui-calendar-list.css' => '840baa8d', - 'rsrc/css/phui/calendar/phui-calendar-month.css' => '5b213ea0', + 'rsrc/css/phui/calendar/phui-calendar-list.css' => '3e713fc7', + 'rsrc/css/phui/calendar/phui-calendar-month.css' => '7cf00f61', 'rsrc/css/phui/calendar/phui-calendar.css' => '8345be98', 'rsrc/css/phui/phui-action-header-view.css' => '89c497e7', 'rsrc/css/phui/phui-action-list.css' => '4f4d09f2', @@ -762,8 +762,8 @@ 'phui-button-css' => 'de610129', 'phui-calendar-css' => '8345be98', 'phui-calendar-day-css' => '3b4a65d8', - 'phui-calendar-list-css' => '840baa8d', - 'phui-calendar-month-css' => '5b213ea0', + 'phui-calendar-list-css' => '3e713fc7', + 'phui-calendar-month-css' => '7cf00f61', '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 @@ -79,8 +79,8 @@ ), array( $dot, - $title, $time, + $title, )); } 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 @@ -55,7 +55,6 @@ top: 0; width: 60px; right: 0; - top: 0; color: {$lightgreytext}; text-align: right; } 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 @@ -154,6 +154,7 @@ } .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}; @@ -180,24 +181,36 @@ } .phui-calendar-view .phui-calendar-list-dot { + position: relative; + display: inline-block; + float: left; width: 3px; height: 3px; margin-right: 4px; border-radius: 10px; - position: absolute; top: 5px; left: 0; + display: none; } -.phui-calendar-view .phui-calendar-list-title { - width: auto; - white-space: normal; - word-break: break-word; +.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 { - text-align: left; - padding-left: 8px; + padding: 0; + vertical-align: top; + line-height: 16px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; @@ -205,6 +218,8 @@ 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{ @@ -212,17 +227,16 @@ } .phui-calendar-view li.phui-calendar-list-item .phui-calendar-list-time { - position: absolute; + position: relative; + display: inline-block; + float: left; + padding: 0; + line-height: 18px; width: 60px; - right: 0; - top: 1px; color: {$lightgreytext}; - text-align: right; + text-align: left; } -.phui-calendar-view -li.phui-calendar-list-item.all-day -.phui-calendar-list-time { - top: 4px; - right: 8px; +li.phui-calendar-list-item.all-day .phui-calendar-list-time{ + margin: 0 0 0 4px; }