Skip to content

Commit 2b09536

Browse files
authored
Merge pull request #1396 from guardian/pf/improve-loading-state-render
Don't have progress bar and status overlapping each other
2 parents bbe7b0c + 0935c19 commit 2b09536

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

public/video-ui/src/components/VideoUpload/VideoAsset.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,8 +309,8 @@ export function Asset({
309309
return (
310310
<div className="video-trail__item">
311311
<div className="video-trail__upload">
312-
<AssetProgress {...processing} />
313312
<div>{processing.status}</div>
313+
<AssetProgress {...processing} />
314314
</div>
315315
<div className="video-trail__item__details">
316316
<AssetControls

public/video-ui/styles/components/_video-trail.scss

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
21
.video-trail__item {
3-
position:relative;
2+
position: relative;
43
border-top: 1px solid $brandColor;
54
width: 400px;
65
margin: 8px;
7-
86
}
97

10-
.video-trail__asset{
8+
.video-trail__asset {
119
display: flex;
1210
height: 250px;
1311
width: 100%;
@@ -18,26 +16,29 @@
1816
height: 100%;
1917
}
2018

21-
22-
.video-trail__upload{
19+
.video-trail__upload {
2320
display: flex;
2421
justify-content: center;
2522
align-items: center;
2623
flex-direction: column;
2724
height: 250px;
2825
row-gap: 20px;
26+
27+
& progress {
28+
position: relative;
29+
}
2930
}
3031

3132
.video-trail__status__overlay {
32-
position: absolute;
33-
right: 5px;
34-
top: 10px
33+
position: absolute;
34+
right: 5px;
35+
top: 10px;
3536
}
3637

3738
.video-trail__item__details {
3839
width: 100%;
3940
background-color: $color700Grey;
40-
height:80px
41+
height: 80px;
4142
}
4243
.video-trail__item__subtitles {
4344
border-top: 1px solid $brandColor;
@@ -51,7 +52,7 @@
5152
align-items: center;
5253
justify-content: center;
5354
margin-right: 5px;
54-
width:40px;
55+
width: 40px;
5556
border-radius: 50%;
5657
color: $color600Grey;
5758
background-color: $cWhite;

0 commit comments

Comments
 (0)