1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-18 19:40:55 +01:00

Remove extra margins on Calendar month view

Summary:
Ref T11326. This doesn't go quite as far as the mock in T11326#185932, but gets rid of the easy margins.

Also cleans up some of the border rules so they're simpler and more consistent (no weird ragged edges on the far right).

Test Plan: {F1738951}

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T11326

Differential Revision: https://secure.phabricator.com/D16335
This commit is contained in:
epriestley 2016-07-27 06:58:28 -07:00
parent aee9d88c17
commit ba00022730
4 changed files with 20 additions and 22 deletions

View file

@ -117,7 +117,7 @@ return array(
'rsrc/css/layout/phabricator-source-code-view.css' => 'cbeef983',
'rsrc/css/phui/calendar/phui-calendar-day.css' => 'f15bb6d6',
'rsrc/css/phui/calendar/phui-calendar-list.css' => '5d89cd71',
'rsrc/css/phui/calendar/phui-calendar-month.css' => '29a5ef75',
'rsrc/css/phui/calendar/phui-calendar-month.css' => '31cec731',
'rsrc/css/phui/calendar/phui-calendar.css' => 'daadaf39',
'rsrc/css/phui/phui-action-list.css' => 'c5eba19d',
'rsrc/css/phui/phui-action-panel.css' => '91c7b835',
@ -830,7 +830,7 @@ return array(
'phui-calendar-css' => 'daadaf39',
'phui-calendar-day-css' => 'f15bb6d6',
'phui-calendar-list-css' => '5d89cd71',
'phui-calendar-month-css' => '29a5ef75',
'phui-calendar-month-css' => '31cec731',
'phui-chart-css' => '6bf6f78e',
'phui-crumbs-view-css' => 'b4fa5755',
'phui-curtain-view-css' => '7148ae25',

View file

@ -255,7 +255,7 @@ final class PhabricatorCalendarEventSearchEngine
array $handles) {
if ($this->isMonthView($query)) {
return $this->buildCalendarView($events, $query);
return $this->buildCalendarMonthView($events, $query);
} else if ($this->isDayView($query)) {
return $this->buildCalendarDayView($events, $query);
}
@ -307,7 +307,7 @@ final class PhabricatorCalendarEventSearchEngine
return $result;
}
private function buildCalendarView(
private function buildCalendarMonthView(
array $events,
PhabricatorSavedQuery $query) {
assert_instances_of($events, 'PhabricatorCalendarEvent');
@ -362,11 +362,9 @@ final class PhabricatorCalendarEventSearchEngine
$month_view->setBrowseURI(
$this->getURI('query/'.$query->getQueryKey().'/'));
// TODO redesign-2015 : Move buttons out of PHUICalendarView?
$result = new PhabricatorApplicationSearchResultView();
$result->setContent($month_view);
return $result;
return id(new PhabricatorApplicationSearchResultView())
->setContent($month_view)
->setCollapsed(true);
}
private function buildCalendarDayView(
@ -422,10 +420,9 @@ final class PhabricatorCalendarEventSearchEngine
$day_view->setBrowseURI(
$this->getURI('query/'.$query->getQueryKey().'/'));
$result = new PhabricatorApplicationSearchResultView();
$result->setContent($day_view);
return $result;
return id(new PhabricatorApplicationSearchResultView())
->setContent($day_view)
->setCollapsed(true);
}
private function getDisplayYearAndMonthAndDay(

View file

@ -1,13 +1,11 @@
<?php
final class PhabricatorApplicationSearchResultView extends Phobject {
/**
* Holds bits and pieces of UI information for Search Engine
* and Dashboard Panel rendering, describing the results and
* controls for presentation.
*
*/
final class PhabricatorApplicationSearchResultView extends Phobject {
private $objectList = null;
private $table = null;

View file

@ -34,10 +34,18 @@ tr.phui-calendar-day-of-week-header th .short-weekday-name {
table.phui-calendar-view td {
border: solid #dfdfdf;
border-width: 1px 1px 0 1px;
border-width: 1px 0 0;
width: 14.2857%; /* This is one seventh, approximately. */
}
table.phui-calendar-view td + td {
border-left-width: 1px;
}
table.phui-calendar-view td.phui-calendar-month-number {
border-top-width: 0;
}
.phui-calendar-month-cell-div {
position: relative;
}
@ -50,10 +58,6 @@ table.phui-calendar-view td {
min-height: 32px;
}
table.phui-calendar-view tr td:first-child {
border-left-width: 0px;
}
.device table.phui-calendar-view .phui-calendar-event-list {
display: none;
}
@ -110,7 +114,6 @@ table.phui-calendar-view a.phui-calendar-date-number {
table.phui-calendar-view td.phui-calendar-month-number {
font-weight: normal;
color: {$lightgreytext};
border-width: 0 1px 0 1px;
text-align: right;
}