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

Add vic's changes - new image, not upper case title #752

Merged
merged 2 commits into from
Mar 18, 2016
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions app/submissions/submit-design-files/submit-design-files.jade
Original file line number Diff line number Diff line change
@@ -156,14 +156,12 @@
modal.transition(show="vm.showProgress", background-click-close="false", style="background-color:white;")
.upload-progress(ng-class="{'upload-progress--error': vm.errorInUpload}")
.upload-progress__title
p Uploading submission for
p Uploading submission for "{{submissions.challengeTitle}}"

p.upload-progress-title__challenge-name(ng-bind="submissions.challengeTitle")

img.upload-progress__image(src=require("../../../assets/images/robot.svg"), ng-hide="vm.errorInUpload")
img.upload-progress__image(src=require("../../../assets/images/skills/id-180.svg"), ng-hide="vm.errorInUpload")
img.upload-progress__image--error(src=require("../../../assets/images/robot-embarresed.svg"), ng-show="vm.errorInUpload")

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!
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!

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.

11 changes: 5 additions & 6 deletions assets/css/submissions/submit-file.scss
Original file line number Diff line number Diff line change
@@ -122,20 +122,19 @@ modal {
align-items: center;

.upload-progress__title {
text-transform: uppercase;
@include font-with-weight('Sofia Pro', 500);
font-size: 24px;
line-height: 30px;
max-width: 355px;
max-width: 760px;
display: flex;
flex-direction: column;
align-items: center;
text-align: center;
@include font-with-weight('Sofia Pro', 500);
font-size: 24px;
line-height: 30px;
}

.upload-progress__image,
.upload-progress__image--error {
margin-top: 60px;
margin-top: 30px;
}

.upload-progress__message,