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:
parent
aee9d88c17
commit
ba00022730
4 changed files with 20 additions and 22 deletions
|
@ -117,7 +117,7 @@ return array(
|
||||||
'rsrc/css/layout/phabricator-source-code-view.css' => 'cbeef983',
|
'rsrc/css/layout/phabricator-source-code-view.css' => 'cbeef983',
|
||||||
'rsrc/css/phui/calendar/phui-calendar-day.css' => 'f15bb6d6',
|
'rsrc/css/phui/calendar/phui-calendar-day.css' => 'f15bb6d6',
|
||||||
'rsrc/css/phui/calendar/phui-calendar-list.css' => '5d89cd71',
|
'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/calendar/phui-calendar.css' => 'daadaf39',
|
||||||
'rsrc/css/phui/phui-action-list.css' => 'c5eba19d',
|
'rsrc/css/phui/phui-action-list.css' => 'c5eba19d',
|
||||||
'rsrc/css/phui/phui-action-panel.css' => '91c7b835',
|
'rsrc/css/phui/phui-action-panel.css' => '91c7b835',
|
||||||
|
@ -830,7 +830,7 @@ return array(
|
||||||
'phui-calendar-css' => 'daadaf39',
|
'phui-calendar-css' => 'daadaf39',
|
||||||
'phui-calendar-day-css' => 'f15bb6d6',
|
'phui-calendar-day-css' => 'f15bb6d6',
|
||||||
'phui-calendar-list-css' => '5d89cd71',
|
'phui-calendar-list-css' => '5d89cd71',
|
||||||
'phui-calendar-month-css' => '29a5ef75',
|
'phui-calendar-month-css' => '31cec731',
|
||||||
'phui-chart-css' => '6bf6f78e',
|
'phui-chart-css' => '6bf6f78e',
|
||||||
'phui-crumbs-view-css' => 'b4fa5755',
|
'phui-crumbs-view-css' => 'b4fa5755',
|
||||||
'phui-curtain-view-css' => '7148ae25',
|
'phui-curtain-view-css' => '7148ae25',
|
||||||
|
|
|
@ -255,7 +255,7 @@ final class PhabricatorCalendarEventSearchEngine
|
||||||
array $handles) {
|
array $handles) {
|
||||||
|
|
||||||
if ($this->isMonthView($query)) {
|
if ($this->isMonthView($query)) {
|
||||||
return $this->buildCalendarView($events, $query);
|
return $this->buildCalendarMonthView($events, $query);
|
||||||
} else if ($this->isDayView($query)) {
|
} else if ($this->isDayView($query)) {
|
||||||
return $this->buildCalendarDayView($events, $query);
|
return $this->buildCalendarDayView($events, $query);
|
||||||
}
|
}
|
||||||
|
@ -307,7 +307,7 @@ final class PhabricatorCalendarEventSearchEngine
|
||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
|
|
||||||
private function buildCalendarView(
|
private function buildCalendarMonthView(
|
||||||
array $events,
|
array $events,
|
||||||
PhabricatorSavedQuery $query) {
|
PhabricatorSavedQuery $query) {
|
||||||
assert_instances_of($events, 'PhabricatorCalendarEvent');
|
assert_instances_of($events, 'PhabricatorCalendarEvent');
|
||||||
|
@ -362,11 +362,9 @@ final class PhabricatorCalendarEventSearchEngine
|
||||||
$month_view->setBrowseURI(
|
$month_view->setBrowseURI(
|
||||||
$this->getURI('query/'.$query->getQueryKey().'/'));
|
$this->getURI('query/'.$query->getQueryKey().'/'));
|
||||||
|
|
||||||
// TODO redesign-2015 : Move buttons out of PHUICalendarView?
|
return id(new PhabricatorApplicationSearchResultView())
|
||||||
$result = new PhabricatorApplicationSearchResultView();
|
->setContent($month_view)
|
||||||
$result->setContent($month_view);
|
->setCollapsed(true);
|
||||||
|
|
||||||
return $result;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private function buildCalendarDayView(
|
private function buildCalendarDayView(
|
||||||
|
@ -422,10 +420,9 @@ final class PhabricatorCalendarEventSearchEngine
|
||||||
$day_view->setBrowseURI(
|
$day_view->setBrowseURI(
|
||||||
$this->getURI('query/'.$query->getQueryKey().'/'));
|
$this->getURI('query/'.$query->getQueryKey().'/'));
|
||||||
|
|
||||||
$result = new PhabricatorApplicationSearchResultView();
|
return id(new PhabricatorApplicationSearchResultView())
|
||||||
$result->setContent($day_view);
|
->setContent($day_view)
|
||||||
|
->setCollapsed(true);
|
||||||
return $result;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private function getDisplayYearAndMonthAndDay(
|
private function getDisplayYearAndMonthAndDay(
|
||||||
|
|
|
@ -1,13 +1,11 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
final class PhabricatorApplicationSearchResultView extends Phobject {
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Holds bits and pieces of UI information for Search Engine
|
* Holds bits and pieces of UI information for Search Engine
|
||||||
* and Dashboard Panel rendering, describing the results and
|
* and Dashboard Panel rendering, describing the results and
|
||||||
* controls for presentation.
|
* controls for presentation.
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
|
final class PhabricatorApplicationSearchResultView extends Phobject {
|
||||||
|
|
||||||
private $objectList = null;
|
private $objectList = null;
|
||||||
private $table = null;
|
private $table = null;
|
||||||
|
|
|
@ -34,10 +34,18 @@ tr.phui-calendar-day-of-week-header th .short-weekday-name {
|
||||||
|
|
||||||
table.phui-calendar-view td {
|
table.phui-calendar-view td {
|
||||||
border: solid #dfdfdf;
|
border: solid #dfdfdf;
|
||||||
border-width: 1px 1px 0 1px;
|
border-width: 1px 0 0;
|
||||||
width: 14.2857%; /* This is one seventh, approximately. */
|
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 {
|
.phui-calendar-month-cell-div {
|
||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
|
@ -50,10 +58,6 @@ table.phui-calendar-view td {
|
||||||
min-height: 32px;
|
min-height: 32px;
|
||||||
}
|
}
|
||||||
|
|
||||||
table.phui-calendar-view tr td:first-child {
|
|
||||||
border-left-width: 0px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.device table.phui-calendar-view .phui-calendar-event-list {
|
.device table.phui-calendar-view .phui-calendar-event-list {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
@ -110,7 +114,6 @@ table.phui-calendar-view a.phui-calendar-date-number {
|
||||||
table.phui-calendar-view td.phui-calendar-month-number {
|
table.phui-calendar-view td.phui-calendar-month-number {
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
color: {$lightgreytext};
|
color: {$lightgreytext};
|
||||||
border-width: 0 1px 0 1px;
|
|
||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue