From 0e6d9e7373b906e2f8ad32a5915136960b4a5e97 Mon Sep 17 00:00:00 2001 From: Nick Litwin Date: Wed, 16 Mar 2016 09:24:57 -0700 Subject: [PATCH 1/3] Add view my submissions button --- app/submissions/submit-design-files/submit-design-files.jade | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/submissions/submit-design-files/submit-design-files.jade b/app/submissions/submit-design-files/submit-design-files.jade index 65b641fe0..c9dad5ad9 100644 --- a/app/submissions/submit-design-files/submit-design-files.jade +++ b/app/submissions/submit-design-files/submit-design-files.jade @@ -178,6 +178,8 @@ modal.transition(show="vm.showProgress", background-click-close="false", style=" a.tc-btn.tc-btn-s.tc-btn-ghost(ng-click="vm.refreshPage()") Submit another + a.tc-btn.tc-btn-s.tc-btn-ghost(ng-href="http://studio.{{DOMAIN}}/?module=ViewSubmission&ct={{submissions.challengeId}}") View my submissions + .upload-progress__error(ng-show="vm.errorInUpload") #[span File upload failed] From 46d5804732011879cf2f9e74ec2e732435414f0e Mon Sep 17 00:00:00 2001 From: Nick Litwin Date: Wed, 16 Mar 2016 09:28:39 -0700 Subject: [PATCH 2/3] Use .gitignore for ignore path --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9eef08945..c849e1fb6 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "scripts": { "build": "webpack --bail --progress --build --tc", "start": "webpack-dev-server --history-api-fallback --dev --tc --inline --progress --port 3000", - "lint": "eslint .", + "lint": "eslint --ignore-path .gitignore .", "test": "karma start --tc --test" }, "devDependencies": { From 8003f398732863c7cb6b8134c2aba7bb511b4383 Mon Sep 17 00:00:00 2001 From: Nick Litwin Date: Wed, 16 Mar 2016 09:51:45 -0700 Subject: [PATCH 3/3] Fix margins --- assets/css/submissions/submit-file.scss | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/assets/css/submissions/submit-file.scss b/assets/css/submissions/submit-file.scss index 5070612ec..c4a2775cb 100644 --- a/assets/css/submissions/submit-file.scss +++ b/assets/css/submissions/submit-file.scss @@ -185,9 +185,10 @@ modal { a { display: inline-block; + margin-right: 10px; - &:first-child { - margin-right: 10px; + &:last-child { + margin-right: 0; } } }