Merge commit 'ebe35aa100bdd8d63dee021269e7072e61729b31' into HEAD

Jenkins Continuous Integration Server · Jenkins Continuous Integration Server · commit 728f5196d099 · 2016-07-08T23:48:02.000Z
diff --git a/app/submissions/submit-design-files/submit-design-files.jade b/app/submissions/submit-design-files/submit-design-files.jade
@@ -19,7 +19,7 @@
         .form-block__text
           p Please follow the instructions on the Challenge Details page regarding what your submission, source, and preview files should contain.
 
-          p Do not name any of your files "declaration.txt", as this is added by our system.
+          p Do not name any of your files "declaration.txt," as this is added by our system.
 
           p Please be sure to double-check that you have submitted the correct files and that your JPG files (if applicable) are in RGB color mode.
 
diff --git a/assets/css/layout/footer.scss b/assets/css/layout/footer.scss
@@ -34,7 +34,9 @@
 
 
 @media only screen and (max-width : 1024px) {
-	.bottom-footer, .fold-pusher {
+	// removed fold-pusher from the rule to remove white space
+	// .bottom-footer, .fold-pusher {
+	.bottom-footer {
 		height: 200px;
 	}
 	.bottom-footer .menu-item {
@@ -87,7 +89,9 @@
 }
 
 @media only screen and (min-width : 1025px) {
-	.bottom-footer, .fold-pusher {
+	// removed fold-pusher from the rule to remove white space
+	// .bottom-footer, .fold-pusher {
+	.bottom-footer {
 		height: 270px;
 	}
 	.bottom-footer {

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,9 @@`
`34`	`34`
`35`	`35`
`36`	`36`	`@media only screen and (max-width : 1024px) {`
`37`		`- .bottom-footer, .fold-pusher {`
	`37`	`+ // removed fold-pusher from the rule to remove white space`
	`38`	`+ // .bottom-footer, .fold-pusher {`
	`39`	`+ .bottom-footer {`
`38`	`40`	`height: 200px;`
`39`	`41`	`}`
`40`	`42`	`.bottom-footer .menu-item {`
`@@ -87,7 +89,9 @@`
`87`	`89`	`}`
`88`	`90`
`89`	`91`	`@media only screen and (min-width : 1025px) {`
`90`		`- .bottom-footer, .fold-pusher {`
	`92`	`+ // removed fold-pusher from the rule to remove white space`
	`93`	`+ // .bottom-footer, .fold-pusher {`
	`94`	`+ .bottom-footer {`
`91`	`95`	`height: 270px;`
`92`	`96`	`}`
`93`	`97`	`.bottom-footer {`