@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
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
+20
-22
+2
-2
resources/celerity/map.php
+2
-2
resources/celerity/map.php
···
117
117
'rsrc/css/layout/phabricator-source-code-view.css' => 'cbeef983',
118
118
'rsrc/css/phui/calendar/phui-calendar-day.css' => 'f15bb6d6',
119
119
'rsrc/css/phui/calendar/phui-calendar-list.css' => '5d89cd71',
120
-
'rsrc/css/phui/calendar/phui-calendar-month.css' => '29a5ef75',
120
+
'rsrc/css/phui/calendar/phui-calendar-month.css' => '31cec731',
121
121
'rsrc/css/phui/calendar/phui-calendar.css' => 'daadaf39',
122
122
'rsrc/css/phui/phui-action-list.css' => 'c5eba19d',
123
123
'rsrc/css/phui/phui-action-panel.css' => '91c7b835',
···
830
830
'phui-calendar-css' => 'daadaf39',
831
831
'phui-calendar-day-css' => 'f15bb6d6',
832
832
'phui-calendar-list-css' => '5d89cd71',
833
-
'phui-calendar-month-css' => '29a5ef75',
833
+
'phui-calendar-month-css' => '31cec731',
834
834
'phui-chart-css' => '6bf6f78e',
835
835
'phui-crumbs-view-css' => 'b4fa5755',
836
836
'phui-curtain-view-css' => '7148ae25',
+8
-11
src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php
+8
-11
src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php
···
255
255
array $handles) {
256
256
257
257
if ($this->isMonthView($query)) {
258
-
return $this->buildCalendarView($events, $query);
258
+
return $this->buildCalendarMonthView($events, $query);
259
259
} else if ($this->isDayView($query)) {
260
260
return $this->buildCalendarDayView($events, $query);
261
261
}
···
307
307
return $result;
308
308
}
309
309
310
-
private function buildCalendarView(
310
+
private function buildCalendarMonthView(
311
311
array $events,
312
312
PhabricatorSavedQuery $query) {
313
313
assert_instances_of($events, 'PhabricatorCalendarEvent');
···
362
362
$month_view->setBrowseURI(
363
363
$this->getURI('query/'.$query->getQueryKey().'/'));
364
364
365
-
// TODO redesign-2015 : Move buttons out of PHUICalendarView?
366
-
$result = new PhabricatorApplicationSearchResultView();
367
-
$result->setContent($month_view);
368
-
369
-
return $result;
365
+
return id(new PhabricatorApplicationSearchResultView())
366
+
->setContent($month_view)
367
+
->setCollapsed(true);
370
368
}
371
369
372
370
private function buildCalendarDayView(
···
422
420
$day_view->setBrowseURI(
423
421
$this->getURI('query/'.$query->getQueryKey().'/'));
424
422
425
-
$result = new PhabricatorApplicationSearchResultView();
426
-
$result->setContent($day_view);
427
-
428
-
return $result;
423
+
return id(new PhabricatorApplicationSearchResultView())
424
+
->setContent($day_view)
425
+
->setCollapsed(true);
429
426
}
430
427
431
428
private function getDisplayYearAndMonthAndDay(
+1
-3
src/applications/search/view/PhabricatorApplicationSearchResultView.php
+1
-3
src/applications/search/view/PhabricatorApplicationSearchResultView.php
···
1
1
<?php
2
2
3
-
final class PhabricatorApplicationSearchResultView extends Phobject {
4
-
5
3
/**
6
4
* Holds bits and pieces of UI information for Search Engine
7
5
* and Dashboard Panel rendering, describing the results and
8
6
* controls for presentation.
9
-
*
10
7
*/
8
+
final class PhabricatorApplicationSearchResultView extends Phobject {
11
9
12
10
private $objectList = null;
13
11
private $table = null;
+9
-6
webroot/rsrc/css/phui/calendar/phui-calendar-month.css
+9
-6
webroot/rsrc/css/phui/calendar/phui-calendar-month.css
···
34
34
35
35
table.phui-calendar-view td {
36
36
border: solid #dfdfdf;
37
-
border-width: 1px 1px 0 1px;
37
+
border-width: 1px 0 0;
38
38
width: 14.2857%; /* This is one seventh, approximately. */
39
+
}
40
+
41
+
table.phui-calendar-view td + td {
42
+
border-left-width: 1px;
43
+
}
44
+
45
+
table.phui-calendar-view td.phui-calendar-month-number {
46
+
border-top-width: 0;
39
47
}
40
48
41
49
.phui-calendar-month-cell-div {
···
48
56
49
57
.device .phui-calendar-month-event-list .phui-calendar-month-cell-div {
50
58
min-height: 32px;
51
-
}
52
-
53
-
table.phui-calendar-view tr td:first-child {
54
-
border-left-width: 0px;
55
59
}
56
60
57
61
.device table.phui-calendar-view .phui-calendar-event-list {
···
110
114
table.phui-calendar-view td.phui-calendar-month-number {
111
115
font-weight: normal;
112
116
color: {$lightgreytext};
113
-
border-width: 0 1px 0 1px;
114
117
text-align: right;
115
118
}
116
119