File tree Expand file tree Collapse file tree 3 files changed +22
-17
lines changed Expand file tree Collapse file tree 3 files changed +22
-17
lines changed Original file line number Diff line number Diff line change 1
1
.fa-box-open {
2
- content : url(../ svg /running.svg);
2
+ content : url(../ .. / .. / assets /running.svg);
3
3
width : 22px ;
4
4
color : black;
5
5
}
6
6
7
7
.fa-archive {
8
- content : url(../ svg /stopped.svg);
8
+ content : url(../ .. / .. / assets /stopped.svg);
9
9
width : 22px ;
10
10
}
11
11
12
12
.fa-database {
13
- content : url(../ svg /images.svg);
13
+ content : url(../ .. / .. / assets /images.svg);
14
14
width : 22px ;
15
15
}
16
16
17
17
.fa-chart-pie {
18
- content : url(../ svg /metrics.svg);
18
+ content : url(../ .. / .. / assets /metrics.svg);
19
19
width : 22px ;
20
20
}
21
21
22
22
.fa-file-upload {
23
- content : url(../ svg /docker-compose.svg);
23
+ content : url(../ .. / .. / assets /docker-compose.svg);
24
24
width : 22px ;
25
25
}
26
26
27
27
.fa-settings {
28
- content : url(../ svg /settings.svg);
28
+ content : url(../ .. / .. / assets /settings.svg);
29
29
width : 22px ;
30
30
}
31
31
32
32
.fa-volume-history {
33
- content : url(../ svg /volumehistory.svg);
33
+ content : url(../ .. / .. / assets /volumehistory.svg);
34
34
width : 22px ;
35
35
}
36
36
37
37
.fa-users {
38
- content : url(../ svg /users.svg);
38
+ content : url(../ .. / .. / assets /users.svg);
39
39
width : 22px ;
40
40
}
41
41
42
42
.fa-file {
43
- content : url(../ svg /document.svg);
43
+ content : url(../ .. / .. / assets /document.svg);
44
44
width : 70px ;
45
45
}
46
46
47
47
.fa-log {
48
- content : url(../ svg /docketeer-logs.svg);
48
+ content : url(../ .. / .. / assets /docketeer-logs.svg);
49
49
width : 22px ;
50
50
}
Original file line number Diff line number Diff line change 1
1
@font-face {
2
2
font-family : "Maven Pro" ;
3
- src : url(.. / font/MavenPro-Regular.ttf);
3
+ src : url(./ font/MavenPro-Regular.ttf);
4
4
}
5
5
* {
6
6
font-family : "Maven Pro" , sans-serif;
Original file line number Diff line number Diff line change @@ -3,13 +3,8 @@ import { useSelector, useDispatch } from 'react-redux';
3
3
import { Line , Bar } from 'react-chartjs-2' ;
4
4
import * as actions from '../../redux/actions/actions' ;
5
5
import * as helper from '../helper/commands' ;
6
- < << << << HEAD
7
- import { Link } from 'react-router-dom ';
8
- import { FormControlLabel , Checkbox , FormGroup } from '@mui / material ';
9
- === === =
10
6
import { DataGrid } from '@mui/x-data-grid' ;
11
7
import { FormControlLabel , Checkbox } from '@mui/material' ;
12
- > >>> >>> dev
13
8
14
9
/**
15
10
* Displays linegraph and github metrics
@@ -279,7 +274,17 @@ const LineChartDisplay = () => {
279
274
time = ob . time ;
280
275
author = ob . author ;
281
276
url = ob . url ;
282
- message = ob . message ;
277
+ message = '' ;
278
+ if ( ob . message ) {
279
+ if ( ob . message . includes ( '<' ) ) {
280
+ for ( let i = 0 ; i < ob . message . length ; i ++ ) {
281
+ if ( ob . message [ i ] === '<' ) break
282
+ message += ob . message [ i ] ;
283
+ }
284
+ } else {
285
+ message = ob . message
286
+ }
287
+ }
283
288
284
289
time = time . split ( 'T' ) ;
285
290
date = time [ 0 ] ;
You can’t perform that action at this time.
0 commit comments