Skip to content

Commit 68c72c7

Browse files
BeyondEvilBeyondEvil
committed
Merge branch 'initial-frontend' into next-gen
2 parents dda6757 + 81abf68 commit 68c72c7

File tree

11 files changed

+1451
-345
lines changed

11 files changed

+1451
-345
lines changed

‎src/layout/css/style.scss‎

Lines changed: 180 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -6,59 +6,62 @@ $border-width: 1px;
66

77
$spacing: 5px;
88

9-
10-
119
body {
12-
font-family: Helvetica, Arial, sans-serif;
13-
font-size: $font-size-text;
14-
/* do not increase min-width as some may use split screens */
15-
min-width: 800px;
16-
color: #999;
10+
font-family: Helvetica, Arial, sans-serif;
11+
font-size: $font-size-text;
12+
/* do not increase min-width as some may use split screens */
13+
min-width: 800px;
14+
color: #999;
1715
}
1816

1917
h1 {
20-
font-size: $font-size-h1;
21-
color: black;
18+
font-size: $font-size-h1;
19+
color: black;
2220
}
2321

2422
h2 {
25-
font-size: $font-size-h2;
26-
color: black;
23+
font-size: $font-size-h2;
24+
color: black;
2725
}
2826

2927
p {
30-
color: black;
28+
color: black;
3129
}
3230

3331
a {
34-
color: #999;
32+
color: #999;
3533
}
3634

3735
table {
38-
border-collapse: collapse;
36+
border-collapse: collapse;
3937
}
4038

4139
/******************************
4240
* SUMMARY INFORMATION
4341
******************************/
4442

4543
#environment {
46-
td {
47-
padding: $spacing;
48-
border: $border-width solid #E6E6E6;
49-
}
50-
51-
tr:nth-child(odd) {
52-
background-color: #f6f6f6;
53-
}
44+
td {
45+
padding: $spacing;
46+
border: $border-width solid #e6e6e6;
47+
vertical-align: top;
48+
}
49+
50+
tr:nth-child(odd) {
51+
background-color: #f6f6f6;
52+
}
53+
ul {
54+
margin: 0;
55+
padding: 0 20px;
56+
}
5457
}
5558

5659
/******************************
5760
* TEST RESULT COLORS
5861
******************************/
5962
span.passed,
6063
.passed .col-result {
61-
color: green;
64+
color: green;
6265
}
6366

6467
span.skipped,
@@ -67,7 +70,7 @@ span.rerun,
6770
.skipped .col-result,
6871
.xfailed .col-result,
6972
.rerun .col-result {
70-
color: orange;
73+
color: orange;
7174
}
7275

7376
span.error,
@@ -76,9 +79,15 @@ span.xpassed,
7679
.error .col-result,
7780
.failed .col-result,
7881
.xpassed .col-result {
79-
color: red;
82+
color: red;
8083
}
8184

85+
.col-result {
86+
text-transform: capitalize;
87+
}
88+
.col-links__extra {
89+
margin-right: 3px;
90+
}
8291

8392
/******************************
8493
* RESULTS TABLE
@@ -94,21 +103,21 @@ span.xpassed,
94103
*------------------*/
95104

96105
#results-table {
97-
border: $border-width solid #e6e6e6;
98-
color: #999;
99-
font-size: $font-size-text;
100-
width: 100%;
101-
102-
th,
103-
td {
104-
padding: $spacing;
105-
border: $border-width solid #E6E6E6;
106-
text-align: left;
107-
}
108-
109-
th {
110-
font-weight: bold;
111-
}
106+
border: $border-width solid #e6e6e6;
107+
color: #999;
108+
font-size: $font-size-text;
109+
width: 100%;
110+
111+
th,
112+
td {
113+
padding: $spacing;
114+
border: $border-width solid #e6e6e6;
115+
text-align: left;
116+
}
117+
118+
th {
119+
font-weight: bold;
120+
}
112121
}
113122

114123
/*------------------
@@ -119,99 +128,159 @@ $extra-height: 240px;
119128
$extra-media-width: 320px;
120129

121130
.log {
122-
background-color: #e6e6e6;
123-
border: $border-width solid #e6e6e6;
124-
color: black;
125-
display: block;
126-
font-family: "Courier New", Courier, monospace;
127-
height: $extra-height - 2 * $spacing;
128-
overflow-y: scroll;
129-
padding: $spacing;
130-
white-space: pre-wrap;
131-
132-
&:only-child {
133-
height: inherit;
134-
}
131+
background-color: #e6e6e6;
132+
border: $border-width solid #e6e6e6;
133+
color: black;
134+
display: block;
135+
font-family: 'Courier New', Courier, monospace;
136+
height: $extra-height - 2 * $spacing;
137+
overflow-y: scroll;
138+
padding: $spacing;
139+
white-space: pre-wrap;
140+
141+
&:only-child {
142+
height: inherit;
143+
}
135144
}
136145

137146
div.image {
138-
border: $border-width solid #e6e6e6;
139-
float: right;
140-
height: $extra-height;
141-
margin-left: $spacing;
142-
overflow: hidden;
143-
width: $extra-media-width;
144-
145-
img {
146-
width: $extra-media-width;
147-
}
147+
border: $border-width solid #e6e6e6;
148+
float: right;
149+
height: $extra-height;
150+
margin-left: $spacing;
151+
overflow: hidden;
152+
width: $extra-media-width;
153+
154+
img {
155+
width: $extra-media-width;
156+
}
148157
}
149158

150159
div.video {
151-
border: $border-width solid #e6e6e6;
152-
float: right;
153-
height: $extra-height;
154-
margin-left: $spacing;
155-
overflow: hidden;
156-
width: $extra-media-width;
157-
158-
video {
159-
overflow: hidden;
160-
width: $extra-media-width;
161-
height: $extra-height;
162-
}
160+
border: $border-width solid #e6e6e6;
161+
float: right;
162+
height: $extra-height;
163+
margin-left: $spacing;
164+
overflow: hidden;
165+
width: $extra-media-width;
166+
167+
video {
168+
overflow: hidden;
169+
width: $extra-media-width;
170+
height: $extra-height;
171+
}
163172
}
164173

165174
.collapsed {
166-
display: none;
175+
display: none;
167176
}
168177

169178
.expander::after {
170-
content: " (show details)";
171-
color: #BBB;
172-
font-style: italic;
173-
cursor: pointer;
179+
content: ' (show details)';
180+
color: #bbb;
181+
font-style: italic;
182+
cursor: pointer;
174183
}
175184

176185
.collapser::after {
177-
content: " (hide details)";
178-
color: #BBB;
179-
font-style: italic;
180-
cursor: pointer;
186+
content: ' (hide details)';
187+
color: #bbb;
188+
font-style: italic;
189+
cursor: pointer;
181190
}
182191

183192
/*------------------
184193
* 3. Sorting items
185194
*------------------*/
186195
.sortable {
187-
cursor: pointer;
196+
cursor: pointer;
197+
&.asc {
198+
&:after {
199+
content: ' ';
200+
position: relative;
201+
left: 5px;
202+
bottom: -12.5px;
203+
border: 10px solid #4caf50;
204+
border-bottom: 0;
205+
border-left-color: transparent;
206+
border-right-color: transparent;
207+
}
208+
}
209+
&.desc {
210+
&:after {
211+
content: ' ';
212+
position: relative;
213+
left: 5px;
214+
bottom: 12.5px;
215+
border: 10px solid #4caf50;
216+
border-top: 0;
217+
border-left-color: transparent;
218+
border-right-color: transparent;
219+
}
220+
}
188221
}
189222

190223
.sort-icon {
191-
font-size: 0px;
192-
float: left;
193-
margin-right: $spacing;
194-
margin-top: $spacing;
195-
196-
/*triangle*/
197-
$triangle-width: 8px;
198-
width: 0;
199-
height: 0;
200-
border-left: $triangle-width solid transparent;
201-
border-right: $triangle-width solid transparent;
202-
203-
.inactive & {
204-
/*finish triangle*/
205-
border-top: $triangle-width solid #E6E6E6;
206-
}
207-
208-
.asc.active & {
209-
/*finish triangle*/
210-
border-bottom: $triangle-width solid #999;
211-
}
212-
213-
.desc.active & {
214-
/*finish triangle*/
215-
border-top: $triangle-width solid #999;
216-
}
224+
// font-size: 0px;
225+
// float: left;
226+
// margin-right: $spacing;
227+
// margin-top: $spacing;
228+
229+
// /*triangle*/
230+
// $triangle-width: 8px;
231+
// width: 0;
232+
// height: 0;
233+
// border-left: $triangle-width solid transparent;
234+
// border-right: $triangle-width solid transparent;
235+
236+
// .asc {
237+
// /*finish triangle*/
238+
// border-bottom: $triangle-width solid #999;
239+
// }
240+
241+
// .desc {
242+
// /*finish triangle*/
243+
// border-top: $triangle-width solid #999;
244+
// }
245+
}
246+
247+
.hidden {
248+
display: none;
249+
}
250+
251+
.summary {
252+
display: flex;
253+
&__data {
254+
flex: 0 0 550px;
255+
}
256+
&__reload {
257+
flex: 1 1;
258+
display: flex;
259+
justify-content: center;
260+
&__button {
261+
flex: 0 0 300px;
262+
display: flex;
263+
color: white;
264+
font-weight: bold;
265+
background-color: #4caf50;
266+
text-align: center;
267+
justify-content: center;
268+
align-items: center;
269+
border-radius: 3px;
270+
cursor: pointer;
271+
&.hidden {
272+
@extend .hidden;
273+
}
274+
&:hover {
275+
background-color: #46a049;
276+
}
277+
}
278+
}
279+
&__spacer {
280+
flex: 0 0 550px;
281+
}
282+
}
283+
284+
input.filter {
285+
margin-left: 10px;
217286
}

‎src/pytest_html/resources/.prettierrc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"tabWidth": 2,
3+
"useTabs": false,
4+
"singleQuote": true
5+
}

‎src/pytest_html/resources/assets/snapshot_of_what_went_wrong.png‎

122 KB
Loading

0 commit comments

Comments
 (0)