From 95c98a73b9f6fd066c62790d0f67ac8fa6f2ad49 Mon Sep 17 00:00:00 2001 From: Nick Litwin Date: Fri, 18 Mar 2016 14:18:16 -0700 Subject: [PATCH 1/2] Add vic's changes - new image, not upper case title --- .../submit-design-files/submit-design-files.jade | 8 +++----- assets/css/submissions/submit-file.scss | 10 ++++------ 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/app/submissions/submit-design-files/submit-design-files.jade b/app/submissions/submit-design-files/submit-design-files.jade index 67678b4f4..ccdf77c64 100644 --- a/app/submissions/submit-design-files/submit-design-files.jade +++ b/app/submissions/submit-design-files/submit-design-files.jade @@ -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. diff --git a/assets/css/submissions/submit-file.scss b/assets/css/submissions/submit-file.scss index c4a2775cb..96ff03653 100644 --- a/assets/css/submissions/submit-file.scss +++ b/assets/css/submissions/submit-file.scss @@ -122,20 +122,18 @@ 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; 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, From e5e26cf8421c42677a92c98137c25273245d9b6d Mon Sep 17 00:00:00 2001 From: Nick Litwin Date: Fri, 18 Mar 2016 14:23:32 -0700 Subject: [PATCH 2/2] Set max width to title --- assets/css/submissions/submit-file.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/css/submissions/submit-file.scss b/assets/css/submissions/submit-file.scss index 96ff03653..5c0396302 100644 --- a/assets/css/submissions/submit-file.scss +++ b/assets/css/submissions/submit-file.scss @@ -122,6 +122,7 @@ modal { align-items: center; .upload-progress__title { + max-width: 760px; display: flex; flex-direction: column; align-items: center;