Skip to content

Commit ba3047f

Browse files
gammamatrixgammamatrix
committed
Restored color variable options to style.css to maintain backwards compatibility.
1 parent 02967da commit ba3047f

31 files changed

+86
-68
lines changed

‎.psalm/baseline.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@
104104
'generator' => $this->generator,
105105
'low_upper_bound' => $this->thresholds->lowUpperBound(),
106106
'high_lower_bound' => $this->thresholds->highLowerBound(),
107+
'theme' => $this->theme,
107108
]]]></code>
108109
</InvalidArgument>
109110
<PossiblyUndefinedArrayOffset>

‎src/Report/Html/Colors.php‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,33 @@ final class Colors
1919
private readonly string $successHigh;
2020
private readonly string $warning;
2121
private readonly string $danger;
22+
private readonly string $theme;
2223

2324
public static function default(): self
2425
{
25-
return new self('#dff0d8', '#c3e3b5', '#99cb84', '#fcf8e3', '#f2dede');
26+
return new self(
27+
'rgb(from var(--bs-success) r g b / 0.25)',
28+
'rgb(from var(--bs-success) r g b / 0.5)',
29+
'rgb(from var(--bs-success) r g b / 0.75)',
30+
'rgb(from var(--bs-warning) r g b / 0.25)',
31+
'rgb(from var(--bs-danger) r g b / 0.25)',
32+
// 'dark', // or any other theme name defined in customCssFile
33+
);
2634
}
2735

28-
public static function from(string $successLow, string $successMedium, string $successHigh, string $warning, string $danger): self
36+
public static function from(string $successLow, string $successMedium, string $successHigh, string $warning, string $danger, string $theme = ''): self
2937
{
30-
return new self($successLow, $successMedium, $successHigh, $warning, $danger);
38+
return new self($successLow, $successMedium, $successHigh, $warning, $danger, $theme);
3139
}
3240

33-
private function __construct(string $successLow, string $successMedium, string $successHigh, string $warning, string $danger)
41+
private function __construct(string $successLow, string $successMedium, string $successHigh, string $warning, string $danger, string $theme = '')
3442
{
3543
$this->successLow = $successLow;
3644
$this->successMedium = $successMedium;
3745
$this->successHigh = $successHigh;
3846
$this->warning = $warning;
3947
$this->danger = $danger;
48+
$this->theme = $theme;
4049
}
4150

4251
public function successLow(): string
@@ -63,4 +72,9 @@ public function danger(): string
6372
{
6473
return $this->danger;
6574
}
75+
76+
public function theme(): string
77+
{
78+
return $this->theme;
79+
}
6680
}

‎src/Report/Html/Facade.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ public function process(CodeCoverage $coverage, string $target): void
5151
$date,
5252
$this->thresholds,
5353
$coverage->collectsBranchAndPathCoverage(),
54+
$this->colors->theme(),
5455
);
5556

5657
$directory = new Directory(
@@ -59,6 +60,7 @@ public function process(CodeCoverage $coverage, string $target): void
5960
$date,
6061
$this->thresholds,
6162
$coverage->collectsBranchAndPathCoverage(),
63+
$this->colors->theme(),
6264
);
6365

6466
$file = new File(
@@ -67,6 +69,7 @@ public function process(CodeCoverage $coverage, string $target): void
6769
$date,
6870
$this->thresholds,
6971
$coverage->collectsBranchAndPathCoverage(),
72+
$this->colors->theme(),
7073
);
7174

7275
$directory->render($report, $target . 'index.html');

‎src/Report/Html/Renderer.php‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,17 @@ abstract class Renderer
3333
protected Thresholds $thresholds;
3434
protected bool $hasBranchCoverage;
3535
protected string $version;
36+
protected string $theme;
3637

37-
public function __construct(string $templatePath, string $generator, string $date, Thresholds $thresholds, bool $hasBranchCoverage)
38+
public function __construct(string $templatePath, string $generator, string $date, Thresholds $thresholds, bool $hasBranchCoverage, string $theme)
3839
{
3940
$this->templatePath = $templatePath;
4041
$this->generator = $generator;
4142
$this->date = $date;
4243
$this->thresholds = $thresholds;
4344
$this->version = Version::id();
4445
$this->hasBranchCoverage = $hasBranchCoverage;
46+
$this->theme = $theme;
4547
}
4648

4749
protected function renderItemTemplate(Template $template, array $data): string
@@ -173,6 +175,7 @@ protected function setCommonTemplateVariables(Template $template, AbstractNode $
173175
'generator' => $this->generator,
174176
'low_upper_bound' => $this->thresholds->lowUpperBound(),
175177
'high_lower_bound' => $this->thresholds->highLowerBound(),
178+
'theme' => $this->theme,
176179
],
177180
);
178181
}

‎src/Report/Html/Renderer/Template/css/style.css‎

Lines changed: 10 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -40,38 +40,27 @@ body {
4040
}
4141

4242
.table tbody tr.covered-by-large-tests td, li.covered-by-large-tests, tr.success, td.success, li.success, span.success {
43-
/* background-color: {{success-low}}; */
44-
/* background-color: var(--bs-success-border-subtle); */
45-
background-color: rgb(from var(--bs-success) r g b / 0.25);
43+
background-color: {{success-low}};
4644
}
4745

4846
.table tbody tr.covered-by-medium-tests td, li.covered-by-medium-tests {
49-
/* background-color: {{success-medium}}; */
50-
/* background-color: var(--bs-success-bg-subtle); */
51-
background-color: rgb(from var(--bs-success) r g b / 0.5);
47+
background-color: {{success-medium}};
5248
}
5349

5450
.table tbody tr.covered-by-small-tests td, li.covered-by-small-tests {
55-
/* background-color: {{success-high}}; */
56-
/* background-color: var(--bs-success-bg-subtle); */
57-
background-color: rgb(from var(--bs-success) r g b / 0.75);
51+
background-color: {{success-high}};
5852
}
5953

6054
.table tbody tr.warning td, .table tbody td.warning, li.warning, span.warning {
61-
/* background-color: {{warning}}; */
62-
/* background-color: var(--bs-warning-bg-subtle); */
63-
background-color: rgb(from var(--bs-warning) r g b / 0.25);
55+
background-color: {{warning}};
6456
}
6557

6658
.table tbody tr.danger td, .table tbody td.danger, li.danger, span.danger {
67-
/* background-color: {{danger}}; */
68-
/* background-color: var(--bs-danger-bg-subtle); */
69-
background-color: rgb(from var(--bs-danger) r g b / 0.25);
59+
background-color: {{danger}};
7060
}
7161

7262
.table tbody td.info {
7363
/* background-color: #d9edf7; */
74-
/* background-color: var(--bs-info-bg-subtle); */
7564
background-color: rgb(from var(--bs-info) r g b / 0.25);
7665
}
7766

@@ -160,31 +149,21 @@ table + .structure-heading {
160149
}
161150

162151
.covered-by-small-tests, tr.covered-by-small-tests td {
163-
/* background-color: {{success-high}}; */
164-
/* background-color: var(--bs-success-bg-subtle); */
165-
background-color: rgb(from var(--bs-success) r g b / 0.75);
152+
background-color: {{success-high}};
166153
}
167154

168155
.covered-by-medium-tests, tr.covered-by-medium-tests td {
169-
/* background-color: {{success-medium}}; */
170-
/* background-color: var(--bs-success-bg-subtle); */
171-
background-color: rgb(from var(--bs-success) r g b / 0.5);
156+
background-color: {{success-medium}};
172157
}
173158

174159
.covered-by-large-tests, tr.covered-by-large-tests td {
175-
/* background-color: {{success-low}}; */
176-
/* background-color: var(--bs-success-border-subtle); */
177-
background-color: rgb(from var(--bs-success) r g b / 0.25);
160+
background-color: {{success-low}};
178161
}
179162

180163
.not-covered, tr.not-covered td {
181-
/* background-color: {{danger}}; */
182-
/* background-color: var(--bs-danger-bg-subtle); */
183-
background-color: rgb(from var(--bs-danger) r g b / 0.25);
164+
background-color: {{danger}};
184165
}
185166

186167
.not-coverable, tr.not-coverable td {
187-
/* background-color: {{warning}}; */
188-
/* background-color: var(--bs-warning-bg-subtle); */
189-
background-color: rgb(from var(--bs-warning) r g b / 0.25);
168+
background-color: {{warning}};
190169
}

‎src/Report/Html/Renderer/Template/dashboard.html.dist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<html lang="en" data-bs-theme="dark">
2+
<html lang="en" data-bs-theme="{{theme}}">
33
<head>
44
<meta charset="UTF-8">
55
<title>Dashboard for {{full_path}}</title>

‎src/Report/Html/Renderer/Template/dashboard_branch.html.dist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<html lang="en" data-bs-theme="dark">
2+
<html lang="en" data-bs-theme="{{theme}}">
33
<head>
44
<meta charset="UTF-8">
55
<title>Dashboard for {{full_path}}</title>

‎src/Report/Html/Renderer/Template/directory.html.dist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<html lang="en" data-bs-theme="dark">
2+
<html lang="en" data-bs-theme="{{theme}}">
33
<head>
44
<meta charset="UTF-8">
55
<title>Code Coverage for {{full_path}}</title>

‎src/Report/Html/Renderer/Template/directory_branch.html.dist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<html lang="en" data-bs-theme="dark">
2+
<html lang="en" data-bs-theme="{{theme}}">
33
<head>
44
<meta charset="UTF-8">
55
<title>Code Coverage for {{full_path}}</title>

‎src/Report/Html/Renderer/Template/file.html.dist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<html lang="en" data-bs-theme="dark">
2+
<html lang="en" data-bs-theme="{{theme}}">
33
<head>
44
<meta charset="UTF-8">
55
<title>Code Coverage for {{full_path}}</title>

0 commit comments

Comments
 (0)