Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

Commit 959e0bf

Browse files
committed
Merge pull request #752 from appirio-tech/progress-modal
Add vic's changes - new image, not upper case title
2 parents b2346b1 + e5e26cf commit 959e0bf

File tree

2 files changed

+8
-11
lines changed

2 files changed

+8
-11
lines changed

app/submissions/submit-design-files/submit-design-files.jade

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -156,14 +156,12 @@
156156
modal.transition(show="vm.showProgress", background-click-close="false", style="background-color:white;")
157157
.upload-progress(ng-class="{'upload-progress--error': vm.errorInUpload}")
158158
.upload-progress__title
159-
p Uploading submission for
159+
p Uploading submission for "{{submissions.challengeTitle}}"
160160

161-
p.upload-progress-title__challenge-name(ng-bind="submissions.challengeTitle")
162-
163-
img.upload-progress__image(src=require("../../../assets/images/robot.svg"), ng-hide="vm.errorInUpload")
161+
img.upload-progress__image(src=require("../../../assets/images/skills/id-180.svg"), ng-hide="vm.errorInUpload")
164162
img.upload-progress__image--error(src=require("../../../assets/images/robot-embarresed.svg"), ng-show="vm.errorInUpload")
165163

166-
p.upload-progress__message(ng-hide="vm.errorInUpload") Hey, your work is AWESOME! Please don’t close the window while I’m working or you’ll lose all files!
164+
p.upload-progress__message(ng-hide="vm.errorInUpload") Hey, your work is AWESOME! Please don’t close the window while the upload is in progress, or you’ll lose all files!
167165

168166
p.upload-progress__message--error(ng-show="vm.errorInUpload") Oh, that’s embarrassing! One of the files couldn’t be uploaded, I’m so sorry.
169167

assets/css/submissions/submit-file.scss

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,20 +122,19 @@ modal {
122122
align-items: center;
123123

124124
.upload-progress__title {
125-
text-transform: uppercase;
126-
@include font-with-weight('Sofia Pro', 500);
127-
font-size: 24px;
128-
line-height: 30px;
129-
max-width: 355px;
125+
max-width: 760px;
130126
display: flex;
131127
flex-direction: column;
132128
align-items: center;
133129
text-align: center;
130+
@include font-with-weight('Sofia Pro', 500);
131+
font-size: 24px;
132+
line-height: 30px;
134133
}
135134

136135
.upload-progress__image,
137136
.upload-progress__image--error {
138-
margin-top: 60px;
137+
margin-top: 30px;
139138
}
140139

141140
.upload-progress__message,

0 commit comments

Comments
 (0)